yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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 2015-11-17 13:07:36 +00:00
parent 57a3cea142
commit 6bb9f6db7b
11 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
backends/x11/x11.json
View file

@ -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",

1
effects/maximize/package/metadata.desktop
View file

@ -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

2
kcmkwin/kwincompositing/kcmkwineffects.desktop
View file

@ -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

2
kcmkwin/kwincompositing/kwincompositing.desktop
View file

@ -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

1
kcmkwin/kwindecoration/kwindecoration.desktop
View file

@ -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

1
kcmkwin/kwindesktop/desktop.desktop
View file

@ -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

1
kcmkwin/kwinoptions/kwinoptions.desktop
View file

@ -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

2
kcmkwin/kwinrules/kwinrules.desktop
View file

@ -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

1
kcmkwin/kwinscreenedges/kwinscreenedges.desktop
View file

@ -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

2
kcmkwin/kwinscripts/kwinscripts.desktop
View file

@ -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

2
kcmkwin/kwintabbox/kwintabbox.desktop
View file

@ -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