From 2bf07fc89a668bf77fd682eb1a24c22078150dfb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Sep 2025 01:36:49 +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" --- kcms/navigation/kcm_navigation.json | 4 ++++ kcms/waydroidintegration/kcm_waydroidintegration.json | 4 ++++ quicksettings/autohidepanels/metadata.json | 3 +++ quicksettings/kscreenosd/package/metadata.json | 3 +++ quicksettings/waydroid/metadata.json | 3 +++ 5 files changed, 17 insertions(+) diff --git a/kcms/navigation/kcm_navigation.json b/kcms/navigation/kcm_navigation.json index e7bffa99..a0a6aba1 100644 --- a/kcms/navigation/kcm_navigation.json +++ b/kcms/navigation/kcm_navigation.json @@ -11,6 +11,7 @@ "Name[eu]": "Luis Büchi", "Name[fr]": "Luis Büchi", "Name[he]": "לואי ביושי", + "Name[is]": "Luis Büchi", "Name[it]": "Luis Büchi", "Name[ka]": "Luis Büchi", "Name[nl]": "Luis Büchi", @@ -30,6 +31,7 @@ "Description[eu]": "Konfiguratu sistemaren nabigazioa", "Description[fr]": "Configurer le système de navigation", "Description[he]": "הגדרת ניווט במערכת", + "Description[is]": "Grunnstilla flakk um skráakerfi", "Description[it]": "Configura navigazione del sistema", "Description[ka]": "სისტემის ნავიგაციის მორგება", "Description[nl]": "Systeemnavigatie configureren", @@ -53,6 +55,7 @@ "Name[eu]": "Nabigazioa", "Name[fr]": "Système de navigation", "Name[he]": "ניווט", + "Name[is]": "Flakk", "Name[it]": "Navigazione", "Name[ka]": "ნავიგაცია", "Name[nl]": "Navigatie", @@ -71,6 +74,7 @@ "X-KDE-Keywords[eu]": "sistema,shell,oskola,panela,nabigazioa,keinua", "X-KDE-Keywords[fr]": "système, shell, panneau, navigation, geste", "X-KDE-Keywords[he]": "מערכת,מעטפת,של,שאל,לוח,פאנל,מחווה,תנועת עכבר", + "X-KDE-Keywords[is]": "kerfi,skel,sphald,flakk,hreyfiskipun", "X-KDE-Keywords[it]": "sistema,shell,pannello,navigazione,gesto", "X-KDE-Keywords[ka]": "system,shell,panel,სისტემა,გარემო,პანელი,ჟესტი", "X-KDE-Keywords[nl]": "systeem,shell,paneel,navigatie,gebaar", diff --git a/kcms/waydroidintegration/kcm_waydroidintegration.json b/kcms/waydroidintegration/kcm_waydroidintegration.json index b9f9d43a..7c881a50 100644 --- a/kcms/waydroidintegration/kcm_waydroidintegration.json +++ b/kcms/waydroidintegration/kcm_waydroidintegration.json @@ -12,6 +12,7 @@ "Name[fi]": "Florian RICHER", "Name[fr]": "Florian RICHER", "Name[he]": "פלוריאן רישה", + "Name[is]": "Florian RICHER", "Name[it]": "Florian RICHER", "Name[ka]": "Florian RICHER", "Name[ko]": "Florian RICHER", @@ -36,6 +37,7 @@ "Description[fi]": "Waydroid-asetukset", "Description[fr]": "Configuration de Waydroid", "Description[he]": "הגדרות Waydroid", + "Description[is]": "Grunnstilling Waydroid", "Description[it]": "Configurazione di Waydroid", "Description[ka]": "Waydroid-ის მორგება", "Description[ko]": "Waydroid 설정", @@ -64,6 +66,7 @@ "Name[fi]": "Waydroid-eheytys", "Name[fr]": "Intégration de Waydroid", "Name[he]": "שילוב מול Waydroid", + "Name[is]": "Samþætting Waydroid", "Name[it]": "Integrazione Waydroid", "Name[ka]": "ინტეგრაცია Waydroid-თან", "Name[ko]": "Waydroid 통합", @@ -87,6 +90,7 @@ "X-KDE-Keywords[fi]": "waydroid", "X-KDE-Keywords[fr]": "waydroid", "X-KDE-Keywords[he]": "waydroid", + "X-KDE-Keywords[is]": "waydroid", "X-KDE-Keywords[it]": "waydroid", "X-KDE-Keywords[ka]": "waydroid", "X-KDE-Keywords[ko]": "waydroid", diff --git a/quicksettings/autohidepanels/metadata.json b/quicksettings/autohidepanels/metadata.json index f23cb55f..9cac2671 100644 --- a/quicksettings/autohidepanels/metadata.json +++ b/quicksettings/autohidepanels/metadata.json @@ -16,6 +16,7 @@ "Name[he]": "מיקה סטנלי", "Name[hu]": "Micah Stanley", "Name[ia]": "Micah Stanley", + "Name[is]": "Micah Stanley", "Name[it]": "Micah Stanley", "Name[ka]": "Micah Stanley", "Name[ko]": "Micah Stanley", @@ -43,6 +44,7 @@ "Description[he]": "הגדרות הסתרת לוחות אוטומטית מהירות לפלזמה לניידים", "Description[hu]": "Panelek automatikus elrejtése gyorsbeállítás a Plasma Mobile-hoz", "Description[ia]": "Auto Cela Pannellos Preferentia rapide per Plasma Mobile", + "Description[is]": "Flýtistilling til að fela spjöld sjálfkrafa fyrir Plasma Mobile", "Description[it]": "Impostazione rapida Nascondi automaticamente i pannelli per Plasma Mobile", "Description[ka]": "პანელების ავტოდამალვის სწრაფად დაყენება Plasma Mobile-სთვის", "Description[ko]": "Plasma 모바일의 패널 자동 숨기기 빠른 설정", @@ -71,6 +73,7 @@ "Name[he]": "הסתרת לוחות אוטומטית", "Name[hu]": "Panelek automatikus elrejtése", "Name[ia]": "Auto-Cela Pannellos", + "Name[is]": "Fela spjöld sjálfkrafa", "Name[it]": "Nascondi automaticamente i pannelli", "Name[ka]": "პანელების ავტომატური დამალვა", "Name[ko]": "패널 자동 숨기기", diff --git a/quicksettings/kscreenosd/package/metadata.json b/quicksettings/kscreenosd/package/metadata.json index 7aea23d4..e6c10ea9 100644 --- a/quicksettings/kscreenosd/package/metadata.json +++ b/quicksettings/kscreenosd/package/metadata.json @@ -14,6 +14,7 @@ "Name[fi]": "Sebastian Kügler", "Name[fr]": "Sebastian Kügler", "Name[he]": "סבסטיאן קיגלר", + "Name[is]": "Sebastian Kügler", "Name[it]": "Sebastian Kügler", "Name[ka]": "სებასტიან კუგლერი", "Name[lv]": "Sebastian Kügler", @@ -36,6 +37,7 @@ "Description[fi]": "Näyttöjen ruutupika-asetus Plasma Mobileen", "Description[fr]": "Configuration rapide de l'incrustation vidéo sur écran (OSD) pour Plasma Mobile", "Description[he]": "חיווי על גבי המסך להגדרה מהירה של התצוגה לפלזמה לניידים", + "Description[is]": "Flýtistilling skjástillinga fyrir Plasma Mobile", "Description[it]": "Configurazione rapida dell'OSD per Plasma Mobile", "Description[ka]": "ეკრანის OSD სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის", "Description[lv]": "„Plasma Mobile“ OSD ekrāna ātrie iestatījumi", @@ -59,6 +61,7 @@ "Name[fi]": "Näyttöjen ruutunäyttö", "Name[fr]": "Incrustation vidéo sur écran (OSD)", "Name[he]": "חיווי על גבי המסך", + "Name[is]": "Skjámynd", "Name[it]": "OSD schermo", "Name[ka]": "ეკრანის OSD", "Name[lv]": "Ekrāna OSD", diff --git a/quicksettings/waydroid/metadata.json b/quicksettings/waydroid/metadata.json index 36308ae5..82640085 100644 --- a/quicksettings/waydroid/metadata.json +++ b/quicksettings/waydroid/metadata.json @@ -13,6 +13,7 @@ "Name[fi]": "Florian RICHER", "Name[fr]": "Florian RICHER", "Name[he]": "פלוריאן רישה", + "Name[is]": "Florian RICHER", "Name[it]": "Florian RICHER", "Name[ka]": "Florian RICHER", "Name[ko]": "Florian RICHER", @@ -36,6 +37,7 @@ "Description[fi]": "Waydroidin pika-asetus Plasma Mobileen", "Description[fr]": "Configuration rapide de Waydroid pour Plasma Mobile", "Description[he]": "הגדרה מהירה ל־Waydroid לפלזמה לניידים", + "Description[is]": "Flýtistilling Waydroid fyrir Plasma Mobile", "Description[it]": "Impostazioni rapide di Waydroid per Plasma Mobile", "Description[ka]": "Waydroid-ის სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის", "Description[ko]": "Plasma 모바일의 Waydroid 빠른 설정", @@ -60,6 +62,7 @@ "Name[fi]": "Waydroid", "Name[fr]": "Waydroid", "Name[he]": "Waydroid", + "Name[is]": "Waydroid", "Name[it]": "Waydroid", "Name[ka]": "Waydroid", "Name[ko]": "Waydroid",