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 · 9b685d4b18
parent f803a89e24
commit 9b685d4b18
5 changed files with 5 additions and 0 deletions
--- a/cursors/Breeze/Breeze/index.theme
+++ b/cursors/Breeze/Breeze/index.theme
@ -46,6 +46,7 @@ Name[zh_TW]=Breeze
 Comment=Breeze by the KDE VDG
 Comment[ca]=Brisa pel VDG del KDE
 Comment[ca@valencia]=Brisa per a VDG de KDE
+Comment[cs]=Breeze od KDE VDG
 Comment[da]=Breeze af KDE's visuelle designgruppe
 Comment[de]=Breeze von der KDE VDG
 Comment[en_GB]=Breeze by the KDE VDG
--- a/cursors/Breeze/src/index.theme
+++ b/cursors/Breeze/src/index.theme
@ -46,6 +46,7 @@ Name[zh_TW]=Breeze
 Comment=Breeze by the KDE VDG
 Comment[ca]=Brisa pel VDG del KDE
 Comment[ca@valencia]=Brisa per a VDG de KDE
+Comment[cs]=Breeze od KDE VDG
 Comment[da]=Breeze af KDE's visuelle designgruppe
 Comment[de]=Breeze von der KDE VDG
 Comment[en_GB]=Breeze by the KDE VDG
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@ -30,6 +30,7 @@ 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 per al VDG de KDE
+Comment[cs]=Breeze Light od KDE VDG
 Comment[da]=Breeze Light af KDE's visuelle designgruppe
 Comment[de]=Breeze-Hell von der KDE VDG
 Comment[en_GB]=Breeze Light by the KDE VDG
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@ -30,6 +30,7 @@ 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 per al VDG de KDE
+Comment[cs]=Breeze Light od KDE VDG
 Comment[da]=Breeze Light af KDE's visuelle designgruppe
 Comment[de]=Breeze-Hell von der KDE VDG
 Comment[en_GB]=Breeze Light by the KDE VDG
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -2,6 +2,7 @@
 Comment=Breeze Dark by the KDE VDG
 Comment[ca]=Brisa fosca pel VDG del KDE
 Comment[ca@valencia]=Brisa fosca per a VDG de KDE
+Comment[cs]=Breeze Dark od KDE VDG
 Comment[da]=Breeze Dark af KDE's visuelle designgruppe
 Comment[de]=Breeze-Dunkel von der KDE VDG
 Comment[en_GB]=Breeze Dark by the KDE VDG