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-12-22 05:52:51 +01:00
parent 6ae3a073db
commit 2f4e59e902
27 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/applets/bugreport/metadata.desktop
View File

@ -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;

1
examples/applets/conditionalloader/metadata.desktop
View File

@ -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

1
examples/applets/config/metadata.desktop
View File

@ -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ó

1
examples/applets/dataenginemodel/metadata.desktop
View File

@ -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

1
examples/applets/notes/metadata.desktop
View File

@ -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

1
examples/applets/qmltasks/metadata.desktop
View File

@ -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

1
examples/applets/testcomponents/metadata.desktop
View File

@ -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

1
examples/applets/testtheme/metadata.desktop
View File

@ -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

1
examples/applets/widgetgallery/metadata.desktop
View File

@ -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

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

@ -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

1
examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
View File

@ -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

1
src/desktoptheme/air/metadata.desktop
View File

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Air
Name[ar]=هواء
Name[ast]=Air
Name[bs]=Vazduh
Name[ca]=Air
Name[ca@valencia]=Air

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

@ -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é

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

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Breeze
Name[ar]=نسيم
Name[ast]=Breeze
Name[ca]=Brisa
Name[ca@valencia]=Brisa
Name[cs]=Breeze

2
src/desktoptheme/oxygen/metadata.desktop
View File

@ -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

1
src/plasma/data/servicetypes/plasma-applet.desktop
View File

@ -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

1
src/plasma/data/servicetypes/plasma-dataengine.desktop
View File

@ -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

2
src/plasma/data/servicetypes/plasma-generic.desktop
View File

@ -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

1
src/plasma/data/servicetypes/plasma-shell.desktop
View File

@ -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

1
src/scriptengines/python/plasma-scriptengine-dataengine-python.desktop
View File

@ -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

1
src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop
View File

@ -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

1
templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate
View File

@ -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

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

@ -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

1
templates/plasma-wallpaper/package/metadata.desktop
View File

@ -1,5 +1,6 @@
[Desktop Entry]
Name=%{APPNAME}
Name[ast]=%{APPNAME}
Name[ca]=%{APPNAME}
Name[ca@valencia]=%{APPNAME}
Name[cs]=%{APPNAME}

1
templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate
View File

@ -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

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

@ -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

1
templates/qml-plasmoid/qml-plasmoid.kdevtemplate
View File

@ -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