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 2019-01-24 05:27:38 +01:00
parent 0389da311c
commit 6015a56f7c
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

@ -5,6 +5,7 @@ Name[ca@valencia]=Hola 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
Name[fi]=Hei 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
@ -23,6 +24,7 @@ Comment[ca@valencia]=Connector Qml d'exemple
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
Comment[fi]=Esimerkki-QML-liitännäinen
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