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 · 13e8113dd8
parent 1586e5ced4
commit 13e8113dd8
5 changed files with 40 additions and 0 deletions
--- a/cursors/Breeze/Breeze/index.theme
+++ b/cursors/Breeze/Breeze/index.theme
@ -44,3 +44,11 @@ Name[x-test]=xxBreezexx
 Name[zh_CN]=微风
 Name[zh_TW]=Breeze
 Comment=Breeze by the KDE VDG
+Comment[ca]=Brisa pel VDG del KDE
+Comment[gl]=Breeze de KDE VDG
+Comment[nl]=Breeze door de KDE VDG
+Comment[pt]=Brisa da VDG do KDE
+Comment[sv]=Breeze av KDE:s visuella designgrupp
+Comment[uk]=Breeze, автори — KDE VDG
+Comment[x-test]=xxBreeze by the KDE VDGxx
+Comment[zh_TW]=由 KDE VDG 製作的 Breeze
--- a/cursors/Breeze/src/index.theme
+++ b/cursors/Breeze/src/index.theme
@ -44,3 +44,11 @@ Name[x-test]=xxBreezexx
 Name[zh_CN]=微风
 Name[zh_TW]=Breeze
 Comment=Breeze by the KDE VDG
+Comment[ca]=Brisa pel VDG del KDE
+Comment[gl]=Breeze de KDE VDG
+Comment[nl]=Breeze door de KDE VDG
+Comment[pt]=Brisa da VDG do KDE
+Comment[sv]=Breeze av KDE:s visuella designgrupp
+Comment[uk]=Breeze, автори — KDE VDG
+Comment[x-test]=xxBreeze by the KDE VDGxx
+Comment[zh_TW]=由 KDE VDG 製作的 Breeze
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@ -23,3 +23,11 @@ Name[x-test]=xxBreeze Lightxx
 Name[zh_CN]=亮色微风
 Name[zh_TW]=Breeze Light
 Comment=Breeze Light by the KDE VDG
+Comment[ca]=Brisa clara pel VDG del KDE
+Comment[gl]=Breeze claro de KDE VDG
+Comment[nl]=Breeze Light door de KDE VDG
+Comment[pt]=Brisa Claro da VDG do KDE
+Comment[sv]=Breeze ljus av KDE:s visuella designgrupp
+Comment[uk]=Світла Breeze, автори — KDE VDG
+Comment[x-test]=xxBreeze Light by the KDE VDGxx
+Comment[zh_TW]=由 KDE VDG 製作的 Breeze Light
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@ -23,3 +23,11 @@ Name[x-test]=xxBreeze Lightxx
 Name[zh_CN]=亮色微风
 Name[zh_TW]=Breeze Light
 Comment=Breeze Light by the KDE VDG
+Comment[ca]=Brisa clara pel VDG del KDE
+Comment[gl]=Breeze claro de KDE VDG
+Comment[nl]=Breeze Light door de KDE VDG
+Comment[pt]=Brisa Claro da VDG do KDE
+Comment[sv]=Breeze ljus av KDE:s visuella designgrupp
+Comment[uk]=Світла Breeze, автори — KDE VDG
+Comment[x-test]=xxBreeze Light by the KDE VDGxx
+Comment[zh_TW]=由 KDE VDG 製作的 Breeze Light
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -1,5 +1,13 @@
 [Desktop Entry]
 Comment=Breeze Dark by the KDE VDG
+Comment[ca]=Brisa fosca pel VDG del KDE
+Comment[gl]=Breeze escuro de KDE VDG
+Comment[nl]=Breeze Dark door de KDE VDG
+Comment[pt]=Brisa Escuro da VDG do KDE
+Comment[sv]=Breeze mörk av KDE:s visuella designgrupp
+Comment[uk]=Темна Breeze, автори — KDE VDG
+Comment[x-test]=xxBreeze Dark by the KDE VDGxx
+Comment[zh_TW]=由 KDE VDG 製作的 Breeze Dark
 Name=Breeze Dark
 Name[ar]=نسيم داكن
 Name[bs]=Breeze tamna