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 · 8e609daaca
parent 766d220d96
commit 8e609daaca
29 changed files with 30 additions and 0 deletions
--- a/applets/devicenotifier/package/metadata.json
+++ b/applets/devicenotifier/package/metadata.json
@ -31,6 +31,7 @@
                "Name[sk]": "Viranch Mehta, Jacopo De Simoi",
                "Name[sl]": "Viranch Mehta, Jacopo De Simoi",
                "Name[sv]": "Viranch Mehta",
+                "Name[ta]": "விராஞ்சு மேத்தா, ஜாக்கோப்போ டீ சிமோயி",
                "Name[tr]": "Viranch Mehta, Jacopo De Simoi",
                "Name[uk]": "Viranch Mehta, Jacopo De Simoi",
                "Name[vi]": "Viranch Mehta, Jacopo De Simoi",
--- a/applets/digital-clock/package/metadata.json
+++ b/applets/digital-clock/package/metadata.json
@ -31,6 +31,7 @@
                "Name[sk]": "Martin Klapetek",
                "Name[sl]": "Martin Klapetek",
                "Name[sv]": "Martin Klapetek",
+                "Name[ta]": "மார்ட்டின் கிலேப்பெட்டெக்",
                "Name[tr]": "Martin Klapetek",
                "Name[uk]": "Martin Klapetek",
                "Name[vi]": "Martin Klapetek",
--- a/applets/lock_logout/metadata.json
+++ b/applets/lock_logout/metadata.json
@ -32,6 +32,7 @@
                "Name[sk]": "Viranch Mehta",
                "Name[sl]": "Viranch Mehta",
                "Name[sv]": "Viranch Mehta",
+                "Name[ta]": "விராஞ்சு மேத்தா",
                "Name[tr]": "Viranch Mehta",
                "Name[uk]": "Viranch Mehta",
                "Name[vi]": "Viranch Mehta",
--- a/applets/manage-inputmethod/metadata.json
+++ b/applets/manage-inputmethod/metadata.json
@ -32,6 +32,7 @@
                "Name[sk]": "Aleix Pol Gonzalez",
                "Name[sl]": "Aleix Pol Gonzalez",
                "Name[sv]": "Aleix Pol Gonzalez",
+                "Name[ta]": "அலேயிக்சு போல் கொன்ஸாலெசு",
                "Name[tr]": "Aleix Pol Gonzalez",
                "Name[uk]": "Aleix Pol Gonzalez",
                "Name[vi]": "Aleix Pol Gonzalez",
--- a/containmentactions/applauncher/plasma-containmentactions-applauncher.json
+++ b/containmentactions/applauncher/plasma-containmentactions-applauncher.json
@ -31,6 +31,7 @@
                "Name[sk]": "Chani",
                "Name[sl]": "Chani",
                "Name[sv]": "Chani",
+                "Name[ta]": "இச்சானி",
                "Name[tr]": "Chani",
                "Name[uk]": "Chani",
                "Name[vi]": "Chani",
--- a/containmentactions/contextmenu/plasma-containmentactions-contextmenu.json
+++ b/containmentactions/contextmenu/plasma-containmentactions-contextmenu.json
@ -31,6 +31,7 @@
                "Name[sk]": "Chani",
                "Name[sl]": "Chani",
                "Name[sv]": "Chani",
+                "Name[ta]": "இச்சானி",
                "Name[tr]": "Chani",
                "Name[uk]": "Chani",
                "Name[vi]": "Chani",
--- a/containmentactions/paste/plasma-containmentactions-paste.json
+++ b/containmentactions/paste/plasma-containmentactions-paste.json
@ -31,6 +31,7 @@
                "Name[sk]": "Chani",
                "Name[sl]": "Chani",
                "Name[sv]": "Chani",
+                "Name[ta]": "இச்சானி",
                "Name[tr]": "Chani",
                "Name[uk]": "Chani",
                "Name[vi]": "Chani",
--- a/containmentactions/switchactivity/plasma-containmentactions-switchactivity.json
+++ b/containmentactions/switchactivity/plasma-containmentactions-switchactivity.json
@ -31,6 +31,7 @@
                "Name[sk]": "Chani",
                "Name[sl]": "Chani",
                "Name[sv]": "Chani",
