Commit 2d2cf744 authored by Script Kiddy's avatar Script Kiddy

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"
parent 688a7df0
Pipeline #6316 passed with stage
in 6 minutes and 31 seconds
......@@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca",
"Name[ar]": "Albert Vaca",
"Name[ast]": "Albert Vaca",
"Name[ca@valencia]": "Albert Vaca",
"Name[ca]": "Albert Vaca",
"Name[cs]": "Albert Vaca",
......@@ -43,6 +44,7 @@
],
"Description": "Show your phone battery next to your computer battery",
"Description[ar]": "أظهر بطّاريّة الهاتف بجانب بطّاريّة الحاسوب",
"Description[ast]": "Amuesa la batería del preséu al llau de la del ordenador",
"Description[ca@valencia]": "Mostra la bateria del telèfon al costat de la bateria de l'ordinador",
"Description[ca]": "Mostra la bateria del telèfon al costat de la bateria de l'ordinador",
"Description[cs]": "Zobrazit baterii vedle baterie počítače",
......
......@@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca",
"Name[ar]": "Albert Vaca",
"Name[ast]": "Albert Vaca",
"Name[ca@valencia]": "Albert Vaca",
"Name[ca]": "Albert Vaca",
"Name[cs]": "Albert Vaca",
......@@ -43,6 +44,7 @@
],
"Description": "Share the clipboard between devices",
"Description[ar]": "شارك الحافظة بين الجهازين",
"Description[ast]": "Comparte'l cartafueyu ente preseos",
"Description[ca@valencia]": "Comparteix el porta-retalls entre dispositius",
"Description[ca]": "Comparteix el porta-retalls entre dispositius",
"Description[cs]": "Sdílet obsah schránky mezi zařízeními",
......@@ -85,6 +87,7 @@
"License": "GPL",
"Name": "Clipboard",
"Name[ar]": "الحافظة",
"Name[ast]": "Cartafueyu",
"Name[ca@valencia]": "Porta-retalls",
"Name[ca]": "Porta-retalls",
"Name[cs]": "Schránka",
......
......@@ -5,6 +5,7 @@
{
"Email": "simon@ergotech.com",
"Name": "Simon Redman",
"Name[ast]": "Simon Redman",
"Name[ca@valencia]": "Simon Redman",
"Name[ca]": "Simon Redman",
"Name[cs]": "Simon Redman",
......@@ -63,6 +64,7 @@
"Id": "kdeconnect_contacts",
"License": "GPL",
"Name": "Contacts",
"Name[ast]": "Contautos",
"Name[ca@valencia]": "Contactes",
"Name[ca]": "Contactes",
"Name[cs]": "Kontakty",
......
......@@ -5,6 +5,7 @@
"Email": "apparle@gmail.com",
"Name": "Apoorv Parle",
"Name[ar]": "Apoorv Parle",
"Name[ast]": "Apoorv Parle",
"Name[ca@valencia]": "Apoorv Parle",
"Name[ca]": "Apoorv Parle",
"Name[cs]": "Apoorv Parle",
......@@ -44,6 +45,7 @@
"Email": "davidedmundson@kde.org",
"Name": "David Edmundson",
"Name[ar]": "David Edmundson",
"Name[ast]": "David Edmundson",
"Name[ca@valencia]": "David Edmundson",
"Name[ca]": "David Edmundson",
"Name[cs]": "David Edmundson",
......
......@@ -4,6 +4,7 @@
{
"Email": "kossebau@kde.org",
"Name": "Friedrich W. H. Kossebau",
"Name[ast]": "Friedrich W. H. Kossebau",
"Name[ca@valencia]": "Friedrich W. H. Kossebau",
"Name[ca]": "Friedrich W. H. Kossebau",
"Name[cs]": "Friedrich W. H. Kossebau",
......
......@@ -5,6 +5,7 @@
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol",
"Name[ar]": "Aleix Pol",
"Name[ast]": "Aleix Pol",
"Name[ca@valencia]": "Aleix Pol",
"Name[ca]": "Aleix Pol",
"Name[cs]": "Aleix Pol",
......@@ -43,6 +44,7 @@
],
"Description": "Locks your systems",
"Description[ar]": "أوصد الأنظمة",
"Description[ast]": "Bloquia'l sistema",
"Description[ca@valencia]": "Bloqueja els vostres sistemes",
"Description[ca]": "Bloqueja els vostres sistemes",
"Description[cs]": "Zamkne vaše systémy",
......
......@@ -5,6 +5,7 @@
"Email": "ahmedibrahimkhali@gmail.com",
"Name": "Ahmed I. Khalil",
"Name[ar]": "أحمد إبراهيم خليل",
"Name[ast]": "Ahmed I. Khalil",
"Name[ca@valencia]": "Ahmed I. Khalil",
"Name[ca]": "Ahmed I. Khalil",
"Name[cs]": "Ahmed I. Khalil",
......@@ -43,6 +44,7 @@
],
"Description": "Use your phone as a touchpad and keyboard",
"Description[ar]": "استخدم الهاتف كفأرة ولوحة مفاتيح",
"Description[ast]": "Usa'l preséu como panel táutil y tecláu",
"Description[ca@valencia]": "Empra el telèfon com un ratolí tàctil i teclat",
"Description[ca]": "Empra el telèfon com un ratolí tàctil i teclat",
"Description[cs]": "Používejte svůj telefon jako touchpad a klávesnici",
......@@ -85,6 +87,7 @@
"License": "GPL",
"Name": "Virtual input",
"Name[ar]": "دخل وهميّ",
"Name[ast]": "Entrada virtual",
"Name[ca@valencia]": "Entrada virtual",
"Name[ca]": "Entrada virtual",
"Name[cs]": "Virtuální vstup",
......
......@@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca",
"Name[ar]": "Albert Vaca",
"Name[ast]": "Albert Vaca",
"Name[ca@valencia]": "Albert Vaca",
"Name[ca]": "Albert Vaca",
"Name[cs]": "Albert Vaca",
......
......@@ -5,6 +5,7 @@
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol",
"Name[ar]": "Aleix Pol",
"Name[ast]": "Aleix Pol",
"Name[ca@valencia]": "Aleix Pol",
"Name[ca]": "Aleix Pol",
"Name[cs]": "Aleix Pol",
......
......@@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca",
"Name[ar]": "Albert Vaca",
"Name[ast]": "Albert Vaca",
"Name[ca@valencia]": "Albert Vaca",
"Name[ca]": "Albert Vaca",
"Name[cs]": "Albert Vaca",
......@@ -43,6 +44,7 @@
],
"Description": "Show device's notifications on this computer and keep them in sync",
"Description[ar]": "أظهر إخطارات الجهاز على هذا الحاسوب وأبقها متزامنة",
"Description[ast]": "Amuesa los avisos del preséu nesti ordenador y caltiénlos en sincronía",
"Description[ca@valencia]": "Mostra les notificacions del dispositiu a l'ordinador i les manté sincronitzades",
"Description[ca]": "Mostra les notificacions del dispositiu a l'ordinador i les manté sincronitzades",
"Description[cs]": "Zobrazit upozornění telefonu v počítači a udržovat je synchronizovaná",
......
......@@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca",
"Name[ar]": "Albert Vaca",
"Name[ast]": "Albert Vaca",
"Name[ca@valencia]": "Albert Vaca",
"Name[ca]": "Albert Vaca",
"Name[cs]": "Albert Vaca",
......@@ -43,6 +44,7 @@
],
"Description": "Pause music/videos during a phone call",
"Description[ar]": "ألبث الموسيقى/الفيديو أثناء المكالمات الهاتفيّة",
"Description[ast]": "Posa la música o los vídeos demientres una llamada telefónica",
"Description[ca@valencia]": "Pausa la música/vídeos durant una trucada telefònica",
"Description[ca]": "Pausa la música/vídeos durant una trucada telefònica",
"Description[cs]": "Pozastavit hudbu/video během telefonátu",
......@@ -84,6 +86,7 @@
"License": "GPL",
"Name": "Pause media during calls",
"Name[ar]": "ألبث الوسائط أثناء المكالمات",
"Name[ast]": "Posa de la reproducción demientres les llamaes",
"Name[ca@valencia]": "Pausa els suports durant les trucades",
"Name[ca]": "Pausa els suports durant les trucades",
"Name[cs]": "Pozastavit média během telefonátu",
......
......@@ -4,6 +4,7 @@
{
"Email": "nicolas.fella@gmx.de",
"Name": "Nicolas Fella",
"Name[ast]": "Nicolas Fella",
"Name[ca@valencia]": "Nicolas Fella",
"Name[ca]": "Nicolas Fella",
"Name[cs]": "Nicolas Fella",
......@@ -31,6 +32,7 @@
}
],
"Description": "Use a connected device to take a photo",
"Description[ast]": "Usa un preséu coneutáu pa facer una semeya",
"Description[ca@valencia]": "Usa un dispositiu connectat per fer una fotografia",
"Description[ca]": "Usa un dispositiu connectat per fer una fotografia",
"Description[cs]": "Použít připojené zařízení pro pořízení fotografie",
......@@ -59,6 +61,7 @@
"Id": "kdeconnect_photo",
"License": "GPL",
"Name": "Photo",
"Name[ast]": "Semeya",
"Name[ca@valencia]": "Fotografia",
"Name[ca]": "Fotografia",
"Name[cs]": "Fotka",
......
......@@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca",
"Name[ar]": "Albert Vaca",
"Name[ast]": "Albert Vaca",
"Name[ca@valencia]": "Albert Vaca",
"Name[ca]": "Albert Vaca",
"Name[cs]": "Albert Vaca",
......
......@@ -5,6 +5,7 @@
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol",
"Name[ar]": "Aleix Pol",
"Name[ast]": "Aleix Pol",
"Name[ca@valencia]": "Aleix Pol",
"Name[ca]": "Aleix Pol",
"Name[cs]": "Aleix Pol",
......
......@@ -5,6 +5,7 @@
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol",
"Name[ar]": "Aleix Pol",
"Name[ast]": "Aleix Pol",
"Name[ca@valencia]": "Aleix Pol",
"Name[ca]": "Aleix Pol",
"Name[cs]": "Aleix Pol",
......
......@@ -5,6 +5,7 @@
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol",
"Name[ar]": "Aleix Pol",
"Name[ast]": "Aleix Pol",
"Name[ca@valencia]": "Aleix Pol",
"Name[ca]": "Aleix Pol",
"Name[cs]": "Aleix Pol",
......@@ -43,6 +44,7 @@
],
"Description": "Control Remote systems",
"Description[ar]": "تحكّم بالأنظمة البعيدة",
"Description[ast]": "Controla sistemes remotos",
"Description[ca@valencia]": "Sistemes de control remot",
"Description[ca]": "Sistemes de control remot",
"Description[cs]": "Ovládejte vzdálené systémy",
......@@ -83,6 +85,7 @@
"License": "GPL",
"Name": "RemoteControl",
"Name[ar]": "التّحكّم عن بعد",
"Name[ast]": "Control remotu",
"Name[ca@valencia]": "Control remot",
"Name[ca]": "Control remot",
"Name[cs]": "Dálkové ovládání",
......
......@@ -5,6 +5,7 @@
"Email": "holger.k@elberer.de",
"Name": "Holger Kaelberer",
"Name[ar]": "Holger Kaelberer",
"Name[ast]": "Holger Kaelberer",
"Name[ca@valencia]": "Holger Kaelberer",
"Name[ca]": "Holger Kaelberer",
"Name[cs]": "Holger Kaelberer",
......@@ -42,6 +43,7 @@
}
],
"Description": "Use your keyboard to send key-events to your paired device",
"Description[ast]": "Usa'l tecláu pa unviar eventos de tecles al preséu empareyáu",
"Description[ca@valencia]": "Empreu el vostre teclat per enviar esdeveniments de tecla al dispositiu aparellat",
"Description[ca]": "Empreu el vostre teclat per enviar esdeveniments de tecla al dispositiu aparellat",
"Description[cs]": "Používejte svoji klávesnici pro odesílání událostí kláves na spárované zařízení",
......
......@@ -4,6 +4,7 @@
{
"Email": "nicolas.fella@gmx.de",
"Name": "Nicolas Fella",
"Name[ast]": "Nicolas Fella",
"Name[ca@valencia]": "Nicolas Fella",
"Name[ca]": "Nicolas Fella",
"Name[cs]": "Nicolas Fella",
......@@ -31,6 +32,7 @@
}
],
"Description": "Control the volume of the connected device",
"Description[ast]": "Controla'l volume del preséu coneutáu",
"Description[ca@valencia]": "Controla el volum del dispositiu connectat",
"Description[ca]": "Controla el volum del dispositiu connectat",
"Description[cs]": "Ovládejte hlasitost připojeného zařízení",
......
......@@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca",
"Name[ar]": "Albert Vaca",
"Name[ast]": "Albert Vaca",
"Name[ca@valencia]": "Albert Vaca",
"Name[ca]": "Albert Vaca",
"Name[cs]": "Albert Vaca",
......@@ -44,6 +45,7 @@
"Email": "david@davidedmundson.co.uk",
"Name": "David Edmundson",
"Name[ar]": "David Edmundson",
"Name[ast]": "David Edmundson",
"Name[ca@valencia]": "David Edmundson",
"Name[ca]": "David Edmundson",
"Name[cs]": "David Edmundson",
......@@ -83,6 +85,7 @@
],
"Description": "Execute console commands remotely",
"Description[ar]": "نفّذ أوامر طرفيّة عن بعد",
"Description[ast]": "Executa remotamente comandos de la consola",
"Description[ca@valencia]": "Executa ordres de la consola de forma remota",
"Description[ca]": "Executa ordres de la consola de forma remota",
"Description[cs]": "Spouštět konzolové příkazy vzdáleně",
......@@ -124,6 +127,7 @@
"License": "GPL",
"Name": "Run commands",
"Name[ar]": "شغّل أوامر",
"Name[ast]": "Execución de comandos",
"Name[ca@valencia]": "Executa ordres",
"Name[ca]": "Executa ordres",
"Name[cs]": "Spustit příkazy",
......
......@@ -5,6 +5,7 @@
"Email": "pmdematagoda@mykolab.ch",
"Name": "Pramod Dematagoda",
"Name[ar]": "Pramod Dematagoda",
"Name[ast]": "Pramod Dematagoda",
"Name[ca@valencia]": "Pramod Dematagoda",
"Name[ca]": "Pramod Dematagoda",
"Name[cs]": "Pramod Dematagoda",
......
......@@ -5,6 +5,7 @@
"Email": "kinnalru@gmail.com",
"Name": "Samoilenko Yuri",
"Name[ar]": "Samoilenko Yuri",
"Name[ast]": "Samoilenko Yuri",
"Name[ca@valencia]": "Samoilenko Yuri",
"Name[ca]": "Samoilenko Yuri",
"Name[cs]": "Samoilenko Yuri",
......@@ -85,6 +86,7 @@
"License": "GPL",
"Name": "Remote filesystem browser",
"Name[ar]": "متصفّح نظام الملفّات البعيد",
"Name[ast]": "Restolador de sistemes de ficheros remotos",
"Name[ca@valencia]": "Navegador del sistema de fitxers remot",
"Name[ca]": "Navegador del sistema de fitxers remot",
"Name[cs]": "Vzdálený prohlížeč souborového systému",
......
......@@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca",
"Name[ar]": "Albert Vaca",
"Name[ast]": "Albert Vaca",
"Name[ca@valencia]": "Albert Vaca",
"Name[ca]": "Albert Vaca",
"Name[cs]": "Albert Vaca",
......@@ -43,6 +44,7 @@
],
"Description": "Receive and send files, URLs or plain text easily",
"Description[ar]": "استقبل الملفّات أو العناوين أو النّصوص الصّرفة وأرسلها بسهولة",
"Description[ast]": "Recibi y unvia ficheros, URLs o testu planu d'un mou cenciellu",
"Description[ca@valencia]": "Rep i envia fitxers, URL o text pla amb facilitat",
"Description[ca]": "Rep i envia fitxers, URL o text pla amb facilitat",
"Description[cs]": "Snadno přijímejte a posílejte soubory, URL nebo čistý text",
......
......@@ -4,6 +4,7 @@
{
"Email": "simon@ergotech.com",
"Name": "Simon Redman",
"Name[ast]": "Simon Redman",
"Name[ca@valencia]": "Simon Redman",
"Name[ca]": "Simon Redman",
"Name[cs]": "Simon Redman",
......@@ -32,6 +33,7 @@
}
],
"Description": "Send and receive SMS",
"Description[ast]": "Unvia y recibe SMS",
"Description[ca@valencia]": "Envia i rep SMS",
"Description[ca]": "Envia i rep SMS",
"Description[cs]": "Posílat a přijímat SMS",
......@@ -63,6 +65,7 @@
"Id": "kdeconnect_sms",
"License": "GPL",
"Name": "SMS",
"Name[ast]": "SMS",
"Name[ca@valencia]": "SMS",
"Name[ca]": "SMS",
"Name[cs]": "SMS",
......
......@@ -5,6 +5,7 @@
{
"Email": "nicolas.fella@gmx.de",
"Name": "Nicolas Fella",
"Name[ast]": "Nicolas Fella",
"Name[ca@valencia]": "Nicolas Fella",
"Name[ca]": "Nicolas Fella",
"Name[cs]": "Nicolas Fella",
......@@ -32,6 +33,7 @@
}
],
"Description": "Control the system volume from your phone",
"Description[ast]": "Controla'l volume del sistema dende'l teléfonu",
"Description[ca@valencia]": "Controla el volum del sistema des del telèfon",
"Description[ca]": "Controla el volum del sistema des del telèfon",
"Description[cs]": "Ovládejte hlasitost systému z vašeho telefonu",
......@@ -61,6 +63,7 @@
"Id": "kdeconnect_systemvolume",
"License": "GPL",
"Name": "System volume",
"Name[ast]": "Volume del sistema",
"Name[ca@valencia]": "Volum del sistema",
"Name[ca]": "Volum del sistema",
"Name[cs]": "Hlasitost systému",
......
......@@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca",
"Name[ar]": "Albert Vaca",
"Name[ast]": "Albert Vaca",
"Name[ca@valencia]": "Albert Vaca",
"Name[ca]": "Albert Vaca",
"Name[cs]": "Albert Vaca",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment