From 947087e3650e51bd1a6f8c8e5476628971925fc0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 9 Oct 2025 10:44:41 +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 ++++ quicksettings/kscreenosd/package/metadata.json | 3 +++ 2 files changed, 7 insertions(+) diff --git a/kcms/navigation/kcm_navigation.json b/kcms/navigation/kcm_navigation.json index d8401b76..3f609857 100644 --- a/kcms/navigation/kcm_navigation.json +++ b/kcms/navigation/kcm_navigation.json @@ -15,6 +15,7 @@ "Name[is]": "Luis Büchi", "Name[it]": "Luis Büchi", "Name[ka]": "Luis Büchi", + "Name[ko]": "Luis Büchi", "Name[nl]": "Luis Büchi", "Name[pt_BR]": "Luis Büchi", "Name[sl]": "Luis Büchi", @@ -38,6 +39,7 @@ "Description[is]": "Grunnstilla flakk um skráakerfi", "Description[it]": "Configura navigazione del sistema", "Description[ka]": "სისტემის ნავიგაციის მორგება", + "Description[ko]": "시스템 탐색 설정", "Description[nl]": "Systeemnavigatie configureren", "Description[pt_BR]": "Configurar sistema de navegação", "Description[sl]": "Konfiguriraj sistemsko navigacijo", @@ -66,6 +68,7 @@ "Name[is]": "Flakk", "Name[it]": "Navigazione", "Name[ka]": "ნავიგაცია", + "Name[ko]": "탐색", "Name[nl]": "Navigatie", "Name[pt_BR]": "Navegação", "Name[sl]": "Navigacija", @@ -88,6 +91,7 @@ "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[ko]": "시스템,셸,패널,탐색,제스처", "X-KDE-Keywords[nl]": "systeem,shell,paneel,navigatie,gebaar", "X-KDE-Keywords[pt_BR]": "sistema,shell,painel,navegação,gestos", "X-KDE-Keywords[sl]": "sistem,shell,kontrolna plošča,navigacija,gesta", diff --git a/quicksettings/kscreenosd/package/metadata.json b/quicksettings/kscreenosd/package/metadata.json index 5a41edcf..48cc6245 100644 --- a/quicksettings/kscreenosd/package/metadata.json +++ b/quicksettings/kscreenosd/package/metadata.json @@ -17,6 +17,7 @@ "Name[is]": "Sebastian Kügler", "Name[it]": "Sebastian Kügler", "Name[ka]": "სებასტიან კუგლერი", + "Name[ko]": "Sebastian Kügler", "Name[lv]": "Sebastian Kügler", "Name[nl]": "Sebastian Kügler", "Name[pl]": "Sebastian Kügler", @@ -41,6 +42,7 @@ "Description[is]": "Flýtistilling skjástillinga fyrir Plasma Mobile", "Description[it]": "Configurazione rapida dell'OSD per Plasma Mobile", "Description[ka]": "ეკრანის OSD სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის", + "Description[ko]": "Plasma 모바일의 화면 설정 OSD 빠른 설정", "Description[lv]": "„Plasma Mobile“ OSD ekrāna ātrie iestatījumi", "Description[nl]": "Snelle instelling van OSD opzet van scherm voor Plasma Mobile", "Description[pl]": "Szybkie ustawienia okien na ekranie dla Przenośnej Plazmy", @@ -66,6 +68,7 @@ "Name[is]": "Skjámynd", "Name[it]": "OSD schermo", "Name[ka]": "ეკრანის OSD", + "Name[ko]": "화면 OSD", "Name[lv]": "Ekrāna OSD", "Name[nl]": "OSD van scherm", "Name[pl]": "Okna na ekranie",