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"
This commit is contained in:
l10n daemon script 2023-01-01 02:14:13 +00:00
parent dae358cee0
commit 3ee29af814
27 changed files with 56 additions and 29 deletions

View file

@ -2,8 +2,25 @@
"Categories": "Qt;KDE;X-KDE-settings-kdeconnect;",
"KPlugin": {
"Description": "Connect and sync your devices",
"Description[ar]": "اتّصل وزامن أجهزتك",
"Description[ca]": "Connecta i sincronitza els vostres dispositius",
"Description[en_GB]": "Connect and sync your devices",
"Description[eu]": "Zure gailuak konektatu eta sinkronizatzea",
"Description[nl]": "Uw apparaten verbinden en synchroniseren",
"Description[tr]": "Aygıtlarını bağla ve eşzamanla",
"Description[uk]": "З'єднання і синхронізація ваших пристроїв",
"Description[x-test]": "xxConnect and sync your devicesxx",
"Icon": "preferences-kde-connect",
"Name": "KDE Connect"
"Name": "KDE Connect",
"Name[ar]": "كدي المتّصل",
"Name[ca]": "KDE Connect",
"Name[en_GB]": "KDE Connect",
"Name[es]": "KDE Connect",
"Name[eu]": "KDE Connect",
"Name[nl]": "KDE Connect",
"Name[tr]": "KDE Connect",
"Name[uk]": "KDE Connect",
"Name[x-test]": "xxKDE Connectxx"
},
"X-DocPath": "kdeconnect/index.html",
"X-KDE-Keywords": "network,kde connect,connect,phone,sync,mobile,android,ios,send files,share files,transfer files,receive files,devices,device,synchronization,calls,telephone,smartphone,contacts,sms,phone notifications,control volume,system volume,ringtone,play sound,presentation,take picture,take photo,shared clipboard,conectivity monitor,remote input,remote mouse,remote keyboard,mpris,phone integration,commands,lock device,multimedia control,sftp,browse phone,share",

View file

@ -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",

View file

@ -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",

View file

@ -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",

View file

@ -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",

View file

@ -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",

View file

@ -52,7 +52,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",

View file

@ -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",

View file

@ -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",

View file

@ -4,8 +4,13 @@
{
"Email": "bhyoram@protonmail.com",
"Name": "Yoram Bar-Haim",
"Name[ar]": "يورام بار-هايم",
"Name[ca@valencia]": "Yoram Bar-Haim",
"Name[ca]": "Yoram Bar-Haim",
"Name[en_GB]": "Yoram Bar-Haim",
"Name[es]": "Yoram Bar-Haim",
"Name[eu]": "Yoram Bar-Haim",
"Name[fr]": "Yoram Bar-Haim",
"Name[ka]": "Yoram Bar-Haim",
"Name[nl]": "Yoram Bar-Haim",
"Name[pl]": "Yoram Bar-Haim",
@ -61,8 +66,13 @@
"Id": "kdeconnect_mmtelephony",
"License": "GPL",
"Name": "ModemManager Telephony integration",
"Name[ar]": "تكامل هاتف ModemManager",
"Name[ca@valencia]": "Integració amb la telefonia de ModemManager",
"Name[ca]": "Integració amb la telefonia del ModemManager",
"Name[en_GB]": "ModemManager Telephony integration",
"Name[es]": "Integración con el teléfono ModemManager",
"Name[eu]": "«ModemManager» telefonia bateratzea",
"Name[fr]": "Intégration de la téléphonie avec ModemManager ",
"Name[ka]": "ModemManager -ის ტელეფონის ინტეგრაცია",
"Name[nl]": "Modembeheerder telefoonintegratie",
"Name[pl]": "Integracja z telefonią zarządzania modemem",

View file

@ -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",

View file

@ -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",

View file

@ -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",

View file

@ -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",
@ -89,7 +89,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]": "手机来电时暂停音乐/视频",
@ -138,7 +138,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]": "来电时暂停媒体",

View file

@ -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",

View file

@ -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",

View file

@ -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",

View file

@ -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",

View file

@ -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",

View file

@ -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",

View file

@ -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",

View file

@ -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",
@ -52,7 +52,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",

View file

@ -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",

View file

@ -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",

View file

@ -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",

View file

@ -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",

View file

@ -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",