From 1e0962d0b9af91f70b99deba127287f14e069d6a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 1 Jan 2023 04:25:39 +0000 Subject: [PATCH] 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" --- plugins/battery/kdeconnect_battery.json | 2 +- plugins/bigscreen/kdeconnect_bigscreen.json | 2 +- plugins/clipboard/kdeconnect_clipboard.json | 2 +- .../connectivity-report/kdeconnect_connectivity_report.json | 2 +- plugins/contacts/kdeconnect_contacts.json | 2 +- plugins/findmyphone/kdeconnect_findmyphone.json | 2 +- plugins/findthisdevice/kdeconnect_findthisdevice.json | 2 +- plugins/lockdevice/kdeconnect_lockdevice.json | 2 +- plugins/mpriscontrol/kdeconnect_mpriscontrol.json | 2 +- plugins/mprisremote/kdeconnect_mprisremote.json | 2 +- plugins/notifications/kdeconnect_notifications.json | 2 +- plugins/pausemusic/kdeconnect_pausemusic.json | 6 +++--- plugins/photo/kdeconnect_photo.json | 2 +- plugins/ping/kdeconnect_ping.json | 2 +- plugins/presenter/kdeconnect_presenter.json | 2 +- plugins/remotecommands/kdeconnect_remotecommands.json | 2 +- plugins/remotecontrol/kdeconnect_remotecontrol.json | 2 +- plugins/remotekeyboard/kdeconnect_remotekeyboard.json | 2 +- .../remotesystemvolume/kdeconnect_remotesystemvolume.json | 2 +- plugins/runcommand/kdeconnect_runcommand.json | 4 ++-- plugins/sftp/kdeconnect_sftp.json | 2 +- plugins/share/kdeconnect_share.json | 2 +- plugins/sms/kdeconnect_sms.json | 2 +- plugins/systemvolume/kdeconnect_systemvolume.json | 2 +- plugins/telephony/kdeconnect_telephony.json | 2 +- 25 files changed, 28 insertions(+), 28 deletions(-) diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json index aead773a2..2afc2d20e 100644 --- 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", diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index 1000aabf9..ceec74675 100644 --- 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", diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json index 057e6b03c..97983d293 100644 --- 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", diff --git a/plugins/connectivity-report/kdeconnect_connectivity_report.json b/plugins/connectivity-report/kdeconnect_connectivity_report.json index 965834797..8e2bf48b5 100644 --- 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", diff --git a/plugins/contacts/kdeconnect_contacts.json b/plugins/contacts/kdeconnect_contacts.json index 616ea26f3..d064f18b0 100644 --- 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", diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json index 72632bdb2..a09ef824c 100644 --- 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", diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice.json b/plugins/findthisdevice/kdeconnect_findthisdevice.json index 5a77fae5f..45e6de19d 100644 --- 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", diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json index 19f88c726..100fee37e 100644 --- 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", diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json index 4ff77874f..3aa41cc73 100644 --- 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", diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json index 3777e9e16..edf0325d0 100644 --- 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", diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index f2bbbc764..062db85bc 100644 --- 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", diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json index 58f3292f0..906de38e2 100644 --- 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]": "来电时暂停媒体", diff --git a/plugins/photo/kdeconnect_photo.json b/plugins/photo/kdeconnect_photo.json index 0f876bdb5..0e4eb14b8 100644 --- 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", diff --git a/plugins/ping/kdeconnect_ping.json b/plugins/ping/kdeconnect_ping.json index 19439240b..36cb55706 100644 --- 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", diff --git a/plugins/presenter/kdeconnect_presenter.json b/plugins/presenter/kdeconnect_presenter.json index bcb7b7450..e6c6cefa3 100644 --- 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", diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index bce94f0ba..5bcca7b02 100644 --- 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", diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json index d6c3dea75..790724e10 100644 --- 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", diff --git a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json index 472982321..b98af4fe2 100644 --- 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", diff --git a/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json b/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json index 4f8fc86b4..a7c8a24cd 100644 --- 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", diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json index efe81772a..6c92c75bd 100644 --- 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", diff --git a/plugins/sftp/kdeconnect_sftp.json b/plugins/sftp/kdeconnect_sftp.json index 2598bc514..8563bee9b 100644 --- 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", diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json index 3b91f2081..e3cc816b4 100644 --- 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", diff --git a/plugins/sms/kdeconnect_sms.json b/plugins/sms/kdeconnect_sms.json index 9433f8b71..e5ac04157 100644 --- 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", diff --git a/plugins/systemvolume/kdeconnect_systemvolume.json b/plugins/systemvolume/kdeconnect_systemvolume.json index 79bd44695..84d553781 100644 --- 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", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 5d97f14d3..0ef81d411 100644 --- 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",