From b4f2611125f0f4c73f2ce359cd8eafefc3fba0f9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 4 Nov 2016 09:43:11 +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" --- templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate | 1 + templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate | 1 + 2 files changed, 2 insertions(+) diff --git a/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate b/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate index d70ff7982..5c1bf7520 100644 --- a/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate +++ b/templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate @@ -3,6 +3,7 @@ Name=Plasma QML/C++ Applet Name[ca]=Miniaplicació QML/C++ del Plasma Name[ca@valencia]=Miniaplicació QML/C++ del Plasma +Name[cs]=Aplet QML/C++ Plasma Name[de]=Plasma-QML/C++-Miniprogramm Name[en_GB]=Plasma QML/C++ Applet Name[es]=Miniaplicación en QML/C++ para Plasma diff --git a/templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate b/templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate index db0f50ed5..1a8943841 100644 --- a/templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate +++ b/templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate @@ -3,6 +3,7 @@ Name=Simple Plasma Wallpaper Name[ca]=Fons d'escriptori senzill del Plasma Name[ca@valencia]=Fons d'escriptori senzill del Plasma +Name[cs]=Jednoduchá tapeta pro prostředí Plasma Name[de]=Einfaches Plasma-Hintergrundbild Name[en_GB]=Simple Plasma Wallpaper Name[es]=Fondo de escritorio sencillo para Plasma