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-02-06 09:49:14 +00:00
parent 5c14b30ce4
commit 13dc03991d
8 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
[Desktop Entry]
Comment=Example on how to manage Drop data
Comment[ast]=Exemplu de cómo xestionar datos Drop
Comment[bs]=Primjer upravljanja ispuštenim podacima
Comment[ca]=Exemple de com gestionar dades «Drop»
Comment[ca@valencia]=Exemple de com gestionar dades «Drop»

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

@ -39,6 +39,7 @@ Name[x-test]=xxNow playing (QML)xx
Name[zh_CN]=正在播放 (QML)
Name[zh_TW]=現正播放（QML）
Comment=A proof of concept media player controller qml
Comment[ast]=Una prueba de conceutu de controlador de reproductor multimedia de qml
Comment[bs]=Dokaz koncepta media player upravljača qml
Comment[ca]=Una prova del concepte de controlador qml per a un reproductor multimèdia
Comment[ca@valencia]=Una prova del concepte de controlador qml per a un reproductor multimèdia

2
examples/applets/testshaders/metadata.desktop
View File

@ -2,6 +2,7 @@
Encoding=UTF-8
Keywords=
Name=Shader Test
Name[ast]=Prueba de solombres
Name[bs]=Šader test
Name[ca]=Prova les ombres
Name[ca@valencia]=Prova les ombres
@ -39,6 +40,7 @@ Name[x-test]=xxShader Testxx
Name[zh_CN]=着色器测试
Name[zh_TW]=陰影測試
Comment=Futzing with Visual Effects
Comment[ast]=Xuegu colos efeutos visuales
Comment[bs]=Futzing sa vizuelnim efektima
Comment[ca]=Jugant amb els efectes visuals
Comment[ca@valencia]=Jugant amb els efectes visuals

1
examples/containments/testcontainment/metadata.desktop
View File

@ -2,6 +2,7 @@
Encoding=UTF-8
Keywords=
Name=Containment Test
Name[ast]=Prueba de contención
Name[bs]=Sadržajni test
Name[ca]=Prova el contenidor
Name[ca@valencia]=Prova el contenidor

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

@ -44,6 +44,7 @@ Name[zh_CN]=大气
Name[zh_TW]=Air
Comment=A breath of fresh air
Comment[ar]=نسمة من الهواء المنعش
Comment[ast]=Un soplíu d'aire fresco
Comment[bs]=Dašak svježeg vazduha
Comment[ca]=Una alenada d'aire fresc
Comment[ca@valencia]=Una alenada d'aire fresc

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

@ -3,6 +3,7 @@ Type=ServiceType
X-KDE-ServiceType=Plasma/ContainmentActions
Comment=Plasma ContainmentActions
Comment[ast]=ContainmentActions de Plasma
Comment[bs]=Plazma radnje sadržilaca
Comment[ca]=«ContainmentActions» del Plasma
Comment[ca@valencia]=«ContainmentActions» del Plasma

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

@ -3,6 +3,7 @@ Type=ServiceType
X-KDE-ServiceType=Plasma/ScriptEngine
Comment=Scripting language extension for Plasma
Comment[ast]=Estensión del llinguax de scripts pa Plasma
Comment[bs]=Proširenje Plazme za skriptne jezike
Comment[ca]=Extensió pel llenguatge de creació de scripts pel Plasma
Comment[ca@valencia]=Extensió pel llenguatge de creació de scripts pel Plasma

2
src/scriptengines/python/plasma-scriptengine-runner-python.desktop
View File

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Python Runner
Name[ar]=مشغِّل بايثون
Name[ast]=Runner de Python
Name[ca]=Executor en Python
Name[ca@valencia]=Executor en Python
Name[cs]=Python spouštěč
@ -40,6 +41,7 @@ Name[zh_CN]=Python 运行器
Name[zh_TW]=Python 執行器
Comment=Plasma Runner support for Python
Comment[ar]=دعم مشغِّل پلازما لِبايثون
Comment[ast]=Sofitu de Runner de Plasma pa Python
Comment[ca]=Implementació d'un executor del Plasma per a Python
Comment[ca@valencia]=Implementació d'un executor del Plasma per a Python
Comment[cs]=Podpora Plasma spouštěče pro Python