From a6c8498e9b4251c707df4202315cdb0452bb30d5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 23 Jul 2021 01:13:23 +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" --- data/kdeconnect-dde.desktop | 1 + data/kdeconnect-thunar.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/data/kdeconnect-dde.desktop b/data/kdeconnect-dde.desktop index 96f1cfede..01ba1d0b1 100644 --- a/data/kdeconnect-dde.desktop +++ b/data/kdeconnect-dde.desktop @@ -5,6 +5,7 @@ Encoding=UTF-8 Exec=kdeconnect-handler %F Icon=kdeconnect Name=Send via KDE Connect +Name[ar]=أرسل عبر خدمة «كدي المتّصل» Name[az]=KDE Connect ilə göndərin Name[ca]=Envia a través del KDE Connect Name[ca@valencia]=Envia a través del KDE Connect diff --git a/data/kdeconnect-thunar.desktop b/data/kdeconnect-thunar.desktop index 9c3c89054..4ad4d22e8 100644 --- a/data/kdeconnect-thunar.desktop +++ b/data/kdeconnect-thunar.desktop @@ -5,6 +5,7 @@ Encoding=UTF-8 Exec=kdeconnect-handler %F Icon=kdeconnect Name=Send via KDE Connect +Name[ar]=أرسل عبر خدمة «كدي المتّصل» Name[az]=KDE Connect ilə göndərin Name[ca]=Envia a través del KDE Connect Name[ca@valencia]=Envia a través del KDE Connect