From 94d8fe26fbf45afbc0fceb418a847a7bf3a32b95 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 1 Feb 2018 06:54:20 +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" --- .../systemmonitor/plasma-dataengine-systemmonitor.desktop | 2 +- systemmonitor/org.kde.systemmonitor.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop b/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop index 7c8623f72..773923127 100644 --- a/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop +++ b/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop @@ -9,7 +9,7 @@ Name[bg]=Наблюдение на системата Name[bn]=সিস্টেম মনিটর Name[bn_IN]=সিস্টেম নিরীক্ষণ ব্যবস্থা Name[bs]=Monitor sistema -Name[ca]=Monitor del sistema +Name[ca]=Controlador del sistema Name[ca@valencia]=Monitor del sistema Name[cs]=Monitor systému Name[csb]=Mònitór systemë diff --git a/systemmonitor/org.kde.systemmonitor.desktop b/systemmonitor/org.kde.systemmonitor.desktop index 5124ea921..953136125 100644 --- a/systemmonitor/org.kde.systemmonitor.desktop +++ b/systemmonitor/org.kde.systemmonitor.desktop @@ -10,7 +10,7 @@ Name[bg]=Наблюдение на системата Name[bn]=সিস্টেম মনিটর Name[bn_IN]=সিস্টেম নিরীক্ষণ ব্যবস্থা Name[bs]=Monitor sistema -Name[ca]=Monitor del sistema +Name[ca]=Controlador del sistema Name[ca@valencia]=Monitor del sistema Name[cs]=Monitor systému Name[csb]=Mònitór systemë