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-01-30 09:40:55 +00:00 · 2016-01-30 09:40:55 +00:00 · bd3083e81f
commit bd3083e81f
parent 757523a324
20 changed files with 24 additions and 0 deletions
--- a/clients/aurorae/themes/plastik/package/metadata.desktop
+++ b/clients/aurorae/themes/plastik/package/metadata.desktop
@ -2,6 +2,7 @@
 Name=Plastik
 Name[af]=Plastiek
 Name[ar]=بلاستك
+Name[ast]=Plastik
 Name[be]=Plastik
 Name[be@latin]=Plastik
 Name[bg]=Пластик
--- a/effects/blur/blur_config.desktop
+++ b/effects/blur/blur_config.desktop
@ -8,6 +8,7 @@ X-KDE-ParentComponents=blur
 Name=Blur
 Name[af]=Blur
 Name[ar]=غشاوة
+Name[ast]=Desenfocar
 Name[be]=Blur
 Name[bg]=Замъгляване
 Name[bn]=ব্লার
--- a/effects/cube/cube_config.desktop
+++ b/effects/cube/cube_config.desktop
@ -7,6 +7,7 @@ X-KDE-ParentComponents=cube

 Name=Desktop Cube
 Name[ar]=سطح مكتب مكعّب
+Name[ast]=Cubu d'escritoriu
 Name[be@latin]=Rabočy kub
 Name[bg]=Кубичен работен плот
 Name[bn]=ডেস্কটপ কিউব
--- a/effects/cube/cubeslide_config.desktop
+++ b/effects/cube/cubeslide_config.desktop
@ -6,6 +6,7 @@ X-KDE-Library=kwin_cubeslide_config
 X-KDE-ParentComponents=cubeslide

 Name=Desktop Cube Animation
+Name[ast]=Animación del cubu d'escritoriu
 Name[bg]=Кубична анимация върху работен плот
 Name[bs]=Animacija kocke površi
 Name[ca]=Animació del cub d'escriptori
--- a/effects/desktopgrid/desktopgrid_config.desktop
+++ b/effects/desktopgrid/desktopgrid_config.desktop
@ -8,6 +8,7 @@ X-KDE-ParentComponents=desktopgrid
 Name=Desktop Grid
 Name[af]=Werkskerm rooster
 Name[ar]=شبكة سطح المكتب
+Name[ast]=Rexáu del escritoriu
 Name[be]=Сетка на працоўны стол
 Name[be@latin]=Rabočaja sietka
 Name[bg]=Мрежест работен плот
--- a/effects/dialogparent/package/metadata.desktop
+++ b/effects/dialogparent/package/metadata.desktop
@ -2,6 +2,7 @@
 Name=Dialog Parent
 Name[af]=Voorafgaande dialoog
 Name[ar]=مولدة الحوار
+Name[ast]=Pá del diálogu
 Name[be]=Бацькоўскае акно
 Name[bg]=Основен прозорец
 Name[bs]=Roditelj dijaloga
@ -77,6 +78,7 @@ Name[zh_TW]=上層對話框
 Icon=preferences-system-windows-effect-dialog-parent
 Comment=Darkens the parent window of the currently active dialog
 Comment[ar]=تعتم النافذة المولدة للحوار النشط حالياً
+Comment[ast]=Escurez la ventana pá del diálogu anguaño activu
 Comment[bg]=Затъмняване на главния от активните прозорци
 Comment[bs]=Zatamnjuje roditeljski prozor trenutno aktivnog dijaloga
 Comment[ca]=Enfosqueix la finestra principal del diàleg actual actiu
--- a/effects/fade/package/metadata.desktop
+++ b/effects/fade/package/metadata.desktop
@ -2,6 +2,7 @@
 Name=Fade
 Name[af]=Vervaag
 Name[ar]=التلاشي
+Name[ast]=Esvanecer
 Name[be]=Павольнае знікненне
 Name[bg]=Избледняване
 Name[bn]=ফেড
