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 2018-10-06 05:44:51 +02:00
parent cda74effe3
commit c6109d11ad
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

@ -1,6 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=Hello Qml Name=Hello Qml
Name[ca]=Hola Qml Name[ca]=Hola Qml
Name[ca@valencia]=Hola Qml
Name[es]=Hola Qml Name[es]=Hola Qml
Name[id]=Hello Qml Name[id]=Hello Qml
Name[nl]=Hello Qml Name[nl]=Hello Qml
@ -10,6 +11,7 @@ Name[uk]=Привіт, Qml
Name[x-test]=xxHello Qmlxx Name[x-test]=xxHello Qmlxx
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[es]=Complemento de ejemplo de Qml Comment[es]=Complemento de ejemplo de Qml
Comment[id]=Contoh Plugin Qml Comment[id]=Contoh Plugin Qml
Comment[nl]=Voorbeeld Qml-plug-in Comment[nl]=Voorbeeld Qml-plug-in