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"
2016-12-22 05:52:51 +01:00 · 2016-12-22 05:52:51 +01:00 · 2f4e59e902
commit 2f4e59e902
parent 6ae3a073db
27 changed files with 31 additions and 0 deletions
--- a/examples/applets/bugreport/metadata.desktop
+++ b/examples/applets/bugreport/metadata.desktop
@ -41,6 +41,7 @@ Comment[zh_CN]=报告 Plasma 的错误
 Comment[zh_TW]=在 Plasma 中回報問題
 Encoding=UTF-8
 Keywords=plasma;bugzilla;bug;development;support;
 Keywords[ast]=plasma;bugzilla;fallu;desendolcu;sofitu;
 Keywords[ca]=plasma;bugzilla;error;desenvolupament;suport;
 Keywords[ca@valencia]=plasma;bugzilla;error;desenvolupament;suport;
 Keywords[da]=plasma;bugzilla;bug;udvikling;støtte;
--- a/examples/applets/conditionalloader/metadata.desktop
+++ b/examples/applets/conditionalloader/metadata.desktop
@ -2,6 +2,7 @@
 Encoding=UTF-8
 Keywords=
 Name=Applet Test
 Name[ast]=Prueba d'applet
 Name[bs]=Applet Test
 Name[ca]=Miniaplicació de prova
 Name[ca@valencia]=Miniaplicació de prova
--- a/examples/applets/config/metadata.desktop
+++ b/examples/applets/config/metadata.desktop
@ -2,6 +2,7 @@
 Encoding=UTF-8
 Keywords=
 Name=Configuration test
 Name[ast]=Prueba de configuración
 Name[bs]=test konfiguracije
 Name[ca]=Prova la configuració
 Name[ca@valencia]=Prova la configuració
--- a/examples/applets/dataenginemodel/metadata.desktop
+++ b/examples/applets/dataenginemodel/metadata.desktop
@ -39,6 +39,7 @@ Encoding=UTF-8
 Keywords=
 Name=Dataengine model
 Name[ar]=نموذج محرّك بيانات (Dataengine)
 Name[ast]=Modelu de motor de datos
 Name[ca]=Model de «Dataengine»
 Name[ca@valencia]=Model de «Dataengine»
 Name[da]=Datamotor-model
--- a/examples/applets/notes/metadata.desktop
+++ b/examples/applets/notes/metadata.desktop
@ -39,6 +39,7 @@ Comment[zh_TW]=如何管理 Drop 資料的範例
 Encoding=UTF-8
 Keywords=
 Name=Example notes
 Name[ast]=Notes d'exemplu
 Name[bs]=Primjer bilješke
 Name[ca]=Notes d'exemple
 Name[ca@valencia]=Notes d'exemple
--- a/examples/applets/qmltasks/metadata.desktop
+++ b/examples/applets/qmltasks/metadata.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Poor Man's Tasks
 Name[ar]=مهام الرجل الفقير
 Name[ast]=Xeres d'home probe
 Name[bs]=Zadaci siromašnog čovjeka
 Name[ca]=Tasques senzilles
 Name[ca@valencia]=Tasques senzilles
--- a/examples/applets/testcomponents/metadata.desktop
+++ b/examples/applets/testcomponents/metadata.desktop
@ -2,6 +2,7 @@
 Encoding=UTF-8
 Keywords=
 Name=Components Test
 Name[ast]=Prueba de componentes
 Name[bs]=Test komponenti
 Name[ca]=Prova els components
 Name[ca@valencia]=Prova els components
--- a/examples/applets/testtheme/metadata.desktop
+++ b/examples/applets/testtheme/metadata.desktop
@ -2,6 +2,7 @@
 Encoding=UTF-8
 Keywords=
 Name=Theme Test
 Name[ast]=Prueba de tema
 Name[ca]=Prova el tema
 Name[ca@valencia]=Prova el tema
 Name[cs]=Test motivu
--- a/examples/applets/widgetgallery/metadata.desktop
+++ b/examples/applets/widgetgallery/metadata.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Widgets gallery
 Name[ast]=Galería de Widgets
 Name[bs]=galerija dodataka
 Name[ca]=Galeria d'estris
 Name[ca@valencia]=Galeria d'estris
--- a/examples/developerguide/basic/metadata.desktop
+++ b/examples/developerguide/basic/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Comment=Basic App
 Comment[ast]=Aplicación básica
 Comment[ca]=Aplicació bàsica
 Comment[ca@valencia]=Aplicació bàsica
 Comment[da]=Basal app
