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"
4 years ago · 54ffea94f7
parent 95e7d82f5b
commit 54ffea94f7
4 changed files with 4 additions and 0 deletions
--- a/cursors/Breeze/Breeze/index.theme
+++ b/cursors/Breeze/Breeze/index.theme
@ -42,6 +42,7 @@ Name[sr@ijekavian]=Поветарац
 Name[sr@ijekavianlatin]=Povetarac
 Name[sr@latin]=Povetarac
 Name[sv]=Breeze
+Name[ta]=பிரீஸ்
 Name[tg]=Насим
 Name[tr]=Esinti
 Name[uk]=Breeze
--- a/cursors/Breeze/src/index.theme
+++ b/cursors/Breeze/src/index.theme
@ -42,6 +42,7 @@ Name[sr@ijekavian]=Поветарац
 Name[sr@ijekavianlatin]=Povetarac
 Name[sr@latin]=Povetarac
 Name[sv]=Breeze
+Name[ta]=பிரீஸ்
 Name[tg]=Насим
 Name[tr]=Esinti
 Name[uk]=Breeze
--- a/kdecoration/breeze.json
+++ b/kdecoration/breeze.json
@ -90,6 +90,7 @@
        "Name[sr@latin]": "Povetarac",
        "Name[sr]": "Поветарац",
        "Name[sv]": "Breeze",
+        "Name[ta]": "பிரீஸ்",
        "Name[tg]": "Насим",
        "Name[tr]": "Esinti",
        "Name[uk]": "Breeze",
--- a/kstyle/breeze.themerc
+++ b/kstyle/breeze.themerc
@ -42,6 +42,7 @@ Name[sr@ijekavian]=Поветарац
 Name[sr@ijekavianlatin]=Povetarac
 Name[sr@latin]=Povetarac
 Name[sv]=Breeze
+Name[ta]=பிரீஸ்
 Name[tg]=Насим
 Name[tr]=Esinti
 Name[uk]=Breeze