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"
11 years ago · 856902efa0
parent 278071edd3
commit 856902efa0
11 changed files with 23 additions and 0 deletions
--- a/cursors/Breeze/Breeze/index.theme
+++ b/cursors/Breeze/Breeze/index.theme
@ -4,6 +4,7 @@ Name[ar]=نسيم
 Name[ast]=Breeze
 Name[bs]=Breeze
 Name[ca]=Brisa
+Name[ca@valencia]=Brisa
 Name[cs]=Breeze
 Name[da]=Breeze
 Name[de]=Breeze
@ -43,6 +44,7 @@ Comment=KDE Plasma Cursor Theme
 Comment[ar]=سمة مؤشّر بلازما كدي
 Comment[bs]=KDE Plasmatema kursora
 Comment[ca]=Tema de cursor del Plasma pel KDE
+Comment[ca@valencia]=Tema de cursor del Plasma pel KDE
 Comment[cs]=Motiv kurzorů Plasma KDE
 Comment[da]=Markørtema til KDE Plasma
 Comment[de]=Plasma-Zeigerdesign für KDE
--- a/cursors/Breeze/src/index.theme
+++ b/cursors/Breeze/src/index.theme
@ -4,6 +4,7 @@ Name[ar]=نسيم
 Name[ast]=Breeze
 Name[bs]=Breeze
 Name[ca]=Brisa
+Name[ca@valencia]=Brisa
 Name[cs]=Breeze
 Name[da]=Breeze
 Name[de]=Breeze
@ -43,6 +44,7 @@ Comment=KDE Plasma Cursor Theme
 Comment[ar]=سمة مؤشّر بلازما كدي
 Comment[bs]=KDE Plasmatema kursora
 Comment[ca]=Tema de cursor del Plasma pel KDE
+Comment[ca@valencia]=Tema de cursor del Plasma pel KDE
 Comment[cs]=Motiv kurzorů Plasma KDE
 Comment[da]=Markørtema til KDE Plasma
 Comment[de]=Plasma-Zeigerdesign für KDE
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@ -2,6 +2,7 @@
 Name=Breeze Snow
 Name[ar]=نسيم ثلجيّ
 Name[ca]=Brisa neu
+Name[ca@valencia]=Brisa neu
 Name[cs]=Breeze sníh
 Name[da]=Breeze Snow
 Name[de]=Breeze-Schnee
@ -39,6 +40,7 @@ Comment=KDE Plasma Cursor Theme
 Comment[ar]=سمة مؤشّر بلازما كدي
 Comment[bs]=KDE Plasmatema kursora
 Comment[ca]=Tema de cursor del Plasma pel KDE
+Comment[ca@valencia]=Tema de cursor del Plasma pel KDE
 Comment[cs]=Motiv kurzorů Plasma KDE
 Comment[da]=Markørtema til KDE Plasma
 Comment[de]=Plasma-Zeigerdesign für KDE
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@ -2,6 +2,7 @@
 Name=Breeze Snow
 Name[ar]=نسيم ثلجيّ
 Name[ca]=Brisa neu
+Name[ca@valencia]=Brisa neu
 Name[cs]=Breeze sníh
 Name[da]=Breeze Snow
 Name[de]=Breeze-Schnee
@ -39,6 +40,7 @@ Comment=KDE Plasma Cursor Theme
 Comment[ar]=سمة مؤشّر بلازما كدي
 Comment[bs]=KDE Plasmatema kursora
 Comment[ca]=Tema de cursor del Plasma pel KDE
+Comment[ca@valencia]=Tema de cursor del Plasma pel KDE
 Comment[cs]=Motiv kurzorů Plasma KDE
 Comment[da]=Markørtema til KDE Plasma
 Comment[de]=Plasma-Zeigerdesign für KDE
--- a/icons-dark/index.theme
+++ b/icons-dark/index.theme
@ -3,6 +3,7 @@ Name=Breeze Dark
 Name[ar]=نسيم داكن
 Name[bs]=Breeze tamna
 Name[ca]=Brisa fosca
+Name[ca@valencia]=Brisa fosca
 Name[cs]=Breeze Tmavé
 Name[da]=Breeze Dark
 Name[de]=Breeze-Dunkel
@ -39,6 +40,7 @@ Name[zh_TW]=Breeze Dark

 Comment=Default Plasma 5 Theme for Dark themes
 Comment[ca]=Tema del Plasma 5 per defecte per temes foscos
+Comment[ca@valencia]=Tema del Plasma 5 per defecte per temes foscos
 Comment[cs]=Výchozí motiv KDE Plasma 5 pro tmavé motivy vzhledu
 Comment[de]=Dunkles Standard-Arbeitsflächendesign für Plasma 5
 Comment[en_GB]=Default Plasma 5 Theme for Dark themes
--- a/icons/index.theme
+++ b/icons/index.theme
@ -4,6 +4,7 @@ Name[ar]=نسيم
 Name[ast]=Breeze
 Name[bs]=Breeze
 Name[ca]=Brisa
+Name[ca@valencia]=Brisa
 Name[cs]=Breeze
 Name[da]=Breeze
 Name[de]=Breeze
