From fae5fcffb76e1b3e117cc6178de74c3eba8b1448 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 28 Nov 2021 01:33:07 +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" --- app/latte-indicators.knsrc | 1 + app/latte-layouts.knsrc | 1 + app/lattedock.notifyrc | 9 +++++++++ app/org.kde.latte-dock.desktop.cmake | 3 +++ app/packageplugins/indicator/latte-indicator.desktop | 1 + .../indicator/latte-packagestructure-indicator.desktop | 1 + .../plasma-containmentactions-lattecontextmenu.desktop | 2 ++ indicators/default/metadata.desktop | 1 + 8 files changed, 19 insertions(+) diff --git a/app/latte-indicators.knsrc b/app/latte-indicators.knsrc index 4886c6714..487d9d409 100644 --- a/app/latte-indicators.knsrc +++ b/app/latte-indicators.knsrc @@ -12,6 +12,7 @@ Name[eu]=Latte adierazleak Name[fi]=Latte-ilmaisimet Name[fr]=Indicateurs de Latte Name[gl]=Indicadores de Latte +Name[hsb]=Latte pokazowaki Name[id]=Indikator Latte Name[it]=Indicatori Latte Name[ko]=Latte 표시기 diff --git a/app/latte-layouts.knsrc b/app/latte-layouts.knsrc index 60ae8ccb6..b4094a8cc 100644 --- a/app/latte-layouts.knsrc +++ b/app/latte-layouts.knsrc @@ -14,6 +14,7 @@ Name[eu]=Latte antolamenduak Name[fi]=Latte-asettelut Name[fr]=Dispositions de Latte Name[gl]=Disposicións de Latte +Name[hsb]=Latte layouty Name[id]=Tataletak Latte Name[it]=Disposizioni di Latte Name[ko]=Latte 레이아웃 diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc index 46dbeeed9..c06a0a17a 100644 --- a/app/lattedock.notifyrc +++ b/app/lattedock.notifyrc @@ -15,6 +15,7 @@ Name[eu]=Latte Dock Name[fi]=Latte-telakka Name[fr]=Barre des tâches de Latte Name[gl]=Doca Latte +Name[hsb]=Latte pas Name[id]=Dock Latte Name[it]=Latte Dock Name[ko]=Latte 독 @@ -48,6 +49,7 @@ Comment[eu]=Latte Dock Comment[fi]=Latte-telakka Comment[fr]=Barre des tâches de Latte Comment[gl]=Doca Latte. +Comment[hsb]=Latte pas Comment[id]=Dock Latte Comment[it]=Latte Dock Comment[ko]=Latte 독 @@ -82,6 +84,7 @@ Name[eu]=Inportatze arrakastatsua Name[fi]=Tuonti onnistui Name[fr]=Importation terminée avec succès Name[gl]=Importouse correctamente +Name[hsb]=Wuspěšnje importował Name[id]=Berhasil diimpor Name[it]=Importata con successo Name[ko]=성공적으로 가져왔습니다 @@ -117,6 +120,7 @@ Name[eu]=Huts egin du inportatzea Name[fi]=Tuonti epäonnistui Name[fr]=Échec de l'importation Name[gl]=Non se puido importar +Name[hsb]=Njemóžach importować Name[id]=Gagal mengimpor Name[it]=Impossibile importare Name[ko]=가져오지 못했습니다 @@ -152,6 +156,7 @@ Name[eu]=Esportatze arrakastatsua Name[fi]=Vienti onnistui Name[fr]=Exportation terminée avec succès Name[gl]=Exportouse correctamente +Name[hsb]=Wuspěšnje eksportował Name[id]=Berhasil diekspor Name[it]=Esportata correttamente Name[ko]=성공적으로 내보냈습니다 @@ -187,6 +192,7 @@ Name[eu]=Huts egin du esportatzea Name[fi]=Vienti epäonnistui Name[fr]=Exportation impossible Name[gl]=Non se puido exportar +Name[hsb]=Njemóžach eksportować Name[ia]=Falleva a exportar Name[id]=Gagal mengekspor Name[it]=Impossibile esportare @@ -223,6 +229,7 @@ Name[eu]=Ezabatze arrakastatsua Name[fi]=Poistaminen onnistui Name[fr]=Suppression terminée avec succès Name[gl]=Retirouse correctamente +Name[hsb]=Wuspěšnje wumazał Name[id]=Berhasil dihapus Name[it]=Rimossa con successo Name[ko]=성공적으로 삭제했습니다 @@ -258,6 +265,7 @@ Name[eu]=Huts egin du ezabatzea Name[fi]=Poistaminen epäonnistui Name[fr]=Échec de la suppression Name[gl]=Non se puido retirar +Name[hsb]=Njemóžach wumazać Name[ia]=Il falleva a remover Name[id]=Gagal menghapus Name[it]=Impossibile rimuovere @@ -295,6 +303,7 @@ Name[eu]=Aldatu antolamendura Name[fi]=Vaihda asetteluun Name[fr]=Basculer vers la disposition Name[gl]=Cambiar á disposición +Name[hsb]=Layout přešaltować Name[id]=Beralih ke tataletak Name[it]=Passa alla disposizione Name[ko]=레이아웃으로 전환 diff --git a/app/org.kde.latte-dock.desktop.cmake b/app/org.kde.latte-dock.desktop.cmake index 0cd078b8f..4eb85a148 100644 --- a/app/org.kde.latte-dock.desktop.cmake +++ b/app/org.kde.latte-dock.desktop.cmake @@ -16,6 +16,7 @@ Name[eu]=Latte Name[fi]=Latte Name[fr]=Latte Name[gl]=Latte +Name[hsb]=Latte Name[ia]=Latte Name[id]=Latte Name[it]=Latte @@ -50,6 +51,7 @@ Comment[eu]=Jendartearen kaia Comment[fi]=Telakka massoille Comment[fr]=Une barre des tâches pour tout le monde Comment[gl]=Doca para as masas. +Comment[hsb]=Pas za wšěch Comment[id]=Dock untuk mengumpulkan Comment[it]=Area di aggancio per le masse Comment[ko]=모두를 위한 독 @@ -83,6 +85,7 @@ GenericName[eu]=Kaia GenericName[fi]=Telakka GenericName[fr]=Barre des tâches GenericName[gl]=Doca +GenericName[hsb]=Pas GenericName[ia]=Bassino GenericName[id]=Dok GenericName[it]=Aggancio diff --git a/app/packageplugins/indicator/latte-indicator.desktop b/app/packageplugins/indicator/latte-indicator.desktop index 127e3ea4a..9d5e4ec0e 100644 --- a/app/packageplugins/indicator/latte-indicator.desktop +++ b/app/packageplugins/indicator/latte-indicator.desktop @@ -15,6 +15,7 @@ Comment[eu]=Latte adierazlea Comment[fi]=Latte-ilmaisin Comment[fr]=Indicateur de Latte Comment[gl]=Indicador de Latte +Comment[hsb]=Latte pokazowak Comment[id]=Indikator latte Comment[it]=Indicatore Latte Comment[ko]=Latte 표시기 diff --git a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop index fa8a860b4..93cdf4465 100644 --- a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop +++ b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop @@ -12,6 +12,7 @@ Name[eu]=Adierazlea Name[fi]=Ilmaisin Name[fr]=Indicateur Name[gl]=Indicador +Name[hsb]=Pokazowak Name[id]=Indikator Name[it]=Indicatore Name[ko]=표시기 diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop index ada4ac9b4..d4df8623c 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop +++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop @@ -13,6 +13,7 @@ Name[eu]=Latte menu estandarra Name[fi]=Latten vakiovalikko Name[fr]=Menu standard de Latte Name[gl]=Menú estándar de Latte +Name[hsb]=Standardny meni latte Name[id]=Menu Latte Standar Name[it]=Menu standard di Latte Name[ko]=표준 Latte 메뉴 @@ -44,6 +45,7 @@ Comment[eu]=Eskuineko botoiaz klik eginda agertu ohi den latte menua Comment[fi]=Latte-valikko, joka tavallisesti näytetään hiiren oikealla painikkeella Comment[fr]=Le menu de Latte s'affichant normalement lors d'un clic droit Comment[gl]=O menú de Latte que adoita mostrarse ao facer clic dereito +Comment[hsb]=Latte-meni, kotryž wuskoči na klik z prawej tastu Comment[id]=Menu latte yang biasanya tampil saat klik-kanan Comment[it]=Il menu di Latte che normalmente viene mostrato al clic destro Comment[ko]=오른쪽 클릭 시 일반적으로 표시되는 Latte 메뉴 diff --git a/indicators/default/metadata.desktop b/indicators/default/metadata.desktop index 793ce02bf..f35765f7e 100644 --- a/indicators/default/metadata.desktop +++ b/indicators/default/metadata.desktop @@ -16,6 +16,7 @@ Name[eu]=Latte Name[fi]=Latte Name[fr]=Latte Name[gl]=Latte +Name[hsb]=Latte Name[ia]=Latte Name[id]=Latte Name[it]=Latte