--- a/examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
+++ b/examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
@ -43,6 +43,7 @@ Name[zh_CN]=测试
 Name[zh_TW]=測試
 Comment=A dummy plugin for testing
 Comment[ar]=ملحقة دمية اختبارية
 Comment[ast]=Un complementu maniquín pa pruebes
 Comment[bs]=Lažni priključak za probe
 Comment[ca]=Un connector fals per a proves
 Comment[ca@valencia]=Un connector fals per a proves
--- a/src/desktoptheme/air/metadata.desktop
+++ b/src/desktoptheme/air/metadata.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Air
 Name[ar]=هواء
 Name[ast]=Air
 Name[bs]=Vazduh
 Name[ca]=Air
 Name[ca@valencia]=Air
--- a/src/desktoptheme/breeze-light/metadata.desktop
+++ b/src/desktoptheme/breeze-light/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Breeze Light
 Name[ast]=Breeze Light
 Name[ca]=Brisa clara
 Name[ca@valencia]=Brisa clara
 Name[cs]=Breeze Světlé
--- a/src/desktoptheme/breeze/metadata.desktop
+++ b/src/desktoptheme/breeze/metadata.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Breeze
 Name[ar]=نسيم
 Name[ast]=Breeze
 Name[ca]=Brisa
 Name[ca@valencia]=Brisa
 Name[cs]=Breeze
--- a/src/desktoptheme/oxygen/metadata.desktop
+++ b/src/desktoptheme/oxygen/metadata.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Oxygen
 Name[ar]=أوكسجين
 Name[ast]=Oxygen
 Name[bs]=kiseonik
 Name[ca]=Oxygen
 Name[ca@valencia]=Oxygen
@ -44,6 +45,7 @@ Name[zh_CN]=Oxygen
 Name[zh_TW]=Oxygen
 Comment=Theme done in the Oxygen style
 Comment[ar]=سمة مُصمَّمة بِنمط أوكسجين
 Comment[ast]=Tema fechu col estilu d'Oxygen
 Comment[bs]=Tema urađena u stilu Kiseonika
 Comment[ca]=Tema fet en l'estil Oxygen
 Comment[ca@valencia]=Tema fet en l'estil Oxygen
--- a/src/plasma/data/servicetypes/plasma-applet.desktop
+++ b/src/plasma/data/servicetypes/plasma-applet.desktop
@ -4,6 +4,7 @@ X-KDE-ServiceType=Plasma/Applet
 Comment=Plasma applet
 Comment[ar]=بُريمِج پلازما
 Comment[ast]=Appet de Plasma
 Comment[bs]=Plazma aplet
 Comment[ca]=Miniaplicació del Plasma
 Comment[ca@valencia]=Miniaplicació del Plasma
--- a/src/plasma/data/servicetypes/plasma-dataengine.desktop
+++ b/src/plasma/data/servicetypes/plasma-dataengine.desktop
@ -3,6 +3,7 @@ Type=ServiceType
 X-KDE-ServiceType=Plasma/DataEngine
 Comment=Plasma Data Engine
 Comment[ast]=Motor de datos de Plasma
 Comment[bs]=Plazma datomotor
 Comment[ca]=Motor de dades del Plasma
 Comment[ca@valencia]=Motor de dades del Plasma
--- a/src/plasma/data/servicetypes/plasma-generic.desktop
+++ b/src/plasma/data/servicetypes/plasma-generic.desktop
@ -2,6 +2,7 @@
 Type=ServiceType
 X-KDE-ServiceType=Plasma/Generic
 Name=Plasma Package
 Name[ast]=Paquete de Plasma
 Name[bs]=Plazma paket
 Name[ca]=Paquet del Plasma
 Name[ca@valencia]=Paquet del Plasma
@ -42,6 +43,7 @@ Name[x-test]=xxPlasma Packagexx
 Name[zh_CN]=Plasma 包
 Name[zh_TW]=Plasma 套件
 Comment=Generic Plasma Package
 Comment[ast]=Paquete xenéricu de Plasma
 Comment[bs]=Generički plazma paket
 Comment[ca]=Paquet genèric del Plasma
 Comment[ca@valencia]=Paquet genèric del Plasma
