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"
11 years ago · a3c7eac1b8
parent 42768d515a
commit a3c7eac1b8
3 changed files with 3 additions and 2 deletions
--- 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
--- 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
--- 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