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"
2023-01-01 04:25:39 +00:00 · 2023-01-01 04:25:39 +00:00 · 1e0962d0b9
commit 1e0962d0b9
parent aba7b74316
25 changed files with 28 additions and 28 deletions
--- a/plugins/battery/kdeconnect_battery.json
+++ b/plugins/battery/kdeconnect_battery.json
@ -4,7 +4,7 @@
            {
                "Email": "albertvaka@gmail.com",
                "Name": "Albert Vaca",
-                "Name[ar]": "Albert Vaca",
+                "Name[ar]": "ألبرت فاكا",
                "Name[az]": "Albert Vaca",
                "Name[bg]": "Albert Vaca",
                "Name[ca@valencia]": "Albert Vaca",
--- a/plugins/bigscreen/kdeconnect_bigscreen.json
+++ b/plugins/bigscreen/kdeconnect_bigscreen.json
@ -4,7 +4,7 @@
            {
                "Email": "aix.m@outlook.com",
                "Name": "Aditya Mehra",
-                "Name[ar]": "Aditya Mehra",
+                "Name[ar]": "أديتيا ميهرا",
                "Name[az]": "Aditya Mehra",
                "Name[bg]": "Aditya Mehra",
                "Name[ca@valencia]": "Aditya Mehra",
--- a/plugins/clipboard/kdeconnect_clipboard.json
+++ b/plugins/clipboard/kdeconnect_clipboard.json
@ -4,7 +4,7 @@
            {
                "Email": "albertvaka@gmail.com",
                "Name": "Albert Vaca",
-                "Name[ar]": "Albert Vaca",
+                "Name[ar]": "ألبرت فاكا",
                "Name[az]": "Albert Vaca",
                "Name[bg]": "Albert Vaca",
                "Name[ca@valencia]": "Albert Vaca",
--- a/plugins/connectivity-report/kdeconnect_connectivity_report.json
+++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json
@ -4,7 +4,7 @@
            {
                "Email": "david.shlemayev@gmail.com",
                "Name": "David Shlemayev",
-                "Name[ar]": "David Shlemayev",
+                "Name[ar]": "ديفيد شلماييف",
                "Name[az]": "David Shlemayev",
                "Name[bg]": "David Shlemayev",
                "Name[ca@valencia]": "David Shlemayev",
--- a/plugins/contacts/kdeconnect_contacts.json
+++ b/plugins/contacts/kdeconnect_contacts.json
@ -5,7 +5,7 @@
            {
                "Email": "simon@ergotech.com",
                "Name": "Simon Redman",
-                "Name[ar]": "Simon Redman",
+                "Name[ar]": "سيمون ريدمان",
                "Name[az]": "Simon Redman",
                "Name[bg]": "Simon Redman",
                "Name[ca@valencia]": "Simon Redman",
--- a/plugins/findmyphone/kdeconnect_findmyphone.json
+++ b/plugins/findmyphone/kdeconnect_findmyphone.json
@ -51,7 +51,7 @@
            {
                "Email": "davidedmundson@kde.org",
                "Name": "David Edmundson",
-                "Name[ar]": "David Edmundson",
+                "Name[ar]": "ديفيد إدموندسون",
                "Name[az]": "David Edmundson",
                "Name[bg]": "David Edmundson",
                "Name[ca@valencia]": "David Edmundson",
--- a/plugins/findthisdevice/kdeconnect_findthisdevice.json
+++ b/plugins/findthisdevice/kdeconnect_findthisdevice.json
@ -4,7 +4,7 @@
            {
                "Email": "kossebau@kde.org",
                "Name": "Friedrich W. H. Kossebau",
-                "Name[ar]": "Friedrich W. H. Kossebau",
+                "Name[ar]": "فريدريش دبليو اتش كوسباو",
                "Name[az]": "Friedrich W. H. Kossebau",
                "Name[bg]": "Friedrich W. H. Kossebau",
                "Name[ca@valencia]": "Friedrich W. H. Kossebau",
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@ -4,7 +4,7 @@
            {
                "Email": "aleixpol@kde.org",
                "Name": "Aleix Pol",
-                "Name[ar]": "Aleix Pol",
+                "Name[ar]": "ألكس بول",
                "Name[az]": "Aleix Pol",
                "Name[bg]": "Aleix Pol",
                "Name[ca@valencia]": "Aleix Pol",
--- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
+++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
@ -4,7 +4,7 @@
            {
                "Email": "albertvaka@gmail.com",
                "Name": "Albert Vaca",
-                "Name[ar]": "Albert Vaca",
+                "Name[ar]": "ألبرت فاكا",
                "Name[az]": "Albert Vaca",
                "Name[bg]": "Albert Vaca",
                "Name[ca@valencia]": "Albert Vaca",
--- a/plugins/mprisremote/kdeconnect_mprisremote.json
+++ b/plugins/mprisremote/kdeconnect_mprisremote.json
@ -4,7 +4,7 @@
            {
                "Email": "aleixpol@kde.org",
                "Name": "Aleix Pol",
-                "Name[ar]": "Aleix Pol",
+                "Name[ar]": "ألكس بول",
                "Name[az]": "Aleix Pol",
                "Name[bg]": "Aleix Pol",
                "Name[ca@valencia]": "Aleix Pol",
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@ -4,7 +4,7 @@
            {
                "Email": "albertvaka@gmail.com",
                "Name": "Albert Vaca",
-                "Name[ar]": "Albert Vaca",
+                "Name[ar]": "ألبرت فاكا",
                "Name[az]": "Albert Vaca",
                "Name[bg]": "Albert Vaca",
                "Name[ca@valencia]": "Albert Vaca",
--- a/plugins/pausemusic/kdeconnect_pausemusic.json
+++ b/plugins/pausemusic/kdeconnect_pausemusic.json
@ -4,7 +4,7 @@
            {
                "Email": "albertvaka@gmail.com",
                "Name": "Albert Vaca",
-                "Name[ar]": "Albert Vaca",
+                "Name[ar]": "ألبرت فاكا",
                "Name[az]": "Albert Vaca",
                "Name[bg]": "Albert Vaca",
                "Name[ca@valencia]": "Albert Vaca",
@ -88,7 +88,7 @@
        "Description[sr@latin]": "Pauzira muziku ili video tokom telefonskog poziva",
        "Description[sr]": "Паузира музику или видео током телефонског позива",
        "Description[sv]": "Pausa musik eller videor under ett telefonsamtal",
-        "Description[tr]": "Bir telefon çağrısı sırasında müzik/videoları duraklat",
+        "Description[tr]": "Arama sırasında müzikleri/videoları duraklat",
        "Description[uk]": "Призупинка відтворення музики і відео на час телефонних дзвінків",
        "Description[x-test]": "xxPause music/videos during a phone callxx",
        "Description[zh_CN]": "手机来电时暂停音乐/视频",
@ -137,7 +137,7 @@
        "Name[sr@latin]": "Pauziranje medija tokom poziva",
        "Name[sr]": "Паузирање медија током позива",
        "Name[sv]": "Pausa media under samtal",
-        "Name[tr]": "Çağrılar sırasında ortamı duraklat",
+        "Name[tr]": "Aramalar sırasında ortamı duraklat",
        "Name[uk]": "Призупинка відтворення під час дзвінків",
        "Name[x-test]": "xxPause media during callsxx",
        "Name[zh_CN]": "来电时暂停媒体",
--- a/plugins/photo/kdeconnect_photo.json
+++ b/plugins/photo/kdeconnect_photo.json
@ -4,7 +4,7 @@
            {
                "Email": "nicolas.fella@gmx.de",
                "Name": "Nicolas Fella",
-                "Name[ar]": "Nicolas Fella",
+                "Name[ar]": "نيكولاس فلا",
                "Name[az]": "Nicolas Fella",
                "Name[bg]": "Nicolas Fella",
                "Name[ca@valencia]": "Nicolas Fella",
--- a/plugins/ping/kdeconnect_ping.json
+++ b/plugins/ping/kdeconnect_ping.json
@ -4,7 +4,7 @@
            {
                "Email": "albertvaka@gmail.com",
                "Name": "Albert Vaca",
-                "Name[ar]": "Albert Vaca",
+                "Name[ar]": "ألبرت فاكا",
                "Name[az]": "Albert Vaca",
                "Name[bg]": "Albert Vaca",
                "Name[ca@valencia]": "Albert Vaca",
--- a/plugins/presenter/kdeconnect_presenter.json
+++ b/plugins/presenter/kdeconnect_presenter.json
@ -4,7 +4,7 @@
            {
                "Email": "aleixpol@kde.org",
                "Name": "Aleix Pol",
-                "Name[ar]": "Aleix Pol",
+                "Name[ar]": "ألكس بول",
                "Name[az]": "Aleix Pol",
                "Name[bg]": "Aleix Pol",
                "Name[ca@valencia]": "Aleix Pol",
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@ -4,7 +4,7 @@
            {
                "Email": "aleixpol@kde.org",
                "Name": "Aleix Pol",
-                "Name[ar]": "Aleix Pol",
+                "Name[ar]": "ألكس بول",
                "Name[az]": "Aleix Pol",
                "Name[bg]": "Aleix Pol",
                "Name[ca@valencia]": "Aleix Pol",
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@ -4,7 +4,7 @@
            {
                "Email": "aleixpol@kde.org",
                "Name": "Aleix Pol",
-                "Name[ar]": "Aleix Pol",
+                "Name[ar]": "ألكس بول",
                "Name[az]": "Aleix Pol",
                "Name[bg]": "Aleix Pol",
                "Name[ca@valencia]": "Aleix Pol",
--- a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json
+++ b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json
@ -4,7 +4,7 @@
            {
                "Email": "holger.k@elberer.de",
                "Name": "Holger Kaelberer",
-                "Name[ar]": "Holger Kaelberer",
+                "Name[ar]": "هولجر كيلبرر",
                "Name[az]": "Holger Kaelberer",
                "Name[bg]": "Holger Kaelberer",
                "Name[ca@valencia]": "Holger Kaelberer",
--- a/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json
+++ b/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json
@ -4,7 +4,7 @@
            {
                "Email": "nicolas.fella@gmx.de",
                "Name": "Nicolas Fella",
-                "Name[ar]": "Nicolas Fella",
+                "Name[ar]": "نيكولاس فلا",
                "Name[az]": "Nicolas Fella",
                "Name[bg]": "Nicolas Fella",
                "Name[ca@valencia]": "Nicolas Fella",
--- a/plugins/runcommand/kdeconnect_runcommand.json
+++ b/plugins/runcommand/kdeconnect_runcommand.json
@ -4,7 +4,7 @@
            {
                "Email": "albertvaka@gmail.com",
                "Name": "Albert Vaca",
-                "Name[ar]": "Albert Vaca",
+                "Name[ar]": "ألبرت فاكا",
                "Name[az]": "Albert Vaca",
                "Name[bg]": "Albert Vaca",
                "Name[ca@valencia]": "Albert Vaca",
@ -51,7 +51,7 @@
            {
                "Email": "david@davidedmundson.co.uk",
                "Name": "David Edmundson",
-                "Name[ar]": "David Edmundson",
+                "Name[ar]": "ديفيد إدموندسون",
                "Name[az]": "David Edmundson",
                "Name[bg]": "David Edmundson",
                "Name[ca@valencia]": "David Edmundson",
--- a/plugins/sftp/kdeconnect_sftp.json
+++ b/plugins/sftp/kdeconnect_sftp.json
@ -4,7 +4,7 @@
            {
                "Email": "kinnalru@gmail.com",
                "Name": "Samoilenko Yuri",
-                "Name[ar]": "Samoilenko Yuri",
+                "Name[ar]": "سامويلنكو يوري",
                "Name[az]": "Samoilenko Yuri",
                "Name[bg]": "Samoilenko Yuri",
                "Name[ca@valencia]": "Samoilenko Yuri",
--- a/plugins/share/kdeconnect_share.json
+++ b/plugins/share/kdeconnect_share.json
@ -4,7 +4,7 @@
            {
                "Email": "albertvaka@gmail.com",
                "Name": "Albert Vaca",
-                "Name[ar]": "Albert Vaca",
+                "Name[ar]": "ألبرت فاكا",
                "Name[az]": "Albert Vaca",
                "Name[bg]": "Albert Vaca",
                "Name[ca@valencia]": "Albert Vaca",
--- a/plugins/sms/kdeconnect_sms.json
+++ b/plugins/sms/kdeconnect_sms.json
@ -4,7 +4,7 @@
            {
                "Email": "simon@ergotech.com",
                "Name": "Simon Redman",
-                "Name[ar]": "Simon Redman",
+                "Name[ar]": "سيمون ريدمان",
                "Name[az]": "Simon Redman",
                "Name[bg]": "Simon Redman",
                "Name[ca@valencia]": "Simon Redman",
--- a/plugins/systemvolume/kdeconnect_systemvolume.json
+++ b/plugins/systemvolume/kdeconnect_systemvolume.json
@ -5,7 +5,7 @@
            {
                "Email": "nicolas.fella@gmx.de",
                "Name": "Nicolas Fella",
-                "Name[ar]": "Nicolas Fella",
+                "Name[ar]": "نيكولاس فلا",
                "Name[az]": "Nicolas Fella",
                "Name[bg]": "Nicolas Fella",
                "Name[ca@valencia]": "Nicolas Fella",
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@ -4,7 +4,7 @@
            {
                "Email": "albertvaka@gmail.com",
                "Name": "Albert Vaca",
-                "Name[ar]": "Albert Vaca",
+                "Name[ar]": "ألبرت فاكا",
                "Name[az]": "Albert Vaca",
                "Name[bg]": "Albert Vaca",
                "Name[ca@valencia]": "Albert Vaca",