--- a/src/plasma/data/servicetypes/plasma-shell.desktop
+++ b/src/plasma/data/servicetypes/plasma-shell.desktop
@ -3,6 +3,7 @@ Type=ServiceType
 X-KDE-ServiceType=Plasma/Shell
 Name=Plasma Shell
 Name[ar]=صَدفة پلازما
 Name[ast]=Shell de Plasma
 Name[bs]=Plazma školjka
 Name[ca]=Intèrpret d'ordres del Plasma
 Name[ca@valencia]=Intèrpret d'ordes del Plasma
--- a/src/scriptengines/python/plasma-scriptengine-dataengine-python.desktop
+++ b/src/scriptengines/python/plasma-scriptengine-dataengine-python.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Python data engine
 Name[ar]=محرّك بيانات بايثون
 Name[ast]=Motor de datos de Python
 Name[ca]=Motor de dades en Python
 Name[ca@valencia]=Motor de dades en Python
 Name[cs]=Rozhraní v Pythonu
--- a/src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop
+++ b/src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Ruby Widget
 Name[ar]=ودجة روبي
 Name[ast]=Widget de Ruby
 Name[ca]=Estri en Ruby
 Name[ca@valencia]=Estri en Ruby
 Name[cs]=Ruby widget
--- a/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate
+++ b/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate
@ -1,6 +1,7 @@
 # KDE Config File
 [General]
 Name=Plasma QML/C++ Applet
 Name[ast]=Applet QML/C++ de Plasma
 Name[ca]=Miniaplicació QML/C++ del Plasma
 Name[ca@valencia]=Miniaplicació QML/C++ del Plasma
 Name[cs]=Aplet QML/C++ Plasma
--- a/templates/cpp-plasmoid/src/package/metadata.desktop
+++ b/templates/cpp-plasmoid/src/package/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=%{APPNAME}
 Name[ast]=%{APPNAME}
 Name[ca]=%{APPNAME}
 Name[ca@valencia]=%{APPNAME}
 Name[cs]=%{APPNAME}
@ -33,6 +34,7 @@ Name[x-test]=xx%{APPNAME}xx
 Name[zh_CN]=%{APPNAME}
 Name[zh_TW]=%{APPNAME}
 Comment=what your app does in a few words
 Comment[ast]=lo que fai la to aplicación nunes pallabres
 Comment[ca]=Què fa aquesta aplicació en poques paraules
 Comment[ca@valencia]=Què fa esta aplicació en poques paraules
 Comment[da]=nogle få ord om hvad din app gør
--- a/templates/plasma-wallpaper/package/metadata.desktop
+++ b/templates/plasma-wallpaper/package/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=%{APPNAME}
 Name[ast]=%{APPNAME}
 Name[ca]=%{APPNAME}
 Name[ca@valencia]=%{APPNAME}
 Name[cs]=%{APPNAME}
--- a/templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate
+++ b/templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate
@ -1,6 +1,7 @@
 # KDE Config File
 [General]
 Name=Simple Plasma Wallpaper
 Name[ast]=Fondu de pantalla cenciellu de Plasma
 Name[ca]=Fons d'escriptori senzill del Plasma
 Name[ca@valencia]=Fons d'escriptori senzill del Plasma
 Name[cs]=Jednoduchá tapeta pro prostředí Plasma
--- a/templates/qml-plasmoid/package/metadata.desktop
+++ b/templates/qml-plasmoid/package/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=%{APPNAME}
 Name[ast]=%{APPNAME}
 Name[ca]=%{APPNAME}
 Name[ca@valencia]=%{APPNAME}
 Name[cs]=%{APPNAME}
@ -33,6 +34,7 @@ Name[x-test]=xx%{APPNAME}xx
 Name[zh_CN]=%{APPNAME}
 Name[zh_TW]=%{APPNAME}
 Comment=what your app does in a few words
 Comment[ast]=lo que fai la to aplicación nunes pallabres
 Comment[ca]=Què fa aquesta aplicació en poques paraules
 Comment[ca@valencia]=Què fa esta aplicació en poques paraules
 Comment[da]=nogle få ord om hvad din app gør
--- a/templates/qml-plasmoid/qml-plasmoid.kdevtemplate
+++ b/templates/qml-plasmoid/qml-plasmoid.kdevtemplate
@ -1,6 +1,7 @@
 # KDE Config File
 [General]
 Name=Plasma QML Applet
 Name[ast]=Applet QML de Plasma
 Name[ca]=Miniaplicació QML del Plasma
 Name[ca@valencia]=Miniaplicació QML del Plasma
 Name[cs]=Aplet QML Plasma