From b22d0422de437b06fda135fcc09986c3f71c66d6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 11 Oct 2018 06:00:23 +0200 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/wallpaperplugin/wallpaperplugin.knsrc | 4 ++++ gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop | 1 + 2 files changed, 5 insertions(+) diff --git a/components/shellprivate/wallpaperplugin/wallpaperplugin.knsrc b/components/shellprivate/wallpaperplugin/wallpaperplugin.knsrc index 749730cd8..9dfe0829e 100644 --- a/components/shellprivate/wallpaperplugin/wallpaperplugin.knsrc +++ b/components/shellprivate/wallpaperplugin/wallpaperplugin.knsrc @@ -1,5 +1,9 @@ [KNewStuff3] Name=Wallpaper Plugins +Name[ca]=Connectors de fons de pantalla +Name[sv]=Insticksprogram för skrivbordsunderlägg +Name[uk]=Додатки зображень тла +Name[x-test]=xxWallpaper Pluginsxx ProvidersUrl=https://download.kde.org/ocs/providers.xml Categories=Plasma Wallpaper Plugin diff --git a/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop b/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop index c7bcac23f..e5bd1f824 100644 --- a/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop +++ b/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop @@ -4,6 +4,7 @@ Name=GMenuDBusMenuProxy Name[ca]=GMenuDBusMenuProxy Name[ca@valencia]=GMenuDBusMenuProxy Name[da]=GMenuDBusMenuProxy +Name[de]=GMenuDBusMenuProxy Name[en_GB]=GMenuDBusMenuProxy Name[es]=GMenuDBusMenuProxy Name[eu]=GMenuDBusMenuProxy