alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki 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 2015-12-06 09:14:26 +00:00
parent 74d97440cf
commit 8d9fd0846a
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/developerguide/basic/metadata.desktop
View File

@ -2,10 +2,12 @@
Comment=Basic App
Comment[ca]=Aplicació bàsica
Comment[es]=Aplicación básica
Comment[it]=Applicazione di base
Comment[nl]=Basis app
Comment[pl]=Podstawowa aplikacja
Comment[pt]=Aplicação Básica
Comment[pt_BR]=Aplicativo básico
Comment[sl]=Osnovni program
Comment[sv]=Enkel applikation
Comment[uk]=Базова програма
Comment[x-test]=xxBasic Appxx

4
templates/cpp-plasmoid/src/package/metadata.desktop
View File

@ -6,12 +6,14 @@ Name[da]=%{APPNAME}
Name[es]=%{APPNAME}
Name[fi]=%{APPNAME}
Name[gl]=%{APPNAME}
Name[it]=%{APPNAME}
Name[nb]=%{APPNAME}
Name[nl]=%{APPNAME}
Name[nn]=%{APPNAME}
Name[pl]=%{APPNAME}
Name[pt]=%{APPNAME}
Name[pt_BR]=%{APPNAME}
Name[sl]=%{APPNAME}
Name[sv]=%{APPNAME}
Name[uk]=%{APPNAME}
Name[x-test]=xx%{APPNAME}xx
@ -22,11 +24,13 @@ Comment[da]=nogle få ord om hvad din app gør
Comment[es]=lo que hace su aplicación, en pocas palabras
Comment[fi]=ohjelmasi toiminta muutamalla sanalla
Comment[gl]=o que fai o seu programa en poucas palabras
Comment[it]=Cosa fa la tua applicazione in poche parole
Comment[nb]=hva programmet gjør, med noen få ord
Comment[nl]=wat uw app doet in een paar woorden
Comment[pl]=w kilku słowach opis co robi twój program
Comment[pt]=o que faz a sua aplicação, em poucas palavras
Comment[pt_BR]=breve descrição do que o seu aplicativo faz
Comment[sl]=kaj vaš program dela, v nekaj besedah
Comment[sv]=vad programmet gör med några få ord
Comment[uk]=призначення вашої програми у декількох словах
Comment[x-test]=xxwhat your app does in a few wordsxx

4
templates/qml-plasmoid/package/metadata.desktop
View File

@ -6,12 +6,14 @@ Name[da]=%{APPNAME}
Name[es]=%{APPNAME}
Name[fi]=%{APPNAME}
Name[gl]=%{APPNAME}
Name[it]=%{APPNAME}
Name[nb]=%{APPNAME}
Name[nl]=%{APPNAME}
Name[nn]=%{APPNAME}
Name[pl]=%{APPNAME}
Name[pt]=%{APPNAME}
Name[pt_BR]=%{APPNAME}
Name[sl]=%{APPNAME}
Name[sv]=%{APPNAME}
Name[uk]=%{APPNAME}
Name[x-test]=xx%{APPNAME}xx
@ -22,11 +24,13 @@ Comment[da]=nogle få ord om hvad din app gør
Comment[es]=lo que hace su aplicación, en pocas palabras
Comment[fi]=ohjelmasi toiminta muutamalla sanalla
Comment[gl]=o que fai o seu programa en poucas palabras
Comment[it]=Cosa fa la tua applicazione in poche parole
Comment[nb]=hva programmet gjør, med noen få ord
Comment[nl]=wat uw app doet in een paar woorden
Comment[pl]=w kilku słowach opis co robi twój program
Comment[pt]=o que faz a sua aplicação, em poucas palavras
Comment[pt_BR]=breve descrição do que o seu aplicativo faz
Comment[sl]=kaj vaš program dela, v nekaj besedah
Comment[sv]=vad programmet gör med några få ord
Comment[uk]=призначення вашої програми у декількох словах
Comment[x-test]=xxwhat your app does in a few wordsxx