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 · 03a210fd5e
parent 8bfe474ac5
commit 03a210fd5e
5 changed files with 10 additions and 0 deletions
--- a/cursors/Breeze/Breeze/index.theme
+++ b/cursors/Breeze/Breeze/index.theme
@ -45,6 +45,8 @@ Name[zh_CN]=微风
 Name[zh_TW]=Breeze
 Comment=Breeze by the KDE VDG
 Comment[ca]=Brisa pel VDG del KDE
+Comment[ca@valencia]=Brisa pel VDG del KDE
+Comment[de]=Breeze von der KDE VDG
 Comment[es]=Brisa por KDE VDG
 Comment[fi]=Breeze KDE VDG:ltä
 Comment[gl]=Breeze de KDE VDG
--- a/cursors/Breeze/src/index.theme
+++ b/cursors/Breeze/src/index.theme
@ -45,6 +45,8 @@ Name[zh_CN]=微风
 Name[zh_TW]=Breeze
 Comment=Breeze by the KDE VDG
 Comment[ca]=Brisa pel VDG del KDE
+Comment[ca@valencia]=Brisa pel VDG del KDE
+Comment[de]=Breeze von der KDE VDG
 Comment[es]=Brisa por KDE VDG
 Comment[fi]=Breeze KDE VDG:ltä
 Comment[gl]=Breeze de KDE VDG
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@ -24,6 +24,8 @@ Name[zh_CN]=亮色微风
 Name[zh_TW]=Breeze Light
 Comment=Breeze Light by the KDE VDG
 Comment[ca]=Brisa clara pel VDG del KDE
+Comment[ca@valencia]=Brisa clara pel VDG del KDE
+Comment[de]=Breeze-Hell von der KDE VDG
 Comment[es]=Brisa claro por KDE VDG
 Comment[fi]=Breeze Light KDE VDG:ltä
 Comment[gl]=Breeze claro de KDE VDG
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@ -24,6 +24,8 @@ Name[zh_CN]=亮色微风
 Name[zh_TW]=Breeze Light
 Comment=Breeze Light by the KDE VDG
 Comment[ca]=Brisa clara pel VDG del KDE
+Comment[ca@valencia]=Brisa clara pel VDG del KDE
+Comment[de]=Breeze-Hell von der KDE VDG
 Comment[es]=Brisa claro por KDE VDG
 Comment[fi]=Breeze Light KDE VDG:ltä
 Comment[gl]=Breeze claro de KDE VDG
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -1,6 +1,8 @@
 [Desktop Entry]
 Comment=Breeze Dark by the KDE VDG
 Comment[ca]=Brisa fosca pel VDG del KDE
+Comment[ca@valencia]=Brisa fosca pel VDG del KDE
+Comment[de]=Breeze-Dunkel von der KDE VDG
 Comment[es]=Brisa oscuro por KDE VDG
 Comment[fi]=Breeze Dark KDE VDG:ltä
 Comment[gl]=Breeze escuro de KDE VDG