From e2edaa2c1affa5b27a6fb773cc15f22500574050 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 25 Apr 2016 10:23:50 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours 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" --- examples/developerguide/basic/metadata.desktop | 1 + src/desktoptheme/breeze-light/metadata.desktop | 1 + templates/cpp-plasmoid/src/package/metadata.desktop | 1 + templates/qml-plasmoid/package/metadata.desktop | 1 + 4 files changed, 4 insertions(+) diff --git a/examples/developerguide/basic/metadata.desktop b/examples/developerguide/basic/metadata.desktop index 2ae3525f6..9b9bcc447 100644 --- a/examples/developerguide/basic/metadata.desktop +++ b/examples/developerguide/basic/metadata.desktop @@ -12,6 +12,7 @@ Comment[gl]=Programa básico Comment[it]=Applicazione di base Comment[ko]=기본 앱 Comment[nl]=Basis app +Comment[nn]=Grunnleggjande program Comment[pl]=Podstawowa aplikacja Comment[pt]=Aplicação Básica Comment[pt_BR]=Aplicativo básico diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop index 513bf59a9..75a1bc2a1 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop +++ b/src/desktoptheme/breeze-light/metadata.desktop @@ -11,6 +11,7 @@ Name[fi]=Breeze Light Name[gl]=Breeze claro Name[it]=Brezza chiaro Name[nl]=Breeze Light +Name[nn]=Breeze lys Name[pl]=Lekka Bryza Name[pt]=Brisa Clara Name[pt_BR]=Breeze Light diff --git a/templates/cpp-plasmoid/src/package/metadata.desktop b/templates/cpp-plasmoid/src/package/metadata.desktop index 654c5fcfc..a26a56b63 100644 --- a/templates/cpp-plasmoid/src/package/metadata.desktop +++ b/templates/cpp-plasmoid/src/package/metadata.desktop @@ -42,6 +42,7 @@ Comment[it]=Cosa fa la tua applicazione in poche parole Comment[ko]=프로그램이 하는 일에 대한 간단한 설명 Comment[nb]=hva programmet gjør, med noen få ord 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[pt]=o que faz a sua aplicação, em poucas palavras Comment[pt_BR]=breve descrição do que o seu aplicativo faz diff --git a/templates/qml-plasmoid/package/metadata.desktop b/templates/qml-plasmoid/package/metadata.desktop index fe85850b1..33861158e 100644 --- a/templates/qml-plasmoid/package/metadata.desktop +++ b/templates/qml-plasmoid/package/metadata.desktop @@ -42,6 +42,7 @@ Comment[it]=Cosa fa la tua applicazione in poche parole Comment[ko]=프로그램이 하는 일에 대한 간단한 설명 Comment[nb]=hva programmet gjør, med noen få ord 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[pt]=o que faz a sua aplicação, em poucas palavras Comment[pt_BR]=breve descrição do que o seu aplicativo faz