From ef6f3ce2bd11f8c95e5d6f50a8822259898edfe0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 27 Oct 2024 01:24:50 +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" --- kcm/kcm_kdeconnect.json | 1 + plasmoid/package/metadata.json | 1 + settings/org.kde.kdeconnect-settings.desktop | 2 ++ smsapp/org.kde.kdeconnect.sms.desktop | 2 ++ 4 files changed, 6 insertions(+) diff --git a/kcm/kcm_kdeconnect.json b/kcm/kcm_kdeconnect.json index 942c26a3a..5256c285f 100644 --- a/kcm/kcm_kdeconnect.json +++ b/kcm/kcm_kdeconnect.json @@ -23,6 +23,7 @@ "Description[lv]": "Konfigurēt ierīces sinhronizāciju", "Description[nl]": "Synchronisatie van apparaat configureren", "Description[nn]": "Set opp einingssynkronisering", + "Description[pa]": "ਡਿਵਾਈਸ ਸੈਕਰੋਨਾਈਜ਼ੇਸ਼ਨ ਦੀ ਸੰਰਚਨਾ", "Description[pl]": "Ustawienia synchronizacji urządzenia", "Description[sl]": "Konfiguriraj sinhronizacijo naprave", "Description[sv]": "Anpassa enhetssynkronisering", diff --git a/plasmoid/package/metadata.json b/plasmoid/package/metadata.json index 4d9258436..a3eff1c7d 100644 --- a/plasmoid/package/metadata.json +++ b/plasmoid/package/metadata.json @@ -71,6 +71,7 @@ "Description[lv]": "Pārvaldīt savienotās ierīces", "Description[nl]": "Verbonden apparaten beheren", "Description[nn]": "Handsam tilkopla einingar", + "Description[pa]": "ਕਨੈਕਟ ਹੋਏ ਡਿਵਾਈਸਾਂ ਦਾ ਇੰਤਜ਼ਾਮ", "Description[pl]": "Zarządzaj podłączonymi urządzeniami", "Description[sl]": "Upravljaj povezane naprave", "Description[sv]": "Hantera anslutna apparater", diff --git a/settings/org.kde.kdeconnect-settings.desktop b/settings/org.kde.kdeconnect-settings.desktop index 97e592e09..03ed008a6 100755 --- a/settings/org.kde.kdeconnect-settings.desktop +++ b/settings/org.kde.kdeconnect-settings.desktop @@ -78,6 +78,7 @@ GenericName[lt]=Įrenginių sinchronizavimo nuostatos GenericName[lv]=Ierīces sinhronizācijas iestatījumi GenericName[nl]=Instellingen voor synchronisatie van apparaat GenericName[nn]=Innstillingar for einingssynkronisering +GenericName[pa]=ਡਿਵਾਈਸ ਸੈਕਰੋਨਾਈਜ਼ ਸੈਟਿੰਗਾਂ GenericName[pl]=Ustawienia synchronizacji urządzenia GenericName[sl]=Nastavitve sinhronizacijenaprav GenericName[sv]=Inställning av enhetssynkronisering @@ -111,6 +112,7 @@ Comment[lt]=Konfigūruoti įrenginių sinchronizavimą Comment[lv]=Konfigurējiet ierīces sinhronizāciju Comment[nl]=Synchronisatie van apparaat configureren Comment[nn]=Set opp einingssynkronisering +Comment[pa]=ਡਿਵਾਈਸ ਸੈਕਰੋਨਾਈਜ਼ੇਸ਼ਨ ਦੀ ਸੰਰਚਨਾ Comment[pl]=Ustawienia synchronizacji urządzenia Comment[sl]=Konfiguriraj sinhronizacijo naprav Comment[sv]=Anpassa enhetssynkronisering diff --git a/smsapp/org.kde.kdeconnect.sms.desktop b/smsapp/org.kde.kdeconnect.sms.desktop index 1a95e46dc..3f9dca831 100644 --- a/smsapp/org.kde.kdeconnect.sms.desktop +++ b/smsapp/org.kde.kdeconnect.sms.desktop @@ -71,6 +71,7 @@ GenericName[lt]=Tekstinės žinutės GenericName[lv]=Teksta ziņapmaiņa GenericName[nl]=Tekstberichten versturen GenericName[nn]=Tekstmeldingar +GenericName[pa]=ਟੈਕਸਟ ਸੁਨੇਹੇ GenericName[pl]=Wiadomości tekstowe GenericName[sl]=Sporočanje besedil GenericName[sv]=Textmeddelanden @@ -104,6 +105,7 @@ Comment[lt]=Skaityti ir siųsti SMS žinutes prijungtuose įrenginiuose Comment[lv]=Lasiet un sūtiet īsziņas no savienotās ierīces Comment[nl]=Lees en verzend SMS berichten op verbonden apparaten Comment[nn]=Les og send tekstmeldingar på tilkopla einingar +Comment[pa]=ਕਨੈਕਟ ਕੀਤੇ ਡਿਵਾਈਸਾਂ ਉੱਤੇ SMS ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹੋ ਅਤੇ ਭੇਜੋ Comment[pl]=Czytaj i wysyłaj wiadomości SMS na podłączonych urządzeniach Comment[sl]=Beri in pošiljaj SMS na povezanih napravah Comment[sv]=Läs och skicka meddelanden via SMS på anslutna apparater