From eee4cf7382a5f5b74daaf9beef62e9e5ab7efb0d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 16 Oct 2021 02:14:14 +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/org.kde.kdeconnect_open.desktop | 2 +- plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/org.kde.kdeconnect_open.desktop b/data/org.kde.kdeconnect_open.desktop index 378ba7466..64cd21fff 100644 --- a/data/org.kde.kdeconnect_open.desktop +++ b/data/org.kde.kdeconnect_open.desktop @@ -43,7 +43,7 @@ Name[ca]=Obre al dispositiu connectat a través del KDE Connect Name[ca@valencia]=Obri al dispositiu connectat a través del KDE Connect Name[cs]=Otevřít na připojeném zařízení přes KDE Connect Name[da]=Åbn en tilsluttet enhed via KDE Connect -Name[de]=Ein verbundenes Gerät mit KDE Connect öffnen +Name[de]=Ein verbundenes mit KDE Connect öffnen Name[el]=Άνοιγμα σε συνδεδεμένη συσκευή μέσω KDE Connect Name[en_GB]=Open on connected device via KDE Connect Name[es]=Abrir en dispositivo conectado a través de KDE Connect diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop b/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop index 7e3d3b1fb..02495629c 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop +++ b/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop @@ -11,7 +11,7 @@ Name[ca]=Configuració del connector Cerca aquest dispositiu Name[ca@valencia]=Configuració del connector Cerca aquest dispositiu Name[cs]=Nastavení modulu Najít toto zařízení Name[da]=Indstilling af find denne enhed-plugin -Name[de]=Modul-Einstellungen diese Geräts suchen +Name[de]=Modul-Einstellungen dieses Geräts suchen Name[el]=Εύρεση των ρυθμίσεων αυτής της συσκευής Name[en_GB]=Find This Device plugin settings Name[es]=Preferencias del complemento «Encontrar este dispositivo»