@ -81,6 +82,7 @@ Name[zh_TW]=淡出
 Icon=preferences-system-windows-effect-fade
 Comment=Make windows smoothly fade in and out when they are shown or hidden
 Comment[ar]=اجعل النوافذ تظهر وتتلاشى بنعومة عند إظهاراها وإخفائها
+Comment[ast]=Fai que les ventanes apaezan o s'esvanezan suavemente al amosales o anubriles
 Comment[bg]=Постепенно избледняване при показване и скриване на прозорците
 Comment[bs]=Prozori glatko izranjaju i utapaju se pri pojavljivanju i sakrivanju
 Comment[ca]=Fa que les finestres s'encenguin o s'apaguin de manera gradual quan es mostren o s'oculten
--- a/effects/fadedesktop/package/metadata.desktop
+++ b/effects/fadedesktop/package/metadata.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Fade Desktop
 Name[ar]=تلاشِ سطح المكتب
+Name[ast]=Esvanecer escritoriu
 Name[bg]=Избледняване на работния плот
 Name[bs]=Utapanje površi
 Name[ca]=Esvaïment de l'escriptori
@ -69,6 +70,7 @@ Name[zh_TW]=淡出淡入桌面
 Icon=preferences-system-windows-effect-fadedesktop
 Comment=Fade between virtual desktops when switching between them
 Comment[ar]=يجعل أسطح المكتب تتلاشى عند التبيديل بينها
+Comment[ast]=Esvanez ente los escritorios virtuales al conmutar ente ellos
 Comment[bg]=Избледняване при превключване между работните плотове
 Comment[bs]=Jedna virtuelna površ utapa se u drugu pri prebacivanju
 Comment[ca]=Esvaeix entre els escriptoris virtuals quan es commuta entre ells
--- a/effects/magiclamp/magiclamp_config.desktop
+++ b/effects/magiclamp/magiclamp_config.desktop
@ -7,6 +7,7 @@ X-KDE-ParentComponents=magiclamp

 Name=Magic Lamp
 Name[ar]=المصباح السحري
+Name[ast]=Llámpara máxica
 Name[be@latin]=Mahičnaja lampa
 Name[bg]=Вълшебна лампа
 Name[bs]=Magična lampa
--- a/effects/magnifier/magnifier_config.desktop
+++ b/effects/magnifier/magnifier_config.desktop
@ -8,6 +8,7 @@ X-KDE-ParentComponents=magnifier
 Name=Magnifier
 Name[af]=Vergroter
 Name[ar]=المكبّر
+Name[ast]=Lente
 Name[be]=Павелічальная лупа
 Name[be@latin]=Lupa
 Name[bg]=Увеличител
--- a/effects/mouseclick/mouseclick_config.desktop
+++ b/effects/mouseclick/mouseclick_config.desktop
@ -6,6 +6,7 @@ X-KDE-Library=kwin_mouseclick_config
 X-KDE-ParentComponents=mouseclick

 Name=Mouse Click Animation
+Name[ast]=Animación del clic del mur
 Name[bs]=Animacija klika mišem
 Name[ca]=Animació de clic de ratolí
 Name[ca@valencia]=Animació de clic de ratolí
--- a/effects/scalein/package/metadata.desktop
+++ b/effects/scalein/package/metadata.desktop
@ -78,6 +78,7 @@ Name[zh_TW]=縮放
 Icon=preferences-system-windows-effect-scale-in
 Comment=Animate the appearing of windows
 Comment[ar]=يحرك عملية ظهور النوافذ
+Comment[ast]=Anima l'apaición de ventanes
 Comment[be@latin]=Animuje źjaŭleńnie akon.
 Comment[bg]=Анимирано показване на прозорците
 Comment[bs]=Animira pojavljivanje prozora
--- a/effects/translucency/package/metadata.desktop
+++ b/effects/translucency/package/metadata.desktop
@ -84,6 +84,7 @@ Name[zh_TW]=半透明
 Icon=preferences-system-windows-effect-translucency
 Comment=Make windows translucent under different conditions
 Comment[ar]=يجعل النوافذ شبه شفافة في شروط مختلفة
