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-16 09:05:14 +00:00
parent 76186339f6
commit a1feac929b
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ Comment[nl]=Basis app
Comment[pl]=Podstawowa aplikacja
Comment[pt]=Aplicação Básica
Comment[pt_BR]=Aplicativo básico
Comment[sk]=Základná aplikácia
Comment[sl]=Osnovni program
Comment[sr]=Основни програм
Comment[sr@ijekavian]=Основни програм

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

@ -14,6 +14,7 @@ Name[nn]=%{APPNAME}
Name[pl]=%{APPNAME}
Name[pt]=%{APPNAME}
Name[pt_BR]=%{APPNAME}
Name[sk]=%{APPNAME}
Name[sl]=%{APPNAME}
Name[sr]=%{APPNAME}
Name[sr@ijekavian]=%{APPNAME}
@ -36,6 +37,7 @@ 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[sk]=čo vaša aplikácia robí v niekoľkých slovách
Comment[sl]=kaj vaš program dela, v nekaj besedah
Comment[sr]=Укратко о томе шта ваш програм ради
Comment[sr@ijekavian]=Укратко о томе шта ваш програм ради

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

@ -14,6 +14,7 @@ Name[nn]=%{APPNAME}
Name[pl]=%{APPNAME}
Name[pt]=%{APPNAME}
Name[pt_BR]=%{APPNAME}
Name[sk]=%{APPNAME}
Name[sl]=%{APPNAME}
Name[sr]=%{APPNAME}
Name[sr@ijekavian]=%{APPNAME}
@ -36,6 +37,7 @@ 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[sk]=čo vaša aplikácia robí v niekoľkých slovách
Comment[sl]=kaj vaš program dela, v nekaj besedah
Comment[sr]=Укратко о томе шта ваш програм ради
Comment[sr@ijekavian]=Укратко о томе шта ваш програм ради