From 244af8433e7c7364c8fb228cfa3dda23daec2dd5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 Mar 2021 09:11:09 +0100 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" --- plugins/connectivity-report/kdeconnect_connectivity_report.json | 2 ++ plugins/findmyphone/kdeconnect_findmyphone.json | 1 + plugins/findthisdevice/kdeconnect_findthisdevice.json | 1 + 3 files changed, 4 insertions(+) diff --git a/plugins/connectivity-report/kdeconnect_connectivity_report.json b/plugins/connectivity-report/kdeconnect_connectivity_report.json index a7810e022..8d79adbdc 100644 --- a/plugins/connectivity-report/kdeconnect_connectivity_report.json +++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json @@ -8,6 +8,7 @@ "Name[ca]": "David Shlemayev", "Name[es]": "David Shlemayev", "Name[fr]": "David Shlemayev", + "Name[ia]": "David Shlemayev", "Name[it]": "David Shlemayev", "Name[nl]": "David Shlemayev", "Name[pl]": "David Shlemayev", @@ -42,6 +43,7 @@ "Name[ca]": "Monitor de la connectivitat", "Name[es]": "Monitor de conectividad", "Name[fr]": "Surveillance de connectivité", + "Name[ia]": "Controlator de connectivitate", "Name[it]": "Monitor di connettività", "Name[nl]": "Monitor van connectiviteit", "Name[pl]": "Monitor łączności", diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json index 0ef19b4f5..b95c5cdf6 100644 --- a/plugins/findmyphone/kdeconnect_findmyphone.json +++ b/plugins/findmyphone/kdeconnect_findmyphone.json @@ -150,6 +150,7 @@ "Name[fi]": "Soita puhelimeeni", "Name[fr]": "Faire sonner mon téléphone", "Name[gl]": "Facer soar o meu móbil", + "Name[ia]": "Sona mi telephono", "Name[id]": "Ring my phone", "Name[it]": "Fai squillare il mio telefono", "Name[ja]": "端末を鳴らす", diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice.json b/plugins/findthisdevice/kdeconnect_findthisdevice.json index b907835da..2e32fcb01 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice.json +++ b/plugins/findthisdevice/kdeconnect_findthisdevice.json @@ -93,6 +93,7 @@ "Name[fi]": "Etsi tämä laite", "Name[fr]": "Trouver ce périphérique", "Name[gl]": "Atopar o dispositivo", + "Name[ia]": "Trova iste dispositivo", "Name[id]": "Find this device", "Name[it]": "Trova questo dispositivo", "Name[ja]": "デバイスを探す",