From 6bb9f6db7b0e2d7a8e796db33f728b14a6f4f946 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 17 Nov 2015 13:07:36 +0000 Subject: [PATCH] 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" --- backends/x11/x11.json | 1 + effects/maximize/package/metadata.desktop | 1 + kcmkwin/kwincompositing/kcmkwineffects.desktop | 2 ++ kcmkwin/kwincompositing/kwincompositing.desktop | 2 ++ kcmkwin/kwindecoration/kwindecoration.desktop | 1 + kcmkwin/kwindesktop/desktop.desktop | 1 + kcmkwin/kwinoptions/kwinoptions.desktop | 1 + kcmkwin/kwinrules/kwinrules.desktop | 2 ++ kcmkwin/kwinscreenedges/kwinscreenedges.desktop | 1 + kcmkwin/kwinscripts/kwinscripts.desktop | 2 ++ kcmkwin/kwintabbox/kwintabbox.desktop | 2 ++ 11 files changed, 16 insertions(+) diff --git a/backends/x11/x11.json b/backends/x11/x11.json index 68e55f6c74..a5e1b871ac 100644 --- a/backends/x11/x11.json +++ b/backends/x11/x11.json @@ -25,6 +25,7 @@ "Description[zh_CN]": "渲染到 X11 窗口系统上的嵌套窗口中", "Id": "KWinWaylandX11Backend", "Name": "x11", + "Name[ast]": "x11", "Name[ca@valencia]": "X11", "Name[ca]": "X11", "Name[cs]": "x11", diff --git a/effects/maximize/package/metadata.desktop b/effects/maximize/package/metadata.desktop index 202908ffc8..045efc3af9 100644 --- a/effects/maximize/package/metadata.desktop +++ b/effects/maximize/package/metadata.desktop @@ -47,6 +47,7 @@ Comment[zh_TW]=視窗最大化/回復時的動畫 Encoding=UTF-8 Icon=preferences-system-windows-effect-maximize Name=Maximize +Name[ast]=Maximizar Name[bs]=Maksimiziraj Name[ca]=Maximitza Name[ca@valencia]=Maximitza diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop index eec2875079..9059d199a0 100644 --- a/kcmkwin/kwincompositing/kcmkwineffects.desktop +++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop @@ -13,6 +13,7 @@ X-KDE-System-Settings-Parent-Category=desktopbehavior X-KDE-Weight=50 Name=Desktop Effects +Name[ast]=Efeutos d'escritoriu Name[bs]=Efekti površi Name[ca]=Efectes d'escriptori Name[ca@valencia]=Efectes d'escriptori @@ -56,6 +57,7 @@ Name[x-test]=xxDesktop Effectsxx Name[zh_CN]=桌面特效 Name[zh_TW]=桌面效果 Comment=Desktop Effects +Comment[ast]=Efeutos d'escritoriu Comment[bs]=Efekti površi Comment[ca]=Efectes d'escriptori Comment[ca@valencia]=Efectes d'escriptori diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index 150d400b9e..50a9fa658a 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -13,6 +13,7 @@ X-KDE-System-Settings-Parent-Category=display X-KDE-Weight=60 Name=Compositor +Name[ast]=Compositor Name[bs]=Compositor Name[ca]=Compositor Name[ca@valencia]=Compositor @@ -54,6 +55,7 @@ Name[x-test]=xxCompositorxx Name[zh_CN]=混成器 Name[zh_TW]=組合器 Comment=Compositor Settings for Desktop Effects +Comment[ast]=Axustes del compositor pa efeutos d'escritoriu Comment[bs]=Postavke Compositor-a za Desktop Efekte Comment[ca]=Arranjament del compositor pels efectes d'escriptori Comment[ca@valencia]=Arranjament del compositor pels efectes d'escriptori diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index 0c46797be4..c14e92f35d 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -73,6 +73,7 @@ Name[zh_CN]=窗口装饰 Name[zh_TW]=視窗裝飾 Comment=Look and Feel of Window Titles +Comment[ast]=Aspeutu y sintir de los títulos de ventana Comment[bs]=Izgled i osjećaj naslova prozora Comment[ca]=Aspecte i comportament dels títols de les finestres Comment[ca@valencia]=Aspecte i comportament dels títols de les finestres diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop index a466584f4c..f07244f94c 100644 --- a/kcmkwin/kwindesktop/desktop.desktop +++ b/kcmkwin/kwindesktop/desktop.desktop @@ -75,6 +75,7 @@ Name[zh_CN]=虚拟桌面 Name[zh_TW]=虛擬桌面 Comment=Navigation, Number and Layout of Virtual Desktops +Comment[ast]=Navegación, numberación y distribución d'escritorios virtuales Comment[bs]=Navigacija, broj i izgled virtualnih desktopa Comment[ca]=Navegació, nombre i disposició dels escriptoris virtuals Comment[ca@valencia]=Navegació, nombre i disposició dels escriptoris virtuals diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index a377b9434c..5d96e37d46 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -101,6 +101,7 @@ Name[zh_CN]=窗口行为 Name[zh_TW]=視窗行為 Comment=Window Actions and Behavior +Comment[ast]=Aiciones y comportamientu de ventanes Comment[bs]=Akcije i ponašanje prozora Comment[ca]=Accions i comportament de les finestres Comment[ca@valencia]=Accions i comportament de les finestres diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop index c3a9b4e4f8..85c95fdebd 100644 --- a/kcmkwin/kwinrules/kwinrules.desktop +++ b/kcmkwin/kwinrules/kwinrules.desktop @@ -13,6 +13,7 @@ X-KDE-Weight=120 Name=Window Rules Name[ar]=قواعد النوافذ +Name[ast]=Regles de ventanes Name[bg]=Правила за прозорци Name[bs]=Pravila prozora Name[ca]=Regles de les finestres @@ -74,6 +75,7 @@ Name[zh_CN]=窗口规则 Name[zh_TW]=視窗規則 Comment=Individual Window Behavior +Comment[ast]=Comportamientu individual de ventanes Comment[bs]=Ponašanje pojedinog prozora Comment[ca]=Comportament individual de les finestres Comment[ca@valencia]=Comportament individual de les finestres diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index a14359a25c..133a32e360 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -81,6 +81,7 @@ Name[zh_CN]=屏幕边缘 Name[zh_TW]=螢幕邊緣 Comment=Active Screen Corners and Edges +Comment[ast]=Esquines y berbesos de pantalla activos Comment[bs]=Ivice i uglovi aktivnog ekrana Comment[ca]=Cantonades i vores actives de la pantalla Comment[ca@valencia]=Cantonades i vores actives de la pantalla diff --git a/kcmkwin/kwinscripts/kwinscripts.desktop b/kcmkwin/kwinscripts/kwinscripts.desktop index 1969bfffaf..36e202b785 100644 --- a/kcmkwin/kwinscripts/kwinscripts.desktop +++ b/kcmkwin/kwinscripts/kwinscripts.desktop @@ -61,6 +61,7 @@ X-KDE-System-Settings-Parent-Category=windowmanagement X-KDE-Weight=70 Name=KWin Scripts +Name[ast]=Scripts KWin Name[bs]=KWin skripte Name[ca]=Scripts del KWin Name[ca@valencia]=Scripts del KWin @@ -111,6 +112,7 @@ Name[x-test]=xxKWin Scriptsxx Name[zh_CN]=KWin 脚本 Name[zh_TW]=KWin 文稿 Comment=Manage KWin scripts +Comment[ast]=Xestión de scripts KWin Comment[bs]=Podesi KWin skripte Comment[ca]=Gestiona els scripts del KWin Comment[ca@valencia]=Gestiona els scripts del KWin diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop index 5060388f1e..08c923a1c0 100644 --- a/kcmkwin/kwintabbox/kwintabbox.desktop +++ b/kcmkwin/kwintabbox/kwintabbox.desktop @@ -12,6 +12,7 @@ X-KDE-Weight=60 Name=Task Switcher Name[ar]=مبدّل المهام +Name[ast]=Conmutador de xeres Name[bg]=Превключване на задачи Name[bs]=Prebacivanje zadataka Name[ca]=Commutador de tasques @@ -71,6 +72,7 @@ Name[x-test]=xxTask Switcherxx Name[zh_CN]=任务切换器 Name[zh_TW]=工作切換器 Comment=Navigation Through Windows +Comment[ast]=Navegación pente ventanes Comment[bs]=Kretanje kroz prozore Comment[ca]=Navegació per les finestres Comment[ca@valencia]=Navegació per les finestres