From 03bfa3bbe917bd845d1308a3a93f4d66f55edfe5 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 21 Feb 2017 11:38:14 +0000 Subject: [PATCH 1/2] Update version number for 5.8.6 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 23b2a768..2466b2a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(breeze) -set(PROJECT_VERSION "5.8.5") +set(PROJECT_VERSION "5.8.6") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From 346d578ce8c8da5f3858276850ae52c4bc585c94 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 1 Mar 2017 08:07:16 +0100 Subject: [PATCH 2/2] 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/Breeze/index.theme | 2 ++ cursors/Breeze/src/index.theme | 2 ++ cursors/Breeze_Snow/Breeze_Snow/index.theme | 2 ++ cursors/Breeze_Snow/src/index.theme | 2 ++ kdecoration/config/breezedecorationconfig.desktop | 3 +++ kstyle/breeze.themerc | 2 ++ kstyle/config/breezestyleconfig.desktop | 3 +++ lookandfeel.dark/metadata.desktop | 2 ++ wallpapers/Next/metadata.desktop | 1 + 9 files changed, 19 insertions(+) diff --git a/cursors/Breeze/Breeze/index.theme b/cursors/Breeze/Breeze/index.theme index b9ba2f9c..a6796426 100644 --- a/cursors/Breeze/Breeze/index.theme +++ b/cursors/Breeze/Breeze/index.theme @@ -12,6 +12,7 @@ Name[el]=Breeze Name[en_GB]=Breeze Name[es]=Brisa Name[et]=Breeze +Name[eu]=Breeze Name[fi]=Breeze Name[fr]=Brise Name[gl]=Breeze @@ -53,6 +54,7 @@ Comment[el]=Θέμα δρομέα του KDE Plasma Comment[en_GB]=KDE Plasma Cursor Theme Comment[es]=Tema de cursores de KDE Plasma Comment[et]=KDE Plasma kursoriteema +Comment[eu]=KDE Plasmaren kurtsore gaia Comment[fi]=KDE Plasman osoitinteema Comment[fr]=Thème Plasma de curseur Comment[gl]=Tema do cursor de Plasma de KDE diff --git a/cursors/Breeze/src/index.theme b/cursors/Breeze/src/index.theme index b9ba2f9c..a6796426 100644 --- a/cursors/Breeze/src/index.theme +++ b/cursors/Breeze/src/index.theme @@ -12,6 +12,7 @@ Name[el]=Breeze Name[en_GB]=Breeze Name[es]=Brisa Name[et]=Breeze +Name[eu]=Breeze Name[fi]=Breeze Name[fr]=Brise Name[gl]=Breeze @@ -53,6 +54,7 @@ Comment[el]=Θέμα δρομέα του KDE Plasma Comment[en_GB]=KDE Plasma Cursor Theme Comment[es]=Tema de cursores de KDE Plasma Comment[et]=KDE Plasma kursoriteema +Comment[eu]=KDE Plasmaren kurtsore gaia Comment[fi]=KDE Plasman osoitinteema Comment[fr]=Thème Plasma de curseur Comment[gl]=Tema do cursor de Plasma de KDE diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme index 3c7d26b1..12567f32 100644 --- a/cursors/Breeze_Snow/Breeze_Snow/index.theme +++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme @@ -10,6 +10,7 @@ Name[el]=Χιόνι Breeze Name[en_GB]=Breeze Snow Name[es]=Brisa nieve Name[et]=Breeze Snow +Name[eu]=Breeze Elurra Name[fi]=Breeze Snow Name[fr]=Brise neigeuse Name[gl]=Breeze Snow @@ -49,6 +50,7 @@ Comment[el]=Θέμα δρομέα του KDE Plasma Comment[en_GB]=KDE Plasma Cursor Theme Comment[es]=Tema de cursores de KDE Plasma Comment[et]=KDE Plasma kursoriteema +Comment[eu]=KDE Plasmaren kurtsore gaia Comment[fi]=KDE Plasman osoitinteema Comment[fr]=Thème Plasma de curseur Comment[gl]=Tema do cursor de Plasma de KDE diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme index 3c7d26b1..12567f32 100644 --- a/cursors/Breeze_Snow/src/index.theme +++ b/cursors/Breeze_Snow/src/index.theme @@ -10,6 +10,7 @@ Name[el]=Χιόνι Breeze Name[en_GB]=Breeze Snow Name[es]=Brisa nieve Name[et]=Breeze Snow +Name[eu]=Breeze Elurra Name[fi]=Breeze Snow Name[fr]=Brise neigeuse Name[gl]=Breeze Snow @@ -49,6 +50,7 @@ Comment[el]=Θέμα δρομέα του KDE Plasma Comment[en_GB]=KDE Plasma Cursor Theme Comment[es]=Tema de cursores de KDE Plasma Comment[et]=KDE Plasma kursoriteema +Comment[eu]=KDE Plasmaren kurtsore gaia Comment[fi]=KDE Plasman osoitinteema Comment[fr]=Thème Plasma de curseur Comment[gl]=Tema do cursor de Plasma de KDE diff --git a/kdecoration/config/breezedecorationconfig.desktop b/kdecoration/config/breezedecorationconfig.desktop index 04fa3253..21caa18d 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -20,6 +20,7 @@ Name[el]=Διακοσμήσεις παραθύρου Name[en_GB]=Window Decoration Name[es]=Decoración de las ventanas Name[et]=Akna dekoratsioon +Name[eu]=Leihoen apaindura Name[fi]=Ikkunan kehys Name[fr]=Décoration de fenêtre Name[gl]=Decoración da xanela @@ -58,6 +59,7 @@ Comment[el]=Τροποποίηση εμφάνισης της διακόσμησ Comment[en_GB]=Modify the appearance of window decorations Comment[es]=Modificar el aspecto de las decoraciones de las ventanas Comment[et]=Akna dekoratsioonide välimuse muutmine +Comment[eu]=Aldatu leiho apainduren itxura Comment[fi]=Muuta ikkunoiden kehysten ulkoasua Comment[fr]=Modifier l'apparence des décorations des fenêtres Comment[gl]=Modifica a aparencia da decoración da xanela @@ -96,6 +98,7 @@ X-KDE-Keywords[el]=breeze,διακόσμηση X-KDE-Keywords[en_GB]=breeze,decoration X-KDE-Keywords[es]=breeze,brisa,decoración X-KDE-Keywords[et]=breeze,dekoratsioon +X-KDE-Keywords[eu]=breeze,apainketa,apaindura X-KDE-Keywords[fi]=breeze,decoration,kehys,koriste,koristus,ikkunakehys X-KDE-Keywords[fr]=breeze,décoration X-KDE-Keywords[gl]=breeze,decoración diff --git a/kstyle/breeze.themerc b/kstyle/breeze.themerc index f703abd5..23038ac0 100644 --- a/kstyle/breeze.themerc +++ b/kstyle/breeze.themerc @@ -12,6 +12,7 @@ Name[el]=Breeze Name[en_GB]=Breeze Name[es]=Brisa Name[et]=Breeze +Name[eu]=Breeze Name[fi]=Breeze Name[fr]=Brise Name[gl]=Breeze @@ -54,6 +55,7 @@ Comment[el]=Στιλ γραφικών συστατικών για το KDE Frame Comment[en_GB]=Widget style for KDE Frameworks Comment[es]=Estilo de elementos gráficos para KDE Frameworks Comment[et]=KDE Frameworksi vidinastiil +Comment[eu]=KDE Frameworks-erako trepeta estiloa Comment[fi]=KDE Frameworksin käyttöliittymätyyli Comment[fr]=Style de composants graphiques pour KDE Comment[gl]=Estilo dos trebellos para a infraestrutura de KDE diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop index 8992f561..0526ac03 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -20,6 +20,7 @@ Name[el]=Στιλ γραφικών συστατικών Name[en_GB]=Widget Style Name[es]=Estilo de los elementos gráficos Name[et]=Vidina stiil +Name[eu]=Trepeten estiloa Name[fi]=Elementtien tyyli Name[fr]=Style de composant graphique Name[gl]=Estilo do trebello @@ -58,6 +59,7 @@ Comment[el]=Τροποποίηση εμφάνισης συστατικών Comment[en_GB]=Modify the appearance of widgets Comment[es]=Modificar el aspecto de los elementos gráficos Comment[et]=Vidinate välimuse muutmine +Comment[eu]=Aldatu trepeten itxura Comment[fi]=Muuta elementtien ulkoasua Comment[fr]=Modifier l'apparence des composants graphiques Comment[gl]=Modifica a aparencia dos trebellos @@ -97,6 +99,7 @@ X-KDE-Keywords[el]=breeze,γραφικό συστατικό,στιλ X-KDE-Keywords[en_GB]=breeze,widget,style X-KDE-Keywords[es]=breeze,brisa,elemento gráfico,widget,estilo X-KDE-Keywords[et]=breeze,vidin,stiil +X-KDE-Keywords[eu]=breeze,widget,trepeta,estiloa X-KDE-Keywords[fi]=breeze,widget,style,käyttöliittymäelementti,tyyli,elementti,kontrolli X-KDE-Keywords[fr]=brise,composant graphique, style X-KDE-Keywords[gl]=breeze,trebello,widget,estilo diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index 4a10d06f..4dd2393d 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -9,6 +9,7 @@ Comment[el]=Γλώσσα σχεδιασμού επιφάνειας εργασί Comment[en_GB]=Breeze Dark Desktop Design Language by the KDE VDG Comment[es]=Lenguaje de diseño del escritorio Breeze Dark, por el VDG de KDE Comment[et]=Breeze Dark töölauakujunduse keel KDE VDG-lt +Comment[eu]=Breeze Dark mahaingain diseinurako lengoaia KDE VDG-k egina Comment[fi]=Työpöydän design-kieli Breeze Dark KDE VDG:ltä Comment[fr]=Thème sombre pour Brise, réalisé par KDE VDG Comment[gl]=Linguaxe de deseño do escritorio para Breeze Dark do KDE VDG @@ -47,6 +48,7 @@ Name[el]=Σκοτεινό Breeze Name[en_GB]=Breeze Dark Name[es]=Brisa oscuro Name[et]=Breeze Dark +Name[eu]=Breeze Dark Name[fi]=Breeze Dark Name[fr]=Brise sombre Name[gl]=Breeze Dark diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index e90290b6..dc0cef7f 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -11,6 +11,7 @@ Name[el]=Επόμενο Name[en_GB]=Next Name[es]=Next Name[et]=Next +Name[eu]=Hurrengoa Name[fi]=Next Name[fr]=Suivant Name[gl]=Seguinte