+                "Name[ta]": "இச்சானி",
                "Name[tr]": "Chani",
                "Name[uk]": "Chani",
                "Name[vi]": "Chani",
--- a/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.json
+++ b/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.json
@ -31,6 +31,7 @@
                "Name[sk]": "Chani",
                "Name[sl]": "Chani",
                "Name[sv]": "Chani",
+                "Name[ta]": "இச்சானி",
                "Name[tr]": "Chani",
                "Name[uk]": "Chani",
                "Name[vi]": "Chani",
--- a/containmentactions/switchwindow/plasma-containmentactions-switchwindow.json
+++ b/containmentactions/switchwindow/plasma-containmentactions-switchwindow.json
@ -31,6 +31,7 @@
                "Name[sk]": "Chani",
                "Name[sl]": "Chani",
                "Name[sv]": "Chani",
+                "Name[ta]": "இச்சானி",
                "Name[tr]": "Chani",
                "Name[uk]": "Chani",
                "Name[vi]": "Chani",
--- a/dataengines/activities/plasma-dataengine-activities.json
+++ b/dataengines/activities/plasma-dataengine-activities.json
@ -31,6 +31,7 @@
                "Name[sk]": "Chani Armitage",
                "Name[sl]": "Chani Armitage",
                "Name[sv]": "Chani Armitage",
+                "Name[ta]": "இச்சானி ஆர்மிட்டேஜ்",
                "Name[tr]": "Chani Armitage",
                "Name[uk]": "Chani Armitage",
                "Name[vi]": "Chani Armitage",
--- a/dataengines/apps/plasma-dataengine-apps.json
+++ b/dataengines/apps/plasma-dataengine-apps.json
@ -31,6 +31,7 @@
                "Name[sk]": "Chani",
                "Name[sl]": "Chani",
                "Name[sv]": "Chani",
+                "Name[ta]": "இச்சானி",
                "Name[tr]": "Chani",
                "Name[uk]": "Chani",
                "Name[vi]": "Chani",
--- a/dataengines/devicenotifications/plasma-dataengine-devicenotifications.json
+++ b/dataengines/devicenotifications/plasma-dataengine-devicenotifications.json
@ -31,6 +31,7 @@
                "Name[sk]": "Jacopo De Simoi",
                "Name[sl]": "Jacopo De Simoi",
                "Name[sv]": "Jacopo De Simoi",
+                "Name[ta]": "ஜாக்கோப்போ டீ சிமோயி",
                "Name[tr]": "Jacopo De Simoi",
                "Name[uk]": "Jacopo De Simoi",
                "Name[vi]": "Jacopo De Simoi",
--- a/dataengines/geolocation/plasma-dataengine-geolocation.json
+++ b/dataengines/geolocation/plasma-dataengine-geolocation.json
@ -31,6 +31,7 @@
                "Name[sk]": "Petri Damstén",
                "Name[sl]": "Petri Damstén",
                "Name[sv]": "Petri Damstén",
+                "Name[ta]": "பெட்ரி டாம்ஸ்டென்",
                "Name[tr]": "Petri Damstén",
                "Name[uk]": "Petri Damstén",
                "Name[vi]": "Petri Damstén",
--- a/dataengines/keystate/plasma-dataengine-keystate.json
+++ b/dataengines/keystate/plasma-dataengine-keystate.json
@ -31,6 +31,7 @@
                "Name[sk]": "Aaron Seigo",
                "Name[sl]": "Aaron Seigo",
                "Name[sv]": "Aaron Seigo",
+                "Name[ta]": "ஆரோன் சீகோ",
                "Name[tr]": "Aaron Seigo",
                "Name[uk]": "Aaron Seigo",
                "Name[vi]": "Aaron Seigo",
--- a/dataengines/packagekit/plasma-dataengine-packagekit.json
+++ b/dataengines/packagekit/plasma-dataengine-packagekit.json
@ -31,6 +31,7 @@
                "Name[sk]": "Gregor Taetzner",
                "Name[sl]": "Gregor Taetzner",
                "Name[sv]": "Gregor Taetzner",
