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-07 10:15:57 +00:00
parent 016d958a93
commit 3c90a5d835
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -14,6 +14,10 @@ Name[pl]=%{APPNAME}
Name[pt]=%{APPNAME} Name[pt]=%{APPNAME}
Name[pt_BR]=%{APPNAME} Name[pt_BR]=%{APPNAME}
Name[sl]=%{APPNAME} Name[sl]=%{APPNAME}
Name[sr]=%{APPNAME}
Name[sr@ijekavian]=%{APPNAME}
Name[sr@ijekavianlatin]=%{APPNAME}
Name[sr@latin]=%{APPNAME}
Name[sv]=%{APPNAME} Name[sv]=%{APPNAME}
Name[uk]=%{APPNAME} Name[uk]=%{APPNAME}
Name[x-test]=xx%{APPNAME}xx Name[x-test]=xx%{APPNAME}xx
@ -31,6 +35,10 @@ 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]=o que faz a sua aplicação, em poucas palavras
Comment[pt_BR]=breve descrição do que o seu aplicativo faz Comment[pt_BR]=breve descrição do que o seu aplicativo faz
Comment[sl]=kaj vaš program dela, v nekaj besedah Comment[sl]=kaj vaš program dela, v nekaj besedah
Comment[sr]=Укратко о томе шта ваш програм ради
Comment[sr@ijekavian]=Укратко о томе шта ваш програм ради
Comment[sr@ijekavianlatin]=Ukratko o tome šta vaš program radi
Comment[sr@latin]=Ukratko o tome šta vaš program radi
Comment[sv]=vad programmet gör med några få ord Comment[sv]=vad programmet gör med några få ord
Comment[uk]=призначення вашої програми у декількох словах Comment[uk]=призначення вашої програми у декількох словах
Comment[x-test]=xxwhat your app does in a few wordsxx Comment[x-test]=xxwhat your app does in a few wordsxx

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

@ -14,6 +14,10 @@ Name[pl]=%{APPNAME}
Name[pt]=%{APPNAME} Name[pt]=%{APPNAME}
Name[pt_BR]=%{APPNAME} Name[pt_BR]=%{APPNAME}
Name[sl]=%{APPNAME} Name[sl]=%{APPNAME}
Name[sr]=%{APPNAME}
Name[sr@ijekavian]=%{APPNAME}
Name[sr@ijekavianlatin]=%{APPNAME}
Name[sr@latin]=%{APPNAME}
Name[sv]=%{APPNAME} Name[sv]=%{APPNAME}
Name[uk]=%{APPNAME} Name[uk]=%{APPNAME}
Name[x-test]=xx%{APPNAME}xx Name[x-test]=xx%{APPNAME}xx
@ -31,6 +35,10 @@ 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]=o que faz a sua aplicação, em poucas palavras
Comment[pt_BR]=breve descrição do que o seu aplicativo faz Comment[pt_BR]=breve descrição do que o seu aplicativo faz
Comment[sl]=kaj vaš program dela, v nekaj besedah Comment[sl]=kaj vaš program dela, v nekaj besedah
Comment[sr]=Укратко о томе шта ваш програм ради
Comment[sr@ijekavian]=Укратко о томе шта ваш програм ради
Comment[sr@ijekavianlatin]=Ukratko o tome šta vaš program radi
Comment[sr@latin]=Ukratko o tome šta vaš program radi
Comment[sv]=vad programmet gör med några få ord Comment[sv]=vad programmet gör med några få ord
Comment[uk]=призначення вашої програми у декількох словах Comment[uk]=призначення вашої програми у декількох словах
Comment[x-test]=xxwhat your app does in a few wordsxx Comment[x-test]=xxwhat your app does in a few wordsxx