From 6fc5d43cdf0376cc0235eecbecf2d189cfd9cc34 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 Jul 2019 05:13:52 +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" --- data/org.kde.kdeconnect_open.desktop | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data/org.kde.kdeconnect_open.desktop b/data/org.kde.kdeconnect_open.desktop index 9f08f5c14..be1ab5479 100644 --- a/data/org.kde.kdeconnect_open.desktop +++ b/data/org.kde.kdeconnect_open.desktop @@ -1,7 +1,16 @@ [Desktop Entry] GenericName=Open on connected device via KDE Connect +GenericName[ca]=Obre al dispositiu connectat a través del KDE Connect +GenericName[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect +GenericName[x-test]=xxOpen on connected device via KDE Connectxx Name=Open on connected device via KDE Connect +Name[ca]=Obre al dispositiu connectat a través del KDE Connect +Name[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect +Name[x-test]=xxOpen on connected device via KDE Connectxx Comment=Open on a connected device using KDE Connect +Comment[ca]=Obre a un dispositiu connectat usant el KDE Connect +Comment[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect +Comment[x-test]=xxOpen on a connected device using KDE Connectxx MimeType=*/*; Exec=kdeconnect-handler --open %U Icon=kdeconnect