From a09825c498e8ee48fc1e7e74c45a420fa5ee15aa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 20 Mar 2022 02:05:33 +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 | 2 +- data/kdeconnect-thunar.desktop | 2 +- data/org.kde.kdeconnect_open.desktop | 4 ++-- fileitemactionplugin/kdeconnectsendfile.json | 2 +- indicator/org.kde.kdeconnect.nonplasma.desktop | 2 +- plugins/findthisdevice/kdeconnect_findthisdevice.json | 4 ++-- settings/org.kde.kdeconnect-settings.desktop | 2 +- smsapp/org.kde.kdeconnect.sms.desktop | 2 +- urlhandler/org.kde.kdeconnect.handler.desktop | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/kdeconnect-dde.desktop b/data/kdeconnect-dde.desktop index 22a72b6da..fedbc80eb 100644 --- a/data/kdeconnect-dde.desktop +++ b/data/kdeconnect-dde.desktop @@ -8,7 +8,7 @@ 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 +Name[ca@valencia]=Envia a través de KDE Connect Name[cs]=Poslat přes KDE Connect Name[da]=Send via KDE Connect Name[de]=Mit KDE Connect versenden diff --git a/data/kdeconnect-thunar.desktop b/data/kdeconnect-thunar.desktop index 6cd1a2df2..b35b6f362 100644 --- a/data/kdeconnect-thunar.desktop +++ b/data/kdeconnect-thunar.desktop @@ -8,7 +8,7 @@ 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 +Name[ca@valencia]=Envia a través de KDE Connect Name[cs]=Poslat přes KDE Connect Name[da]=Send via KDE Connect Name[de]=Mit KDE Connect versenden diff --git a/data/org.kde.kdeconnect_open.desktop b/data/org.kde.kdeconnect_open.desktop index 3b813b1a5..df4258f46 100644 --- a/data/org.kde.kdeconnect_open.desktop +++ b/data/org.kde.kdeconnect_open.desktop @@ -3,7 +3,7 @@ GenericName=Open on connected device via KDE Connect GenericName[ar]=افتح في الجهاز المتصل عبر «كدي المتّصل» GenericName[az]=Connectd cihazında KDE Connect ilə açın GenericName[ca]=Obre al dispositiu connectat a través del KDE Connect -GenericName[ca@valencia]=Obri al dispositiu connectat a través del KDE Connect +GenericName[ca@valencia]=Obri al dispositiu connectat a través de KDE Connect GenericName[cs]=Otevřít na připojeném zařízení přes KDE Connect GenericName[da]=Åbn en tilsluttet enhed via KDE Connect GenericName[de]=Ein verbundenes Gerät mit KDE Connect öffnen @@ -42,7 +42,7 @@ Name=Open on connected device via KDE Connect Name[ar]=افتح في الجهاز المتصل عبر «كدي المتّصل» Name[az]=Connectd cihazında KDE Connect ilə açın 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[ca@valencia]=Obri al dispositiu connectat a través de 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 mit KDE Connect öffnen diff --git a/fileitemactionplugin/kdeconnectsendfile.json b/fileitemactionplugin/kdeconnectsendfile.json index 206941e25..9eb60627f 100644 --- a/fileitemactionplugin/kdeconnectsendfile.json +++ b/fileitemactionplugin/kdeconnectsendfile.json @@ -46,7 +46,7 @@ "Name": "Send file via KDE Connect", "Name[ar]": "أرسل ملف عبر كدي المتصل", "Name[az]": "Faylı KDE Connect ilə göndərin", - "Name[ca@valencia]": "Envia el fitxer a través del KDE Connect", + "Name[ca@valencia]": "Envia el fitxer a través de KDE Connect", "Name[ca]": "Envia el fitxer a través del KDE Connect", "Name[cs]": "Poslat soubor přes KDE Connect", "Name[da]": "Send fil via KDE Connect", diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop index e88565b53..f13776e2b 100644 --- a/indicator/org.kde.kdeconnect.nonplasma.desktop +++ b/indicator/org.kde.kdeconnect.nonplasma.desktop @@ -4,7 +4,7 @@ Name[ar]=مؤشر «كدي المتّصل» Name[ast]=Indicador de KDE Connnect Name[az]=KDE Connect göstəricisi Name[ca]=Indicador del KDE Connect -Name[ca@valencia]=Indicador del KDE Connect +Name[ca@valencia]=Indicador de KDE Connect Name[cs]=Ukazatel KDE Connect Name[da]=KDE Connect-indikator Name[de]=KDE-Connect-Anzeige diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice.json b/plugins/findthisdevice/kdeconnect_findthisdevice.json index db2aee695..c9097426f 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice.json +++ b/plugins/findthisdevice/kdeconnect_findthisdevice.json @@ -46,7 +46,7 @@ "Description": "Find this device by making it play an alarm sound", "Description[ar]": "اعثر على هذا الهاتف بتشغيل صوت المنبّه", "Description[az]": "Bu cihazı, ona səs siqnalı göndərməklə tapın", - "Description[ca@valencia]": "Troba aquest dispositiu fent que reproduïsca un so d'alarma", + "Description[ca@valencia]": "Troba este dispositiu fent que reproduïsca un so d'alarma", "Description[ca]": "Troba aquest dispositiu fent que reprodueixi un so d'alarma", "Description[cs]": "Najděte toto zařízení tím, že jej necháte přehrát zvuk upomínky", "Description[da]": "Find denne enhed ved at få den til at afspille en alarmlyd", @@ -88,7 +88,7 @@ "Name": "Find this device", "Name[ar]": "اعثر على هذا الهاتف", "Name[az]": "Bu cihazı tapmaq", - "Name[ca@valencia]": "Troba aquest dispositiu", + "Name[ca@valencia]": "Troba este dispositiu", "Name[ca]": "Troba aquest dispositiu", "Name[cs]": "Najít toto zařízení", "Name[da]": "Find denne enhed", diff --git a/settings/org.kde.kdeconnect-settings.desktop b/settings/org.kde.kdeconnect-settings.desktop index 732310e76..ce87426b9 100755 --- a/settings/org.kde.kdeconnect-settings.desktop +++ b/settings/org.kde.kdeconnect-settings.desktop @@ -8,7 +8,7 @@ Name[ar]=إعدادات كدي المتّصل Name[ast]=Axustes de KDE Connect Name[az]=KDE Connect Ayarları Name[ca]=Arranjament del KDE Connect -Name[ca@valencia]=Arranjament del KDE Connect +Name[ca@valencia]=Arranjament de KDE Connect Name[cs]=Nastavení KDE Connect Name[da]=Indstilling af KDE Connect Name[de]=KDE Connect-Einstellungen diff --git a/smsapp/org.kde.kdeconnect.sms.desktop b/smsapp/org.kde.kdeconnect.sms.desktop index 86a74c3e2..a699c783d 100644 --- a/smsapp/org.kde.kdeconnect.sms.desktop +++ b/smsapp/org.kde.kdeconnect.sms.desktop @@ -4,7 +4,7 @@ Name[ar]=رسائل نصية لكدي المتّصل Name[ast]=SMS de KDE Connect Name[az]=KDE Connect SMS Name[ca]=SMS del KDE Connect -Name[ca@valencia]=SMS del KDE Connect +Name[ca@valencia]=SMS de KDE Connect Name[cs]=KDE Connect SMS Name[da]=KDE Connect SMS Name[de]=KDE Connect-SMS diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop index 3117acc2a..d3fcc3301 100644 --- a/urlhandler/org.kde.kdeconnect.handler.desktop +++ b/urlhandler/org.kde.kdeconnect.handler.desktop @@ -4,7 +4,7 @@ Name[ar]=معالج عناوين «كدي المتّصل» Name[ast]=Remanador d'URLs de KDE Connect Name[az]=KDE Connect URL işləyicisi Name[ca]=Gestor d'URL del KDE Connect -Name[ca@valencia]=Gestor d'URL del KDE Connect +Name[ca@valencia]=Gestor d'URL de KDE Connect Name[cs]=Nástroj pro práci s URL v KDE Connect Name[da]=URL-håndtering til KDE Connect Name[de]=KDE Connect-SMS-Dienstprogramm für URLs (Adressen)