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 · 6e96fe4f5a
parent 9f46232368
commit 6e96fe4f5a
5 changed files with 6 additions and 0 deletions
--- a/kcms/colors/accentColorService/accentColorService.json
+++ b/kcms/colors/accentColorService/accentColorService.json
@ -53,6 +53,7 @@
        "Name[sk]": "accentColorService",
        "Name[sl]": "accentColorService",
        "Name[sv]": "Accentfärgtjänst",
+        "Name[ta]": "சிறப்புநிறச்சேவை",
        "Name[tr]": "accentColorService",
        "Name[uk]": "accentColorService",
        "Name[vi]": "accentColorService",
--- a/libcolorcorrect/kded/colorcorrectlocationupdater.json
+++ b/libcolorcorrect/kded/colorcorrectlocationupdater.json
@ -75,6 +75,7 @@
        "Name[sr@latin]": "Ažuriranje geografske lokacije za popravku boje",
        "Name[sr]": "Ажурирање географске локације за поправку боје",
        "Name[sv]": "Färgriktig uppdatering av geografisk plats",
+        "Name[ta]": "ColorCorrect புவியிருப்பிட புதுப்பிப்பி",
        "Name[tr]": "ColorCorrect Coğrafi Konum Güncelleyici",
        "Name[uk]": "Засіб оновлення географічного розташування для ColorCorrect",
        "Name[vi]": "Trình cập nhật định vị địa lí ColorCorrect",
--- a/lookandfeel.dark/metadata.json
+++ b/lookandfeel.dark/metadata.json
@ -114,6 +114,7 @@
        "Name[sk]": "Vánok Tmavý",
        "Name[sl]": "Sapica temna",
        "Name[sv]": "Breeze mörk",
+        "Name[ta]": "கருப்பு பிரீஸ்",
        "Name[tg]": "Насими торик",
        "Name[tr]": "Esinti Koyu",
        "Name[uk]": "Темна Breeze",
--- a/lookandfeel/metadata.json
+++ b/lookandfeel/metadata.json
@ -128,6 +128,7 @@
        "Name[sr@latin]": "Povetarac",
        "Name[sr]": "Поветарац",
        "Name[sv]": "Breeze",
+        "Name[ta]": "பிரீஸ்",
        "Name[tg]": "Насим",
        "Name[tr]": "Esinti",
        "Name[uk]": "Breeze",
--- a/sddm-theme/metadata.desktop
+++ b/sddm-theme/metadata.desktop
@ -46,6 +46,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
@ -90,6 +91,7 @@ Description[ru]=Breeze
 Description[sk]=Vánok
 Description[sl]=Sapica
 Description[sv]=Breeze
+Description[ta]=பிரீஸ்
 Description[tg]=Насим
 Description[tr]=Esinti
 Description[uk]=Breeze