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-04-23 09:11:22 +02:00
parent f38265230d
commit 05b63efb59
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

@ -10,6 +10,7 @@ Name[gl]=Ola Qml
Name[id]=Hello Qml Name[id]=Hello Qml
Name[it]=Hello Qml Name[it]=Hello Qml
Name[nl]=Hello Qml Name[nl]=Hello Qml
Name[nn]=Hei, QML
Name[pt]=Olá em QML Name[pt]=Olá em QML
Name[pt_BR]=Olá Qml Name[pt_BR]=Olá Qml
Name[sk]=Hello Qml Name[sk]=Hello Qml
@ -29,6 +30,7 @@ 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[it]=Estensione di esempio in Qml
Comment[nl]=Voorbeeld Qml-plug-in Comment[nl]=Voorbeeld Qml-plug-in
Comment[nn]=Eksempel på QML-tillegg
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
Comment[sk]=Ukážkový QML plugin Comment[sk]=Ukážkový QML plugin