+                "Name[ta]": "கிரெகோர் டாட்ஸ்னர்",
                "Name[tr]": "Gregor Taetzner",
                "Name[uk]": "Gregor Taetzner",
                "Name[vi]": "Gregor Taetzner",
--- a/dataengines/places/plasma-dataengine-places.json
+++ b/dataengines/places/plasma-dataengine-places.json
@ -31,6 +31,7 @@
                "Name[sk]": "Alex Merry",
                "Name[sl]": "Alex Merry",
                "Name[sv]": "Alex Merry",
+                "Name[ta]": "அலெக்ஸ் மெரி",
                "Name[tr]": "Alex Merry",
                "Name[uk]": "Alex Merry",
                "Name[vi]": "Alex Merry",
--- a/dataengines/statusnotifieritem/plasma-dataengine-statusnotifieritem.json
+++ b/dataengines/statusnotifieritem/plasma-dataengine-statusnotifieritem.json
@ -31,6 +31,7 @@
                "Name[sk]": "Matthieu Gallien",
                "Name[sl]": "Matthieu Gallien",
                "Name[sv]": "Matthieu Gallien",
+                "Name[ta]": "மேத்தியூ கேல்லியென்",
                "Name[tr]": "Matthieu Gallien",
                "Name[uk]": "Matthieu Gallien",
                "Name[vi]": "Matthieu Gallien",
--- a/dataengines/time/plasma-dataengine-time.json
+++ b/dataengines/time/plasma-dataengine-time.json
@ -31,6 +31,7 @@
                "Name[sk]": "Aaron Seigo",
                "Name[sl]": "Aaron Seigo",
                "Name[sv]": "Aaron Seigo",
+                "Name[ta]": "ஆரோன் சீகோ",
                "Name[tr]": "Aaron Seigo",
                "Name[uk]": "Aaron Seigo",
                "Name[vi]": "Aaron Seigo",
--- a/dataengines/weather/ions/wetter.com/ion-wettercom.json
+++ b/dataengines/weather/ions/wetter.com/ion-wettercom.json
@ -29,6 +29,7 @@
        "Description[sk]": "Predpoveď počasia z wetter.com",
        "Description[sl]": "Vremenska napoved iz wetter.com",
        "Description[sv]": "Väderprognos av wetter.com",
+        "Description[ta]": "wetter.com-இன் வானிலை அறிக்கை",
        "Description[tr]": "wetter.com'dan hava tahmini",
        "Description[uk]": "Прогноз погоди з wetter.com",
        "Description[vi]": "Dự báo thời tiết của wetter.com",
--- a/dataengines/weather/plasma-dataengine-weather.json
+++ b/dataengines/weather/plasma-dataengine-weather.json
@ -31,6 +31,7 @@
                "Name[sk]": "Shawn Starr",
                "Name[sl]": "Shawn Starr",
                "Name[sv]": "Shawn Starr",
+                "Name[ta]": "ஷான் சுடார்",
                "Name[tr]": "Shawn Starr",
                "Name[uk]": "Shawn Starr",
                "Name[vi]": "Shawn Starr",
@ -68,6 +69,7 @@
        "Description[sk]": "Dáta o počasí z rôznych online zdrojov",
        "Description[sl]": "Podatki o vremenu iz več spletnih virov",
        "Description[sv]": "Väderdata från flera olika nättjänster",
+        "Description[ta]": "பல இணையதளங்களிலிருந்து வானிலை அறிக்கைகள்",
        "Description[tr]": "Birden fazla çevrimiçi kaynaktan hava durumu verisi",
        "Description[uk]": "Дані щодо погоди з декількох мережевих джерел",
        "Description[vi]": "Dữ liệu thời tiết từ nhiều nguồn trực tuyến",
--- a/plasmacalendarintegration/holidayeventsplugin.json
+++ b/plasmacalendarintegration/holidayeventsplugin.json
@ -31,6 +31,7 @@
                "Name[sk]": "Martin Klapetek",
                "Name[sl]": "Martin Klapetek",
                "Name[sv]": "Martin Klapetek",
+                "Name[ta]": "மார்ட்டின் கிலேப்பெட்டெக்",
                "Name[tr]": "Martin Klapetek",
                "Name[uk]": "Martin Klapetek",
                "Name[vi]": "Martin Klapetek",
