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"
7 years ago · 2f71aa8217
parent d8ee1caaf4
commit 2f71aa8217
6 changed files with 7 additions and 0 deletions
--- a/components/shellprivate/wallpaperplugin/wallpaperplugin.knsrc
+++ b/components/shellprivate/wallpaperplugin/wallpaperplugin.knsrc
@ -8,6 +8,7 @@ Name[de]=Hintergrundbild-Module
 Name[el]=Πρόσθετα για ταπετσαρίες
 Name[en_GB]=Wallpaper Plugins
 Name[es]=Complementos de fondos del escritorio
+Name[eu]=Horma-paper pluginak
 Name[fi]=Taustakuvaliitännäiset
 Name[fr]=Modules externes de fonds d'écran
 Name[gl]=Complementos de fondo de escritorio
--- a/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop
+++ b/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop
@ -6,6 +6,7 @@ Name[da]=BBC Weather
 Name[de]=BBC-Wetterdienst
 Name[en_GB]=BBC Weather
 Name[es]=BBC Weather
+Name[eu]=BBC Weather
 Name[fi]=BBC Weather
 Name[fr]=Météo de la BBC
 Name[gl]=BBC Weather
@ -30,6 +31,7 @@ Comment[ca@valencia]=Dades XML de la British Broadcasting Corporation
 Comment[da]=XML-data fra British Broadcasting Corporation
 Comment[en_GB]=XML Data from the British Broadcasting Corporation
 Comment[es]=Datos XML de la British Broadcasting Corporation
+Comment[eu]=British Broadcasting Corporation-en XML datuak
 Comment[fi]=XML-data BBC:ltä
 Comment[fr]=Données XML de la British Broadcasting Corporation
 Comment[gl]=Datos XML da British Broadcasting Corporation
--- a/kcms/translations/kcm_translations.desktop
+++ b/kcms/translations/kcm_translations.desktop
@ -19,6 +19,7 @@ Name[da]=Sprog
 Name[de]=Sprache
 Name[en_GB]=Language
 Name[es]=Idioma
+Name[eu]=Hizkuntza
 Name[fi]=Kieli
 Name[fr]=Langue
 Name[gl]=Idioma
--- a/kcms/translations/package/metadata.desktop
+++ b/kcms/translations/package/metadata.desktop
@ -7,6 +7,7 @@ Name[da]=Sprog
 Name[de]=Sprache
 Name[en_GB]=Language
 Name[es]=Idioma
+Name[eu]=Hizkuntza
 Name[fi]=Kieli
 Name[fr]=Langue
 Name[gl]=Idioma
--- a/lookandfeel/metadata.desktop
+++ b/lookandfeel/metadata.desktop
@ -5,6 +5,7 @@ Comment[ca@valencia]=Brisa pel VDG del KDE
 Comment[da]=Breeze af KDE VDG
 Comment[en_GB]=Breeze by the KDE VDG
 Comment[es]=Brisa por KDE VDG
+Comment[eu]=Breeze KDEren VDGk egina
 Comment[fi]=Breeze KDE VDG:ltä
 Comment[fr]=Breeze, par KDE VDG
 Comment[gl]=Breeze de KDE VDG
--- a/sddm-theme/metadata.desktop
+++ b/sddm-theme/metadata.desktop
@ -49,6 +49,7 @@ Description[ca@valencia]=Brisa
 Description[da]=Breeze
 Description[en_GB]=Breeze
 Description[es]=Brisa
+Description[eu]=Breeze
 Description[fi]=Breeze
 Description[fr]=Breeze
 Description[gl]=Breeze