+Comment[ast]=Fai les ventanes tresllúcides so diferentes condiciones
 Comment[be@latin]=Robić vokny prazrystymi dla peŭnych umovaŭ
 Comment[bg]=Прозрачност на прозорците при определени условия
 Comment[bs]=Prozori se provide pod različitim uslovima
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@ -13,6 +13,7 @@ X-KDE-Weight=40

 Name=Window Decorations
 Name[ar]=زخارف النوافذ
+Name[ast]=Decoraciones de ventanes
 Name[bg]=Декорации на прозорците
 Name[bs]=Dekoracije prozora
 Name[ca]=Decoració de les finestres
--- a/kcmkwin/kwindesktop/desktop.desktop
+++ b/kcmkwin/kwindesktop/desktop.desktop
@ -13,6 +13,7 @@ X-KDE-Weight=60

 Name=Virtual Desktops
 Name[ar]=أسطح المكتب الافتراضية
+Name[ast]=Escritorios virtuales
 Name[bg]=Виртуални работни плотове
 Name[bs]=Virtuelne površi
 Name[ca]=Escriptoris virtuals
--- a/kcmkwin/kwinoptions/kwinfocus.desktop
+++ b/kcmkwin/kwinoptions/kwinfocus.desktop
@ -11,6 +11,7 @@ X-KDE-PluginKeyword=kwinfocus
 Name=Focus
 Name[af]=Fokus
 Name[ar]=التركيز
+Name[ast]=Focu
 Name[be]=Фокус
 Name[be@latin]=Fokus
 Name[bg]=Фокус
--- a/kcmkwin/kwinoptions/kwinoptions.desktop
+++ b/kcmkwin/kwinoptions/kwinoptions.desktop
@ -15,6 +15,7 @@ X-KDE-Weight=40
 Name=Window Behavior
 Name[af]=Venstergedrag
 Name[ar]=سلوك النوافذ
+Name[ast]=Comportamientu de ventanes
 Name[be]=Паводзіны вокнаў
 Name[be@latin]=Pavodziny akna
 Name[bg]=Поведение на прозорците
--- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
+++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
@ -13,6 +13,7 @@ X-KDE-Weight=50

 Name=Screen Edges
 Name[ar]=حواف الشاشة
+Name[ast]=Berbesos de pantalla
 Name[bg]=Краища на екрана
 Name[bs]=Ivice ekrana
 Name[ca]=Vores de la pantalla
--- a/kcmkwin/kwinscripts/kwinscripts.desktop
+++ b/kcmkwin/kwinscripts/kwinscripts.desktop
@ -9,6 +9,7 @@ X-KDE-PluginKeyword=kwin-scripts
 X-KDE-ParentApp=kcontrol

 X-KDE-Keywords=kwin script
+X-KDE-Keywords[ast]=script de kwin
 X-KDE-Keywords[bs]=kwin skripta
 X-KDE-Keywords[ca]=script del kwin
 X-KDE-Keywords[ca@valencia]=script del kwin
--- a/kwin.notifyrc
+++ b/kwin.notifyrc
@ -68,6 +68,7 @@ Comment[zh_TW]=KWin 視窗管理員
 [Event/compositingsuspendeddbus]
 Name=Compositing has been suspended
 Name[ar]=عُلِّق التركيب
+Name[ast]=Suspendióse la composición
 Name[bg]=Ефектите са временно спрени
 Name[bs]=Slaganje je suspendovano
 Name[ca]=S'ha suspès la composició
@ -132,6 +133,7 @@ Name[zh_CN]=混成已被中断
 Name[zh_TW]=組合效能已被暫停
 Comment=Another application has requested to suspend compositing.
 Comment[ar]=تطبيق أخر طلب تعليق التركيب
+Comment[ast]=Otra aplicación solicitó suspender la composición.
 Comment[bg]=Друго приложение е поискало временно спиране на ефектите.
 Comment[bs]=Drugi program je zatražio da se slaganje suspenduje.
 Comment[ca]=Una altra aplicació ha sol·licitat de suspendre la composició.