@ -43,6 +44,7 @@ Name[zh_TW]=Breeze
 Comment=Default Plasma 5 Theme
 Comment[ar]=سمة بلازما 5 الافتراضيّة
 Comment[ca]=Tema del Plasma 5 per defecte
+Comment[ca@valencia]=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
--- a/kdecoration/config/breezedecorationconfig.desktop
+++ b/kdecoration/config/breezedecorationconfig.desktop
@ -12,6 +12,7 @@ X-KDE-Weight=60
 Name=Window  Decoration
 Name[ar]=زخرفة النّوافذ
 Name[ca]=Decoració de les finestres
+Name[ca@valencia]=Decoració de les finestres
 Name[cs]=Dekorace oken
 Name[da]=Vinduesdekoration
 Name[de]=Fensterdekoration
@ -48,6 +49,7 @@ Name[zh_TW]=視窗裝飾
 Comment=Modify the appearance of window decorations
 Comment[ar]=عدّل مظهر زخرفات النّوافذ
 Comment[ca]=Modifica l'aparença de les decoracions de les finestres
+Comment[ca@valencia]=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
@ -84,6 +86,7 @@ Comment[zh_TW]=變更視窗裝飾外觀
 X-KDE-Keywords=breeze,decoration
 X-KDE-Keywords[ar]=نسيم,زخرفة
 X-KDE-Keywords[ca]=breeze,brisa,decoració
+X-KDE-Keywords[ca@valencia]=breeze,brisa,decoració
 X-KDE-Keywords[cs]=breeze,dekorace
 X-KDE-Keywords[da]=breeze,dekoration
 X-KDE-Keywords[de]=Breeze-Dekoration
--- a/kstyle/breeze.themerc
+++ b/kstyle/breeze.themerc
@ -4,6 +4,7 @@ Name[ar]=نسيم
 Name[ast]=Breeze
 Name[bs]=Breeze
 Name[ca]=Brisa
+Name[ca@valencia]=Brisa
 Name[cs]=Breeze
 Name[da]=Breeze
 Name[de]=Breeze
@ -44,6 +45,7 @@ Comment=Widget style for KDE Frameworks
 Comment[ar]=نمط ودجات أُطر عمل كدي
 Comment[bs]=Stil kontrola za KDE Frameworks
 Comment[ca]=Estil dels estris pel KDE Frameworks
+Comment[ca@valencia]=Estil dels estris pel KDE Frameworks
 Comment[cs]=Styl widgetu pro KDE Frameworks
 Comment[da]=Kontrolstil til KDE Frameworks
 Comment[de]=Stil der Bedienelemente für KDE Frameworks
--- a/kstyle/config/breezestyleconfig.desktop
+++ b/kstyle/config/breezestyleconfig.desktop
@ -12,6 +12,7 @@ X-KDE-Weight=50
 Name=Widget Style
 Name[ar]=نمط الودجات
 Name[ca]=Estil dels estris
+Name[ca@valencia]=Estil dels estris
 Name[cs]=Styl widgetu
 Name[da]=Kontrolstil
 Name[de]=Stil der Bedienelemente
@ -48,6 +49,7 @@ Name[zh_TW]=元件樣式
 Comment=Modify the appearance of widgets
 Comment[ar]=عدّل مظهر الودجات
 Comment[ca]=Modifica l'aparença dels estris
+Comment[ca@valencia]=Modifica l'aparença dels estris
 Comment[cs]=Změnit vzhled widgetů
 Comment[da]=Ændr kontrollers udseende
 Comment[de]=Das Erscheinungsbild der Bedienelemente ändern
@ -85,6 +87,7 @@ Comment[zh_TW]=變更元件外觀
 X-KDE-Keywords=breeze,widget,style
 X-KDE-Keywords[ar]=نسيم,ودجة,نمط
 X-KDE-Keywords[ca]=breeze,brisa,estri,estil
+X-KDE-Keywords[ca@valencia]=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
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Breeze Dark Desktop Design Language by the KDE VDG
 Comment[ca]=Llenguatge de disseny d'escriptori Brisa fosca pel VDG del KDE
+Comment[ca@valencia]=Llenguatge de disseny d'escriptori Brisa fosca pel VDG del KDE
 Comment[cs]=Jazyk pro návrh pracovní plochy Breeze Dark od KDE VDG
 Comment[de]=Breeze-Dunkel-Arbeitsflächendesign der KDE VDG
 Comment[en_GB]=Breeze Dark Desktop Design Language by the KDE VDG
@ -31,6 +32,7 @@ Name=Breeze Dark
 Name[ar]=نسيم داكن
 Name[bs]=Breeze tamna
 Name[ca]=Brisa fosca
+Name[ca@valencia]=Brisa fosca
 Name[cs]=Breeze Tmavé
 Name[da]=Breeze Dark
 Name[de]=Breeze-Dunkel
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -3,6 +3,7 @@ Name=Next
 Name[ar]=التّالي
 Name[bs]=Sljedeći
 Name[ca]=Next
+Name[ca@valencia]=Next
 Name[cs]=Následující
 Name[da]=Next
 Name[de]=Next