From 80bc5112fd294201755e99c8eb88e792a8ab9d09 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 1 Aug 2020 05:53:53 +0200 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/desktoptheme/kcm_desktoptheme.desktop | 3 +++ kcms/desktoptheme/package/metadata.desktop | 2 ++ kcms/desktoptheme/plasma-themes.knsrc | 1 + kcms/icons/icons.knsrc | 1 + kcms/icons/kcm_icons.desktop | 3 +++ kcms/icons/package/metadata.desktop | 2 ++ .../shell/plasma-packagestructure-plasma-shell.desktop | 2 +- 7 files changed, 13 insertions(+), 1 deletion(-) diff --git a/kcms/desktoptheme/kcm_desktoptheme.desktop b/kcms/desktoptheme/kcm_desktoptheme.desktop index f378bc687..98f954b1b 100644 --- a/kcms/desktoptheme/kcm_desktoptheme.desktop +++ b/kcms/desktoptheme/kcm_desktoptheme.desktop @@ -16,6 +16,7 @@ Name[ca]=Estil del Plasma Name[cs]=Styl Plasma Name[es]=Estilo de Plasma Name[eu]=Plasmaren estiloa +Name[fi]=Plasma-tyyli Name[fr]=Style Plasma Name[it]=Stile di Plasma Name[nl]=Plasma-stijl @@ -32,6 +33,7 @@ Comment[ca]=Trieu l'estil del Plasma Comment[cs]=Zvolte styl Plasma Comment[es]=Escoger el estilo de Plasma Comment[eu]=Aukeratu Plasmaren estiloa +Comment[fi]=Valitse Plasma-tyyli Comment[fr]=Sélectionner le style de Plasma Comment[it]=Scegli lo stile di Plasma Comment[nl]=Plasma-stijl kiezen @@ -48,6 +50,7 @@ X-KDE-Keywords[ca]=Tema d'escriptori,Tema del Plasma X-KDE-Keywords[cs]=Motiv plochy, motiv Plasma X-KDE-Keywords[es]=Tema de escritorio,Tema de Plasma X-KDE-Keywords[eu]=Mahaigaineko gaia,Plasmaren gaia +X-KDE-Keywords[fi]=Työpöytäteema,Plasma-teema X-KDE-Keywords[fr]=Thème de de bureau, thème Plasma X-KDE-Keywords[it]=Tema del desktop,tema di Plasma X-KDE-Keywords[nl]=Bureaubladthema,Plasma-thema diff --git a/kcms/desktoptheme/package/metadata.desktop b/kcms/desktoptheme/package/metadata.desktop index 0e89d1de2..e08990329 100644 --- a/kcms/desktoptheme/package/metadata.desktop +++ b/kcms/desktoptheme/package/metadata.desktop @@ -5,6 +5,7 @@ Name[ca]=Estil del Plasma Name[cs]=Styl Plasma Name[es]=Estilo de Plasma Name[eu]=Plasmaren estiloa +Name[fi]=Plasma-tyyli Name[fr]=Style Plasma Name[it]=Stile di Plasma Name[nl]=Plasma-stijl @@ -21,6 +22,7 @@ Comment[ca]=Trieu el tema del Plasma Comment[cs]=Zvolte motiv Plasma Comment[es]=Escoger un tema de Plasma Comment[eu]=Aukeratu Plasmaren gaia +Comment[fi]=Valitse Plasma-teema Comment[fr]=Sélectionner un thème Plasma Comment[it]=Scegli il tema di Plasma Comment[nl]=Plasma-thema kiezen diff --git a/kcms/desktoptheme/plasma-themes.knsrc b/kcms/desktoptheme/plasma-themes.knsrc index 9c00d7535..f148d0702 100644 --- a/kcms/desktoptheme/plasma-themes.knsrc +++ b/kcms/desktoptheme/plasma-themes.knsrc @@ -5,6 +5,7 @@ Name[ca]=Estils del Plasma Name[cs]=Styly Plasma Name[es]=Estilos de Plasma Name[eu]=Plasmaren estiloak +Name[fi]=Plasma-tyylit Name[fr]=Styles Plasma Name[it]=Stili di Plasma Name[nl]=Plasma-stijlen diff --git a/kcms/icons/icons.knsrc b/kcms/icons/icons.knsrc index ac373b685..4068a5ee9 100644 --- a/kcms/icons/icons.knsrc +++ b/kcms/icons/icons.knsrc @@ -5,6 +5,7 @@ Name[ca]=Icones Name[cs]=Ikony Name[es]=Iconos Name[eu]=Ikonoak +Name[fi]=Kuvakkeet Name[fr]=Icônes Name[it]=Icone Name[nl]=Pictogrammen diff --git a/kcms/icons/kcm_icons.desktop b/kcms/icons/kcm_icons.desktop index ac3f6e415..bc870448a 100644 --- a/kcms/icons/kcm_icons.desktop +++ b/kcms/icons/kcm_icons.desktop @@ -17,6 +17,7 @@ Name[ca]=Icones Name[cs]=Ikony Name[es]=Iconos Name[eu]=Ikonoak +Name[fi]=Kuvakkeet Name[fr]=Icônes Name[it]=Icone Name[nl]=Pictogrammen @@ -34,6 +35,7 @@ Comment[ca]=Trieu el tema d'icones Comment[cs]=Vyberte motiv ikon Comment[es]=Escoger un tema de iconos Comment[eu]=Aukeratu ikono-gaia +Comment[fi]=Valitse kuvaketeema Comment[fr]=Sélectionner un thème d'icônes Comment[it]=Scegli il tema di icone Comment[nl]=Pictogramthema kiezen @@ -51,6 +53,7 @@ X-KDE-Keywords[ca]=icones,efectes,mida,color alt,color baix X-KDE-Keywords[cs]=ikony,efekty,velikost,hicolor,locolor X-KDE-Keywords[es]=iconos,efectos,tamaño,hicolor,locolor X-KDE-Keywords[eu]=ikonoak,efektuak,neurria,sakonera handiko kolorea,sakonera txikiko kolorea +X-KDE-Keywords[fi]=kuvakkeet,tehosteet,koko,täysväri,väri X-KDE-Keywords[fr]=icônes, effets, taille, couleurs-16 bits, couleurs-8 bits X-KDE-Keywords[it]=icone,effetti,dimensione,molti colori,pochi colori X-KDE-Keywords[nl]=pictoogrammen,effecten,grootte,hi-kleur,lo-kleur diff --git a/kcms/icons/package/metadata.desktop b/kcms/icons/package/metadata.desktop index d5b85cf71..b8e6789c3 100644 --- a/kcms/icons/package/metadata.desktop +++ b/kcms/icons/package/metadata.desktop @@ -5,6 +5,7 @@ Name[ca]=Icones Name[cs]=Ikony Name[es]=Iconos Name[eu]=Ikonoak +Name[fi]=Kuvakkeet Name[fr]=Icônes Name[it]=Icone Name[nl]=Pictogrammen @@ -21,6 +22,7 @@ Comment[ca]=Trieu el tema d'icones Comment[cs]=Vyberte motiv ikon Comment[es]=Escoger un tema de iconos Comment[eu]=Aukeratu ikono-gaia +Comment[fi]=Valitse kuvaketeema Comment[fr]=Sélectionner un thème d'icônes Comment[it]=Scegli il tema di icone Comment[nl]=Pictogramthema kiezen diff --git a/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop b/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop index df317f874..806b076cc 100644 --- a/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop +++ b/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop @@ -13,7 +13,7 @@ Name[en_GB]=Plasma Shell Name[es]=Intérprete de Plasma Name[et]=Plasma shell Name[eu]=Plasma-ingurunea -Name[fi]=Plasma-kuori +Name[fi]=Plasma-käyttöliittymä Name[fr]=Environnement Plasma Name[gl]=Shell de Plasma Name[hu]=Plasma felület