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-05 09:08:31 +00:00
parent 8a21e2bb27
commit 26ca3e43b2
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,11 @@
[Desktop Entry]
Comment=Basic App
Comment[ca]=Aplicació bàsica
Comment[es]=Aplicación básica
Comment[nl]=Basis app
Comment[pl]=Podstawowa aplikacja
Comment[pt]=Aplicação Básica
Comment[pt_BR]=Aplicativo básico
Comment[sv]=Enkel applikation
Comment[uk]=Базова програма
Comment[x-test]=xxBasic Appxx

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

@ -9,6 +9,7 @@ Name[gl]=%{APPNAME}
Name[nb]=%{APPNAME}
Name[nl]=%{APPNAME}
Name[nn]=%{APPNAME}
Name[pl]=%{APPNAME}
Name[pt]=%{APPNAME}
Name[pt_BR]=%{APPNAME}
Name[sv]=%{APPNAME}
@ -23,6 +24,7 @@ Comment[fi]=ohjelmasi toiminta muutamalla sanalla
Comment[gl]=o que fai o seu programa en poucas palabras
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[sv]=vad programmet gör med några få ord

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

@ -9,6 +9,7 @@ Name[gl]=%{APPNAME}
Name[nb]=%{APPNAME}
Name[nl]=%{APPNAME}
Name[nn]=%{APPNAME}
Name[pl]=%{APPNAME}
Name[pt]=%{APPNAME}
Name[pt_BR]=%{APPNAME}
Name[sv]=%{APPNAME}
@ -23,6 +24,7 @@ Comment[fi]=ohjelmasi toiminta muutamalla sanalla
Comment[gl]=o que fai o seu programa en poucas palabras
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[sv]=vad programmet gör med några få ord