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 2016-05-18 09:38:52 +00:00
parent f98cae5dd0
commit 4883c580f9
4 changed files with 6 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

@ -8,6 +8,7 @@ Comment[de]=Einfache Anwendung
Comment[en_GB]=Basic App Comment[en_GB]=Basic App
Comment[es]=Aplicación básica Comment[es]=Aplicación básica
Comment[fi]=Perussovellus Comment[fi]=Perussovellus
Comment[gd]=Aplacaid bhunaiteach
Comment[gl]=Programa básico Comment[gl]=Programa básico
Comment[it]=Applicazione di base Comment[it]=Applicazione di base
Comment[ko]=기본 앱 Comment[ko]=기본 앱

1
src/desktoptheme/breeze-light/metadata.desktop
View File

@ -8,6 +8,7 @@ Name[de]=Breeze Light
Name[en_GB]=Breeze Light Name[en_GB]=Breeze Light
Name[es]=Brisa claro Name[es]=Brisa claro
Name[fi]=Breeze Light Name[fi]=Breeze Light
Name[gd]=Oiteag shoilleir
Name[gl]=Breeze claro Name[gl]=Breeze claro
Name[it]=Brezza chiaro Name[it]=Brezza chiaro
Name[nl]=Breeze Light Name[nl]=Breeze Light

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

@ -9,6 +9,7 @@ Name[de]=%{APPNAME}
Name[en_GB]=%{APPNAME} Name[en_GB]=%{APPNAME}
Name[es]=%{APPNAME} Name[es]=%{APPNAME}
Name[fi]=%{APPNAME} Name[fi]=%{APPNAME}
Name[gd]=%{APPNAME}
Name[gl]=%{APPNAME} Name[gl]=%{APPNAME}
Name[it]=%{APPNAME} Name[it]=%{APPNAME}
Name[ko]=%{APPNAME} Name[ko]=%{APPNAME}
@ -38,6 +39,7 @@ Comment[de]=In ein paar Worten, was Ihre Anwendung tut
Comment[en_GB]=what your app does in a few words Comment[en_GB]=what your app does in a few words
Comment[es]=lo que hace su aplicación, en pocas palabras Comment[es]=lo que hace su aplicación, en pocas palabras
Comment[fi]=ohjelmasi toiminta muutamalla sanalla Comment[fi]=ohjelmasi toiminta muutamalla sanalla
Comment[gd]=na nì an aplacaid agad ann am beagan fhaclan
Comment[gl]=o que fai o seu programa en poucas palabras Comment[gl]=o que fai o seu programa en poucas palabras
Comment[it]=Cosa fa la tua applicazione in poche parole Comment[it]=Cosa fa la tua applicazione in poche parole
Comment[ko]=프로그램이 하는 일에 대한 간단한 설명 Comment[ko]=프로그램이 하는 일에 대한 간단한 설명

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

@ -9,6 +9,7 @@ Name[de]=%{APPNAME}
Name[en_GB]=%{APPNAME} Name[en_GB]=%{APPNAME}
Name[es]=%{APPNAME} Name[es]=%{APPNAME}
Name[fi]=%{APPNAME} Name[fi]=%{APPNAME}
Name[gd]=%{APPNAME}
Name[gl]=%{APPNAME} Name[gl]=%{APPNAME}
Name[it]=%{APPNAME} Name[it]=%{APPNAME}
Name[ko]=%{APPNAME} Name[ko]=%{APPNAME}
@ -38,6 +39,7 @@ Comment[de]=In ein paar Worten, was Ihre Anwendung tut
Comment[en_GB]=what your app does in a few words Comment[en_GB]=what your app does in a few words
Comment[es]=lo que hace su aplicación, en pocas palabras Comment[es]=lo que hace su aplicación, en pocas palabras
Comment[fi]=ohjelmasi toiminta muutamalla sanalla Comment[fi]=ohjelmasi toiminta muutamalla sanalla
Comment[gd]=na nì an aplacaid agad ann am beagan fhaclan
Comment[gl]=o que fai o seu programa en poucas palabras Comment[gl]=o que fai o seu programa en poucas palabras
Comment[it]=Cosa fa la tua applicazione in poche parole Comment[it]=Cosa fa la tua applicazione in poche parole
Comment[ko]=프로그램이 하는 일에 대한 간단한 설명 Comment[ko]=프로그램이 하는 일에 대한 간단한 설명