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"
2015-12-06 09:17:34 +00:00 · 2015-12-06 09:17:34 +00:00 · c6aafe23de
parent 03909b9d58
commit c6aafe23de
6 changed files with 6 additions and 0 deletions
--- a/clients/aurorae/themes/plastik/package/metadata.desktop
+++ b/clients/aurorae/themes/plastik/package/metadata.desktop
@ -89,6 +89,7 @@ Name[zh_CN]=Plastik
 Name[zh_TW]=Plastik
 Comment=The classic theme known from KDE 3
 Comment[ar]=السّمة الكلاسيكيّة المعروفة من كدي 3
+Comment[ast]=El tema clásicu conocíu de KDE 3
 Comment[bs]=Klasična tema iz KDE 3
 Comment[ca]=El tema clàssic conegut des del KDE 3
 Comment[ca@valencia]=El tema clàssic conegut des del KDE 3
--- a/effects/kwineffect.desktop
+++ b/effects/kwineffect.desktop
@ -5,6 +5,7 @@ X-KDE-ServiceType=KWin/Effect
 Comment=KWin Effect
 Comment[af]=KWin-effek
 Comment[ar]=تأثيرات كوين
+Comment[ast]=Efeutu de KWin
 Comment[be]=Эфекты KWin
 Comment[be@latin]=Efekty akońnika „KWin”
 Comment[bg]=Ефект KWin
--- a/kcmkwin/kwinoptions/kwinactions.desktop
+++ b/kcmkwin/kwinoptions/kwinactions.desktop
@ -100,6 +100,7 @@ Name[zh_CN]=动作
 Name[zh_TW]=動作

 Comment=Mouse Actions on Windows
+Comment[ast]=Aiciones del mur en ventanes
 Comment[bs]=Akcioje miša na prozorima
 Comment[ca]=Accions del ratolí en les finestres
 Comment[ca@valencia]=Accions del ratolí en les finestres
--- a/kcmkwin/kwinoptions/kwinadvanced.desktop
+++ b/kcmkwin/kwinoptions/kwinadvanced.desktop
@ -100,6 +100,7 @@ Name[zh_CN]=高级
 Name[zh_TW]=進階

 Comment=Advanced Window Management Features
+Comment[ast]=Carauterístiques avanzaes de xestión de ventanes
 Comment[bs]=Napredne mogućnosti upravljanja prozoeima
 Comment[ca]=Característiques avançades per a la gestió de les finestres
 Comment[ca@valencia]=Característiques avançades per a la gestió de les finestres
--- a/kcmkwin/kwinoptions/kwinmoving.desktop
+++ b/kcmkwin/kwinoptions/kwinmoving.desktop
@ -98,6 +98,7 @@ Name[zh_CN]=移动
 Name[zh_TW]=移動

 Comment=Window Moving
+Comment[ast]=Movición de ventanes
 Comment[bs]=Kretanje prozora
 Comment[ca]=Moviment de les finestres
 Comment[ca@valencia]=Moviment de les finestres
--- a/kwin.notifyrc
+++ b/kwin.notifyrc
@ -2,6 +2,7 @@
 IconName=kwin
 Comment=KWin Window Manager
 Comment[ar]=مدير النوافذ كوين
+Comment[ast]=Xestor de ventanes KWin
 Comment[bg]=Мениджър на прозорци KWin
 Comment[bs]=Menadžer prozora K‑vin
 Comment[ca]=Gestor de finestres KWin