Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +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-17 06:32:51 +02:00
parent a039da158a
commit 42e0c865b2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/TestPlugin/metadata.desktop
View File

@ -8,7 +8,7 @@ Name[de]=Beispielmodul
Name[en_GB]=Example Plugin Name[en_GB]=Example Plugin
Name[es]=Complemento de ejemplo Name[es]=Complemento de ejemplo
Name[fi]=Esimerkkiliitännäinen Name[fi]=Esimerkkiliitännäinen
Name[fr]=Module externe d'exemple Name[fr]=Exemple de module externe
Name[gl]=Complemento de exemplo Name[gl]=Complemento de exemplo
Name[id]=Example Plugin Name[id]=Example Plugin
Name[it]=Estensione di esempio Name[it]=Estensione di esempio

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

@ -3,6 +3,7 @@ Name=Hello Qml
Name[ca]=Hola Qml Name[ca]=Hola Qml
Name[ca@valencia]=Hola Qml Name[ca@valencia]=Hola Qml
Name[es]=Hola Qml Name[es]=Hola Qml
Name[fr]=Bonjour Qml
Name[id]=Hello Qml Name[id]=Hello Qml
Name[nl]=Hello Qml Name[nl]=Hello Qml
Name[pt]=Olá em QML Name[pt]=Olá em QML
@ -13,6 +14,7 @@ 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[es]=Complemento de ejemplo de Qml Comment[es]=Complemento de ejemplo de Qml
Comment[fr]=Exemple de module externe Qml
Comment[id]=Contoh Plugin Qml Comment[id]=Contoh Plugin 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