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-04-25 10:23:50 +00:00
parent d884119f5a
commit e2edaa2c1a
4 changed files with 4 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

@ -12,6 +12,7 @@ Comment[gl]=Programa básico
Comment[it]=Applicazione di base Comment[it]=Applicazione di base
Comment[ko]=기본 앱 Comment[ko]=기본 앱
Comment[nl]=Basis app Comment[nl]=Basis app
Comment[nn]=Grunnleggjande program
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

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

@ -11,6 +11,7 @@ Name[fi]=Breeze Light
Name[gl]=Breeze claro Name[gl]=Breeze claro
Name[it]=Brezza chiaro Name[it]=Brezza chiaro
Name[nl]=Breeze Light Name[nl]=Breeze Light
Name[nn]=Breeze lys
Name[pl]=Lekka Bryza Name[pl]=Lekka Bryza
Name[pt]=Brisa Clara Name[pt]=Brisa Clara
Name[pt_BR]=Breeze Light Name[pt_BR]=Breeze Light

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

@ -42,6 +42,7 @@ Comment[it]=Cosa fa la tua applicazione in poche parole
Comment[ko]=프로그램이 하는 일에 대한 간단한 설명 Comment[ko]=프로그램이 하는 일에 대한 간단한 설명
Comment[nb]=hva programmet gjør, med noen få ord Comment[nb]=hva programmet gjør, med noen få ord
Comment[nl]=wat uw app doet in een paar woorden Comment[nl]=wat uw app doet in een paar woorden
Comment[nn]=nokre få ord om kva programmet gjer
Comment[pl]=w kilku słowach opis co robi twój program 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

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

@ -42,6 +42,7 @@ Comment[it]=Cosa fa la tua applicazione in poche parole
Comment[ko]=프로그램이 하는 일에 대한 간단한 설명 Comment[ko]=프로그램이 하는 일에 대한 간단한 설명
Comment[nb]=hva programmet gjør, med noen få ord Comment[nb]=hva programmet gjør, med noen få ord
Comment[nl]=wat uw app doet in een paar woorden Comment[nl]=wat uw app doet in een paar woorden
Comment[nn]=nokre få ord om kva programmet gjer
Comment[pl]=w kilku słowach opis co robi twój program 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