From f22a9b5fe8cfb49c31bfb921df45e657162f1a53 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 9 Jan 2017 06:05:35 +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" --- components/shellprivate/widgetexplorer/plasmoids.knsrc | 1 + wallpapers/image/wallpaper.knsrc | 1 + 2 files changed, 2 insertions(+) diff --git a/components/shellprivate/widgetexplorer/plasmoids.knsrc b/components/shellprivate/widgetexplorer/plasmoids.knsrc index 6a8c68725..49f21b8f4 100644 --- a/components/shellprivate/widgetexplorer/plasmoids.knsrc +++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc @@ -2,6 +2,7 @@ Name=Plasma Widgets Name[ca]=Estris del Plasma Name[ca@valencia]=Estris del Plasma +Name[de]=Plasma-Miniprogramme Name[en_GB]=Plasma Widgets Name[es]=Elementos gráficos de Plasma Name[it]=Oggetti di Plasma diff --git a/wallpapers/image/wallpaper.knsrc b/wallpapers/image/wallpaper.knsrc index 0233c0279..516d16107 100644 --- a/wallpapers/image/wallpaper.knsrc +++ b/wallpapers/image/wallpaper.knsrc @@ -2,6 +2,7 @@ Name=Wallpapers Name[ca]=Fons d'escriptori Name[ca@valencia]=Fons d'escriptori +Name[de]=Hintergrundbilder Name[en_GB]=Wallpapers Name[es]=Fondos del escritorio Name[it]=Sfondi