Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
l10n daemon script 2019-01-26 05:29:14 +01:00
parent 8bcaefe351
commit c08df81dd6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripts/helloqml/metadata.desktop
View File

@ -2,6 +2,7 @@
Name=Hello Qml Name=Hello Qml
Name[ca]=Hola Qml Name[ca]=Hola Qml
Name[ca@valencia]=Hola Qml Name[ca@valencia]=Hola Qml
Name[cs]=Ahoj QML
Name[de]=Hallo QML“ Name[de]=Hallo QML“
Name[en_GB]=Hello QML Name[en_GB]=Hello QML
Name[es]=Hola Qml Name[es]=Hola Qml
@ -22,6 +23,7 @@ Name[zh_TW]=嗨 QML
Comment=Sample Qml Plugin Comment=Sample Qml Plugin
Comment[ca]=Connector Qml d'exemple Comment[ca]=Connector Qml d'exemple
Comment[ca@valencia]=Connector Qml d'exemple Comment[ca@valencia]=Connector Qml d'exemple
Comment[cs]=Ukázkový modul QML
Comment[de]=Beispielmodul in Qml Comment[de]=Beispielmodul in Qml
Comment[en_GB]=Sample QML Plugin Comment[en_GB]=Sample QML Plugin
Comment[es]=Complemento de ejemplo de Qml Comment[es]=Complemento de ejemplo de Qml