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-28 04:53:16 +01:00
parent ddc19c7320
commit 6df8ac4c7d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,12 @@
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[en_GB]=Hello QML
Name[es]=Hola Qml Name[es]=Hola Qml
Name[fr]=Bonjour Qml Name[fr]=Bonjour Qml
Name[gl]=Ola Qml Name[gl]=Ola Qml
Name[id]=Hello Qml Name[id]=Hello Qml
Name[it]=Hello Qml
Name[nl]=Hello Qml Name[nl]=Hello Qml
Name[pt]=Olá em QML Name[pt]=Olá em QML
Name[sv]=Hallå QML Name[sv]=Hallå QML
@ -14,10 +16,12 @@ 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[ca@valencia]=Connector Qml d'exemple
Comment[en_GB]=Sample QML Plugin
Comment[es]=Complemento de ejemplo de Qml Comment[es]=Complemento de ejemplo de Qml
Comment[fr]=Exemple de module externe Qml Comment[fr]=Exemple de module externe Qml
Comment[gl]=Complemento de exemplo de Qml Comment[gl]=Complemento de exemplo de Qml
Comment[id]=Contoh Plugin Qml Comment[id]=Contoh Plugin Qml
Comment[it]=Estensione di esempio in Qml
Comment[nl]=Voorbeeld Qml-plug-in Comment[nl]=Voorbeeld Qml-plug-in
Comment[pt]='Plugin' de Exemplo em QML Comment[pt]='Plugin' de Exemplo em QML
Comment[pt_BR]=Plug-in QML de exemplo Comment[pt_BR]=Plug-in QML de exemplo