From 1fd2c05f04e7bb109e20e698bc081b882cdd4a5d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 14 Mar 2021 06:45:37 +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" --- .../kdeconnect_connectivity_report.json | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/plugins/connectivity-report/kdeconnect_connectivity_report.json b/plugins/connectivity-report/kdeconnect_connectivity_report.json index 6e161bd08..7c2903552 100644 --- a/plugins/connectivity-report/kdeconnect_connectivity_report.json +++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json @@ -3,15 +3,33 @@ "Authors": [ { "Email": "david.shlemayev@gmail.com", - "Name": "David Shlemayev" + "Name": "David Shlemayev", + "Name[az]": "David Shlemayev", + "Name[ca]": "David Shlemayev", + "Name[pt]": "David Shlemayev", + "Name[sv]": "David Shlemayev", + "Name[uk]": "Давид Шлемаєв", + "Name[x-test]": "xxDavid Shlemayevxx" } ], "Description": "Show your phone's network signal strength", + "Description[az]": "Telefonunuzun şəbəkə siqnalı gücü göstərilsin", + "Description[ca]": "Mostra la intensitat del senyal de xarxa del vostre telèfon", + "Description[pt]": "Mostrar a potência do sinal da rede do seu telefone", + "Description[sv]": "Visa telefonens nätverkssignalstyrka", + "Description[uk]": "Показ потужності сигналу мережі на вашому телефоні", + "Description[x-test]": "xxShow your phone's network signal strengthxx", "EnabledByDefault": true, "Icon": "network-wireless", "Id": "kdeconnect_connectivity_report", "License": "GPL", "Name": "Connectivity monitor", + "Name[az]": "Bağlantı monitoru", + "Name[ca]": "Monitor de la connectivitat", + "Name[pt]": "Monitor de conectividade", + "Name[sv]": "Anslutningsövervakare", + "Name[uk]": "Монітор з'єднання", + "Name[x-test]": "xxConnectivity monitorxx", "ServiceTypes": [ "KdeConnect/Plugin" ],