From e86e3106b7386f712a222b0e68098c9307861a76 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 19 Mar 2015 09:51:44 +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" --- runners/powerdevil/plasma-runner-powerdevil.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runners/powerdevil/plasma-runner-powerdevil.desktop b/runners/powerdevil/plasma-runner-powerdevil.desktop index 00cfed60d..9aeeafb28 100644 --- a/runners/powerdevil/plasma-runner-powerdevil.desktop +++ b/runners/powerdevil/plasma-runner-powerdevil.desktop @@ -76,6 +76,7 @@ Icon=preferences-system-power-management Name=Power Name[ca]=Energia Name[cs]=Energie +Name[de]=Energie Name[en_GB]=Power Name[gl]=Enerxía Name[nl]=Energie @@ -85,6 +86,7 @@ Name[sk]=Napájanie Name[sv]=Effekt Name[uk]=Живлення Name[x-test]=xxPowerxx +Name[zh_CN]=电源 Type=Service X-KDE-Library=krunner_powerdevil X-KDE-PluginInfo-Author=Dario Freddi