From 516ad25658dd0a6b10bde9e1822dd801228e04a8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 15 Jan 2017 07:48:05 +0100 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/kwintabbox/kwinswitcher.knsrc | 1 + 1 file changed, 1 insertion(+) diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc index eb2032ee23..4b66a4a821 100644 --- 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