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"
9 years ago · 516ad25658
parent 00c68891c7
commit 516ad25658
1 changed files with 1 additions and 0 deletions
--- a/kcmkwin/kwintabbox/kwinswitcher.knsrc
+++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc
@ -2,6 +2,7 @@
 Name=Window Manager Switching Layouts
 Name[ca]=Disposicions del commutador del gestor de finestres
 Name[ca@valencia]=Disposicions del commutador del gestor de finestres
+Name[de]=Wechsel-Layout für Fensterverwaltung
 Name[en_GB]=Window Manager Switching Layouts
 Name[es]=Esquemas de cambio del gestor de ventanas
 Name[ia]=Disposition de commutator de gerente de fenestra