From 75c02d8d7fd7e2aab83c159cfc89909179c158bc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 9 Jul 2015 11:29:11 +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" --- cursors/Breeze_Snow/Breeze_Snow/index.theme | 1 + cursors/Breeze_Snow/src/index.theme | 1 + icons-dark/index.theme | 2 ++ icons/index.theme | 1 + kdecoration/config/breezedecorationconfig.desktop | 3 +++ kstyle/config/breezestyleconfig.desktop | 3 +++ 6 files changed, 11 insertions(+) diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme index f4fef8e5..7759c3b4 100644 --- a/cursors/Breeze_Snow/Breeze_Snow/index.theme +++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme @@ -3,6 +3,7 @@ Name=Breeze Snow Name[ar]=نسيم ثلجيّ Name[ca]=Brisa neu Name[cs]=Breeze sníh +Name[da]=Breeze Snow Name[de]=Breeze-Schnee Name[el]=Χιόνι Breeze Name[en_GB]=Breeze Snow diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme index f4fef8e5..7759c3b4 100644 --- a/cursors/Breeze_Snow/src/index.theme +++ b/cursors/Breeze_Snow/src/index.theme @@ -3,6 +3,7 @@ Name=Breeze Snow Name[ar]=نسيم ثلجيّ Name[ca]=Brisa neu Name[cs]=Breeze sníh +Name[da]=Breeze Snow Name[de]=Breeze-Schnee Name[el]=Χιόνι Breeze Name[en_GB]=Breeze Snow diff --git a/icons-dark/index.theme b/icons-dark/index.theme index 0f39a152..8a874e3a 100644 --- a/icons-dark/index.theme +++ b/icons-dark/index.theme @@ -4,6 +4,7 @@ Name[ar]=نسيم داكن Name[bs]=Breeze tamna Name[ca]=Brisa fosca Name[cs]=Breeze Tmavé +Name[da]=Breeze Dark Name[de]=Breeze-Dunkel Name[el]=Σκοτεινό Breeze Name[en_GB]=Breeze Dark @@ -41,6 +42,7 @@ Comment[ar]=سمة أيقونات نسيم لمخطّطات الألوان ال Comment[bs]=Breeze tema ikona za tamne šeme boja razvijena od strane KDE grupe za vizuelni dizajn Comment[ca]=Tema d'icones Brisa amb un esquema de color fosc pel Grup de disseny visual del KDE Comment[cs]=Motiv ikon Breeze pro tmavá barevná schémata od KDE Visual Design Group +Comment[da]=Breeze ikontema til mørke farvetemaer af KDE's visuelle designgruppe Comment[de]=Breeze-Symboldesign für dunkles Farbschema der KDE Visual Design Group Comment[el]=Θέμα εικονιδίων Breeze για σκοτεινά χρωματικά σχέδια από το KDE Visual Design Group Comment[en_GB]=Breeze icon theme for dark colour schemes by the KDE Visual Design Group diff --git a/icons/index.theme b/icons/index.theme index ff69fedd..1c006446 100644 --- a/icons/index.theme +++ b/icons/index.theme @@ -44,6 +44,7 @@ Comment=Default Plasma 5 Theme Comment[ar]=سمة بلازما 5 الافتراضيّة Comment[ca]=Tema del Plasma 5 per defecte Comment[cs]=Výchozí motiv Plasma 5 +Comment[da]=Standardtema til Plasma 5 Comment[de]=Standard-Arbeitsflächendesign für Plasma 5 Comment[el]=Προκαθορισμένο θέμα Plasma 5 Comment[en_GB]=Default Plasma 5 Theme diff --git a/kdecoration/config/breezedecorationconfig.desktop b/kdecoration/config/breezedecorationconfig.desktop index 3b01269a..dd4b76f4 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -13,6 +13,7 @@ Name=Window Decoration Name[ar]=زخرفة النّوافذ Name[ca]=Decoració de les finestres Name[cs]=Dekorace oken +Name[da]=Vinduesdekoration Name[de]=Fensterdekoration Name[el]=Διακοσμήσεις παραθύρου Name[en_GB]=Window Decoration @@ -48,6 +49,7 @@ Comment=Modify the appearance of window decorations Comment[ar]=عدّل مظهر زخرفات النّوافذ Comment[ca]=Modifica l'aparença de les decoracions de les finestres Comment[cs]=Změnit vzhled dekorace oken +Comment[da]=Ændr vinduesdekorationers udseende Comment[de]=Das Erscheinungsbild der Fensterdekorationen ändern Comment[el]=Τροποποίηση εμφάνισης της διακόσμησης παραθύρου Comment[en_GB]=Modify the appearance of window decorations @@ -82,6 +84,7 @@ X-KDE-Keywords=breeze,decoration X-KDE-Keywords[ar]=نسيم,زخرفة X-KDE-Keywords[ca]=breeze,brisa,decoració X-KDE-Keywords[cs]=breeze,dekorace +X-KDE-Keywords[da]=breeze,dekoration X-KDE-Keywords[de]=Breeze-Dekoration X-KDE-Keywords[el]=breeze,διακόσμηση X-KDE-Keywords[en_GB]=breeze,decoration diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop index c1d88ce2..87a344d1 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -13,6 +13,7 @@ Name=Widget Style Name[ar]=نمط الودجات Name[ca]=Estil dels estris Name[cs]=Styl widgetu +Name[da]=Kontrolstil Name[de]=Stil der Bedienelemente Name[el]=Στιλ γραφικών συστατικών Name[en_GB]=Widget Style @@ -47,6 +48,7 @@ Comment=Modify the appearance of widgets Comment[ar]=عدّل مظهر الودجات Comment[ca]=Modifica l'aparença dels estris Comment[cs]=Změnit vzhled widgetů +Comment[da]=Ændr kontrollers udseende Comment[de]=Das Erscheinungsbild der Bedienelemente ändern Comment[el]=Τροποποίηση εμφάνισης συστατικών Comment[en_GB]=Modify the appearance of widgets @@ -82,6 +84,7 @@ X-KDE-Keywords=breeze,widget,style X-KDE-Keywords[ar]=نسيم,ودجة,نمط X-KDE-Keywords[ca]=breeze,brisa,estri,estil X-KDE-Keywords[cs]=breeze,widget,styl +X-KDE-Keywords[da]=breeze,kontrol,style X-KDE-Keywords[de]=Breeze,Bedienelement,Stil X-KDE-Keywords[el]=breeze,γραφικό συστατικό,στιλ X-KDE-Keywords[en_GB]=breeze,widget,style