--- a/runners/appstream/plasma-runner-appstream.json
+++ b/runners/appstream/plasma-runner-appstream.json
@ -32,6 +32,7 @@
                "Name[sk]": "Aleix Pol Gonzalez",
                "Name[sl]": "Aleix Pol Gonzalez",
                "Name[sv]": "Aleix Pol Gonzalez",
+                "Name[ta]": "அலேயிக்சு போல் கொன்ஸாலெசு",
                "Name[tr]": "Aleix Pol Gonzalez",
                "Name[uk]": "Aleix Pol Gonzalez",
                "Name[vi]": "Aleix Pol Gonzalez",
--- a/runners/bookmarks/plasma-runner-bookmarks.json
+++ b/runners/bookmarks/plasma-runner-bookmarks.json
@ -31,6 +31,7 @@
                "Name[sk]": "Glenn Ergeerts, Marco Gulino",
                "Name[sl]": "Glenn Ergeerts, Marco Gulino",
                "Name[sv]": "Glenn Ergeerts, Marco Gulino",
+                "Name[ta]": "கிலென் எர்கீர்டுஸ், மார்க்கோ குலீனோ",
                "Name[tr]": "Glenn Ergeerts, Marco Gulino",
                "Name[uk]": "Glenn Ergeerts, Marco Gulino",
                "Name[vi]": "Glenn Ergeerts, Marco Gulino",
--- a/runners/helprunner/helprunner.json
+++ b/runners/helprunner/helprunner.json
@ -30,6 +30,7 @@
                "Name[sk]": "Alexander Lohnau",
                "Name[sl]": "Alexander Lohnau",
                "Name[sv]": "Alexander Lohnau",
+                "Name[ta]": "அலெக்சாண்டர் லொனாவ்",
                "Name[tr]": "Alexander Lohnau",
                "Name[uk]": "Alexander Lohnau",
                "Name[vi]": "Alexander Lohnau",
--- a/runners/kill/plasma-runner-kill.json
+++ b/runners/kill/plasma-runner-kill.json
@ -31,6 +31,7 @@
                "Name[sk]": "Jan Gerrit Marker",
                "Name[sl]": "Jan Gerrit Marker",
                "Name[sv]": "Jan Gerrit Marker",
+                "Name[ta]": "ஜான் கெரிட் மார்க்கர்",
                "Name[tr]": "Jan Gerrit Marker",
                "Name[uk]": "Jan Gerrit Marker",
                "Name[vi]": "Jan Gerrit Marker",
--- a/runners/powerdevil/plasma-runner-powerdevil.json
+++ b/runners/powerdevil/plasma-runner-powerdevil.json
@ -31,6 +31,7 @@
                "Name[sk]": "Dario Freddi",
                "Name[sl]": "Dario Freddi",
                "Name[sv]": "Dario Freddi",
+                "Name[ta]": "டாரியோ ஃபிரெடி",
                "Name[tr]": "Dario Freddi",
                "Name[uk]": "Dario Freddi",
                "Name[vi]": "Dario Freddi",
--- a/runners/webshortcuts/plasma-runner-webshortcuts.json
+++ b/runners/webshortcuts/plasma-runner-webshortcuts.json
@ -31,6 +31,7 @@
                "Name[sk]": "Teemu Rytilahti",
                "Name[sl]": "Teemu Rytilahti",
                "Name[sv]": "Teemu Rytilahti",
+                "Name[ta]": "டீமு ரிட்டிலாட்டி",
                "Name[tr]": "Teemu Rytilahti",
                "Name[uk]": "Teemu Rytilahti",
                "Name[vi]": "Teemu Rytilahti",
--- a/shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.json
+++ b/shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.json
@ -32,6 +32,7 @@
                "Name[sk]": "Aaron Seigo",
                "Name[sl]": "Aaron Seigo",
                "Name[sv]": "Aaron Seigo",
+                "Name[ta]": "ஆரோன் சீகோ",
                "Name[tr]": "Aaron Seigo",
                "Name[uk]": "Aaron Seigo",
                "Name[vi]": "Aaron Seigo",