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-23 05:42:04 +01:00
parent c0ce37551b
commit 9581ada651
5 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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-lookandfeel.desktop
View File

@ -3,6 +3,7 @@ Type=ServiceType
X-KDE-ServiceType=Plasma/LookAndFeel
Name=Plasma Look and Feel
Name[ar]=مظهر وَإحساس پلازما
Name[ast]=Aspeutu y sentir de Plasma
Name[bs]=Plazma izgled i osjećaj
Name[ca]=Aspecte i comportament del Plasma
Name[ca@valencia]=Aspecte i comportament del Plasma

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

@ -4,6 +4,7 @@ X-KDE-ServiceType=Plasma/Service
Comment=Plasma service
Comment[ar]=خدمة پلازما
Comment[ast]=Serviciu de Plasma
Comment[bs]=Plazma usluga
Comment[ca]=Servei del Plasma
Comment[ca@valencia]=Servei del Plasma

1
src/scriptengines/qml/data/plasma-scriptengine-applet-declarative.desktop
View File

@ -1,5 +1,6 @@
[Desktop Entry]
Name=Declarative widget
Name[ast]=Widget declarativu
Name[bs]=Deklarativna grafička kontrola
Name[ca]=Estri declaratiu
Name[ca@valencia]=Estri declaratiu

1
src/scriptengines/qml/data/plasma-wallpaper.desktop
View File

@ -4,6 +4,7 @@ X-KDE-ServiceType=Plasma/Wallpaper
Comment=Plasma wallpaper
Comment[ar]=خلفية پلازما
Comment[ast]=Fondu de Plasma
Comment[bs]=Plazma tapeta
Comment[ca]=Fons d'escriptori del Plasma
Comment[ca@valencia]=Fons d'escriptori del Plasma