From 551cf357a2e682bd0233138013db472d2fd43dee Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 1 Apr 2022 03:22:43 +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 | 2 +- app/latte-layouts.knsrc | 2 +- app/packageplugins/indicator/latte-indicator.desktop | 2 +- containment/metadata.desktop.cmake | 2 +- containment/package/metadata.desktop | 2 +- .../plasma-containmentactions-lattecontextmenu.desktop | 4 ++-- indicators/default/metadata.desktop | 2 +- indicators/org.kde.latte.plasma/metadata.desktop | 2 +- indicators/org.kde.latte.plasmatabstyle/metadata.desktop | 2 +- plasmoid/metadata.desktop.cmake | 2 +- plasmoid/package/metadata.desktop | 2 +- shell/metadata.desktop.cmake | 2 +- shell/package/metadata.desktop | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/latte-indicators.knsrc b/app/latte-indicators.knsrc index 487d9d409..39fe03c72 100644 --- a/app/latte-indicators.knsrc +++ b/app/latte-indicators.knsrc @@ -2,7 +2,7 @@ Name=Latte Indicators Name[az]=Latte İndikatorları Name[ca]=Indicadors del Latte -Name[ca@valencia]=Indicadors del Latte +Name[ca@valencia]=Indicadors de Latte Name[cs]=Ukazatele Latte Name[el]=Δείκτες Latte Name[en_GB]=Latte Indicators diff --git a/app/latte-layouts.knsrc b/app/latte-layouts.knsrc index b4094a8cc..8da7fb918 100644 --- a/app/latte-layouts.knsrc +++ b/app/latte-layouts.knsrc @@ -3,7 +3,7 @@ Name=Latte Layouts Name[ar]=مخطّطات لاتيه Name[az]=Latte Maketləri Name[ca]=Disposicions del Latte -Name[ca@valencia]=Disposicions del Latte +Name[ca@valencia]=Disposicions de Latte Name[cs]=Rozložení Latte Name[de]=Latte-Profile Name[el]=Προφίλ Latte diff --git a/app/packageplugins/indicator/latte-indicator.desktop b/app/packageplugins/indicator/latte-indicator.desktop index 9d5e4ec0e..10c7024e2 100644 --- a/app/packageplugins/indicator/latte-indicator.desktop +++ b/app/packageplugins/indicator/latte-indicator.desktop @@ -5,7 +5,7 @@ X-KDE-ServiceType=Latte/Indicator Comment=Latte indicator Comment[az]=Latte İndikatoru Comment[ca]=Indicador del Latte -Comment[ca@valencia]=Indicador del Latte +Comment[ca@valencia]=Indicador de Latte Comment[cs]=Ukazatel Latte Comment[el]=Δείκτης Latte Comment[en_GB]=Latte indicator diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake index d8cd63c35..7db28e835 100644 --- a/containment/metadata.desktop.cmake +++ b/containment/metadata.desktop.cmake @@ -3,7 +3,7 @@ Encoding=UTF-8 Name=Latte Containment Name[az]=Latte əhatəsi Name[ca]=Contenidor del Latte -Name[ca@valencia]=Contenidor del Latte +Name[ca@valencia]=Contenidor de Latte Name[cs]=Kontejner Latte Name[en_GB]=Latte Containment Name[es]=Contenedor de Latte diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop index 57366c6c5..b7eba9302 100644 --- a/containment/package/metadata.desktop +++ b/containment/package/metadata.desktop @@ -3,7 +3,7 @@ Encoding=UTF-8 Name=Latte Containment Name[az]=Latte əhatəsi Name[ca]=Contenidor del Latte -Name[ca@valencia]=Contenidor del Latte +Name[ca@valencia]=Contenidor de Latte Name[cs]=Kontejner Latte Name[en_GB]=Latte Containment Name[es]=Contenedor de Latte diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop index d4df8623c..2c711c6e3 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop +++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop @@ -2,7 +2,7 @@ Name=Standard Latte Menu Name[az]=Standart Latte menyusu Name[ca]=Menú estàndard del Latte -Name[ca@valencia]=Menú estàndard del Latte +Name[ca@valencia]=Menú estàndard de Latte Name[cs]=Standardní nabídka Latte Name[de]=Standard-Latte-Menü Name[el]=Προκαθορισμένο Μενού Latte @@ -34,7 +34,7 @@ Name[zh_TW]=標準的 Latte 選單 Comment=The latte menu that normally shows on right-click Comment[az]=Sağ düymə kliki ilə göstəriləcək Latte menyusu Comment[ca]=El menú del Latte que es mostra normalment amb un clic del botó dret -Comment[ca@valencia]=El menú del Latte que es mostra normalment amb un clic del botó dret +Comment[ca@valencia]=El menú de Latte que es mostra normalment amb un clic del botó dret Comment[cs]=Nabídka Latte, jenž se běžně zobrazuje při kliknutí pravým tlačítkem Comment[de]=Das Latte-Menü, das normalerweise mit der rechten Maustaste angezeigt wird Comment[el]=Το προκαθορισμένο μενού του Latte που εμφανίζεται με δεξί κλικ diff --git a/indicators/default/metadata.desktop b/indicators/default/metadata.desktop index a7d8c379b..3dc5a9922 100644 --- a/indicators/default/metadata.desktop +++ b/indicators/default/metadata.desktop @@ -36,7 +36,7 @@ Name[zh_TW]=Latte Comment=Latte default indicator Comment[az]=Latte standart indikatoru Comment[ca]=Indicador predeterminat del Latte -Comment[ca@valencia]=Indicador predeterminat del Latte +Comment[ca@valencia]=Indicador predeterminat de Latte Comment[cs]=Výchozí ukazatel Latte Comment[el]=Προκαθορισμένος δείκτης Latte Comment[en_GB]=Latte default indicator diff --git a/indicators/org.kde.latte.plasma/metadata.desktop b/indicators/org.kde.latte.plasma/metadata.desktop index d15ea2ae0..9478f0b2e 100644 --- a/indicators/org.kde.latte.plasma/metadata.desktop +++ b/indicators/org.kde.latte.plasma/metadata.desktop @@ -35,7 +35,7 @@ Name[zh_TW]=Plasma Comment=Latte Plasma style indicator Comment[az]=Latte Plasma üslubu indikatoru Comment[ca]=Indicador a l'estil Plasma per al Latte -Comment[ca@valencia]=Indicador a l'estil Plasma per al Latte +Comment[ca@valencia]=Indicador a l'estil Plasma per a Latte Comment[cs]=Ukazatel Latte ve stylu Plasma Comment[el]=Δείκτης Latte σε στιλ Plasma Comment[en_GB]=Latte Plasma style indicator diff --git a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop index 0274560ec..53e050330 100644 --- a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop +++ b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop @@ -29,7 +29,7 @@ Name[zh_TW]=Plasma 分頁樣式 Comment=Plasma Tab style indicator for Latte Comment[az]=Latte üçün Plasma Vərəq Üslubu indikatoru Comment[ca]=Indicador a l'estil pestanya del Plasma per al Latte -Comment[ca@valencia]=Indicador a l'estil pestanya de Plasma per al Latte +Comment[ca@valencia]=Indicador a l'estil pestanya de Plasma per a Latte Comment[cs]=Ukazatel stylu Karet Plasma pro Latte Comment[en_GB]=Plasma Tab style indicator for Latte Comment[es]=Indicador de estilo de pestaña Plasma para Latte diff --git a/plasmoid/metadata.desktop.cmake b/plasmoid/metadata.desktop.cmake index 512c317aa..17db85663 100644 --- a/plasmoid/metadata.desktop.cmake +++ b/plasmoid/metadata.desktop.cmake @@ -2,7 +2,7 @@ Name=Latte Tasks Name[az]=Latte Tapşırıqları Name[ca]=Tasques del Latte -Name[ca@valencia]=Tasques del Latte +Name[ca@valencia]=Tasques de Latte Name[cs]=Úlohy Latte Name[el]=Εργασίες Latte Name[en_GB]=Latte Tasks diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index 9d4277295..acaf227da 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -2,7 +2,7 @@ Name=Latte Tasks Name[az]=Latte Tapşırıqları Name[ca]=Tasques del Latte -Name[ca@valencia]=Tasques del Latte +Name[ca@valencia]=Tasques de Latte Name[cs]=Úlohy Latte Name[el]=Εργασίες Latte Name[en_GB]=Latte Tasks diff --git a/shell/metadata.desktop.cmake b/shell/metadata.desktop.cmake index 3f713d5f5..abe7cbbd5 100644 --- a/shell/metadata.desktop.cmake +++ b/shell/metadata.desktop.cmake @@ -3,7 +3,7 @@ Encoding=UTF-8 Name=Latte Shell Name[az]=Latte Üzlüyü Name[ca]=Intèrpret d'ordres del Latte -Name[ca@valencia]=Intèrpret d'ordres del Latte +Name[ca@valencia]=Intèrpret d'ordres de Latte Name[cs]=Shell Latte Name[da]=Latte-skal Name[de]=Latte-Shell diff --git a/shell/package/metadata.desktop b/shell/package/metadata.desktop index b44bb41d2..cb7bc34eb 100644 --- a/shell/package/metadata.desktop +++ b/shell/package/metadata.desktop @@ -3,7 +3,7 @@ Encoding=UTF-8 Name=Latte Shell Name[az]=Latte Üzlüyü Name[ca]=Intèrpret d'ordres del Latte -Name[ca@valencia]=Intèrpret d'ordres del Latte +Name[ca@valencia]=Intèrpret d'ordres de Latte Name[cs]=Shell Latte Name[da]=Latte-skal Name[de]=Latte-Shell