From 0711dac53886b6997334e37e9837712c2b2afd61 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 26 May 2017 04:21:11 +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" --- indicator/org.kde.kdeconnect.nonplasma.desktop | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop index aa5465a90..8803112bf 100755 --- a/indicator/org.kde.kdeconnect.nonplasma.desktop +++ b/indicator/org.kde.kdeconnect.nonplasma.desktop @@ -1,5 +1,12 @@ [Desktop Entry] Name=KDE Connect Indicator +Name[ca]=Indicador del KDE Connect +Name[ca@valencia]=Indicador del KDE Connect +Name[nl]=KDE-Connect indicator +Name[pt]=Indicador do KDE Connect +Name[sv]=KDE-anslut indikator +Name[uk]=Індикатор KDE Connect +Name[x-test]=xxKDE Connect Indicatorxx Comment=Display information about your devices Comment[ar]=اعرض معلومات عن أجهزتك Comment[ast]=Amuesa información tocante a los tos preseos