From a3c7eac1b872e636a5b0c7d00dc413a598e70b33 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 14 May 2015 10:21:14 +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" --- kcmkwin/kwincompositing/kcmkwineffects.desktop | 1 + kcmkwin/kwinscreenedges/kwinscreenedges.desktop | 2 +- kcmkwin/kwinscripts/kwinscripts.desktop | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop index c51ff51340..ef7f559e79 100644 --- a/kcmkwin/kwincompositing/kcmkwineffects.desktop +++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop @@ -29,6 +29,7 @@ Name[hu]=Asztali effektusok Name[ia]=Effectos de scriptorio Name[id]=Efek Desktop Name[it]=Effetti del desktop +Name[ja]=デスクトップ効果 Name[ko]=데스크톱 효과 Name[lt]=Darbastalio efektai Name[nb]=Skrivebordseffekter diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index 91788d1bc8..9f04c6a52d 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -82,7 +82,7 @@ Name[zh_TW]=螢幕邊緣 Comment=Active Screen Corners and Edges Comment[bs]=Ivice i uglovi aktivnog ekrana -Comment[ca]=Cantonades i vores de la pantalla activa +Comment[ca]=Cantonades i vores actives de la pantalla Comment[cs]=Aktivní rohy a hrany obrazovky Comment[da]=Aktive skærmhjørner og -kanter Comment[de]=Aktive Bildschirmränder diff --git a/kcmkwin/kwinscripts/kwinscripts.desktop b/kcmkwin/kwinscripts/kwinscripts.desktop index b269261b45..1718f4d688 100644 --- a/kcmkwin/kwinscripts/kwinscripts.desktop +++ b/kcmkwin/kwinscripts/kwinscripts.desktop @@ -108,7 +108,7 @@ Name[zh_CN]=KWin 脚本 Name[zh_TW]=KWin 文稿 Comment=Manage KWin scripts Comment[bs]=Podesi KWin skripte -Comment[ca]=Gestiona scripts del KWin +Comment[ca]=Gestiona els scripts del KWin Comment[ca@valencia]=Gestiona scripts del KWin Comment[cs]=Spravovat skripty KWinu Comment[da]=Håndtér KWin-scripts