From 06f7460c15bc067d5d3625f4fcfed2bb619c8b0b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 28 May 2023 02:34:37 +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" --- initialstart/modules/cellular/package/metadata.json | 1 + initialstart/modules/finished/metadata.json | 1 + initialstart/modules/prepare/package/metadata.json | 1 + initialstart/modules/time/package/metadata.json | 1 + initialstart/modules/wifi/package/metadata.json | 1 + quicksettings/docked/metadata.json | 2 ++ 6 files changed, 7 insertions(+) diff --git a/initialstart/modules/cellular/package/metadata.json b/initialstart/modules/cellular/package/metadata.json index f2904d7b..c245fae6 100644 --- a/initialstart/modules/cellular/package/metadata.json +++ b/initialstart/modules/cellular/package/metadata.json @@ -75,6 +75,7 @@ "Name[it]": "Rete cellulare", "Name[ka]": "ფიჭური ქსელი", "Name[nl]": "Cellulair", + "Name[nn]": "Mobilnettverk", "Name[pa]": "ਸੈਲੂਲਰ", "Name[pl]": "Komórkowe", "Name[sl]": "Celično", diff --git a/initialstart/modules/finished/metadata.json b/initialstart/modules/finished/metadata.json index 6179c0eb..03855fc1 100644 --- a/initialstart/modules/finished/metadata.json +++ b/initialstart/modules/finished/metadata.json @@ -75,6 +75,7 @@ "Name[it]": "Finito", "Name[ka]": "დასრულდა", "Name[nl]": "Beëindigd", + "Name[nn]": "Fullført", "Name[pa]": "ਮੁਕੰਮਲ", "Name[pl]": "Zakończone", "Name[sl]": "Končano", diff --git a/initialstart/modules/prepare/package/metadata.json b/initialstart/modules/prepare/package/metadata.json index 4d6ba5b2..8051dac6 100644 --- a/initialstart/modules/prepare/package/metadata.json +++ b/initialstart/modules/prepare/package/metadata.json @@ -73,6 +73,7 @@ "Name[it]": "Prepara", "Name[ka]": "მომზადება", "Name[nl]": "Voorbereiden", + "Name[nn]": "Førebu", "Name[pa]": "ਤਿਆਰੀ", "Name[pl]": "Przygotuj", "Name[sl]": "Pripravi", diff --git a/initialstart/modules/time/package/metadata.json b/initialstart/modules/time/package/metadata.json index b48afd03..9c68aa03 100644 --- a/initialstart/modules/time/package/metadata.json +++ b/initialstart/modules/time/package/metadata.json @@ -74,6 +74,7 @@ "Name[it]": "Orario", "Name[ka]": "დრო", "Name[nl]": "Tijd", + "Name[nn]": "Tid", "Name[pa]": "ਸਮਾਂ", "Name[pl]": "Czas", "Name[sl]": "Čas", diff --git a/initialstart/modules/wifi/package/metadata.json b/initialstart/modules/wifi/package/metadata.json index eadf618f..1c72a42e 100644 --- a/initialstart/modules/wifi/package/metadata.json +++ b/initialstart/modules/wifi/package/metadata.json @@ -75,6 +75,7 @@ "Name[it]": "WiFi", "Name[ka]": "WiFi", "Name[nl]": "WiFi", + "Name[nn]": "Wi-Fi", "Name[pa]": "ਵਾਈ-ਫਾਈ", "Name[pl]": "WiFi", "Name[sl]": "WiFi", diff --git a/quicksettings/docked/metadata.json b/quicksettings/docked/metadata.json index 348ebf8a..1b3556da 100644 --- a/quicksettings/docked/metadata.json +++ b/quicksettings/docked/metadata.json @@ -50,6 +50,7 @@ "Description[it]": "Impostazione rapida per attivare o disattivare la modalità ancorata per Plasma Mobile", "Description[ka]": "Plasma Mobile-ის დოკის რეჟიმის პარამეტრის გადართვა", "Description[nl]": "Snelle instelling om modus vastgezet om te schakelen voor Plasma Mobile", + "Description[nn]": "Snøgginnstilling for dokkmodus for Plasma Mobile", "Description[pa]": "ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ ਲਈ ਡੌਕ ਬਦਲਣ ਢੰਗ ਲਈ ਫ਼ੌਰੀ ਸੈਟਿੰਗ", "Description[pl]": "Szybkie ustawienie do przełączania trybu dokowania w Przenośnej Plazmie", "Description[sl]": "Hitre nastavitve za preklop v dok za Plasma Mobile", @@ -74,6 +75,7 @@ "Name[it]": "Modalità ancorata", "Name[ka]": "დოკის რეჟიმი", "Name[nl]": "Modus vastgezet", + "Name[nn]": "Dokkmodus", "Name[pa]": "ਡੌਕ ਕਰਨ ਢੰਗ", "Name[pl]": "Tryb dokowania", "Name[sl]": "Način v doku",