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:
parent
9c6aebbd8f
commit
89c38e455c
10 changed files with 9 additions and 293 deletions
|
@ -3,33 +3,7 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "albertvaka@gmail.com",
|
||||
"Name": "Albert Vaca Cintora",
|
||||
"Name[ar]": "ألبرت فاكا سينتورا",
|
||||
"Name[az]": "Albert Vaca Cintora",
|
||||
"Name[bg]": "Albert Vaca Cintora",
|
||||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[cs]": "Albert Vaca Cintora",
|
||||
"Name[de]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[es]": "Albert Vaca Cintora",
|
||||
"Name[fi]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[gl]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[it]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[ko]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
"Name[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
"Name": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Show your phone battery next to your computer battery",
|
||||
|
|
|
@ -47,61 +47,11 @@
|
|||
}
|
||||
],
|
||||
"Description": "Send voice commands to your TV running Plasma Bigscreen",
|
||||
"Description[ar]": "أرسل أوامر صوتية إلى تلفازك الذي يشغل بلازما الشاشة الكبيرة",
|
||||
"Description[az]": "Plasma Böyük ekranın işlək olduğu televizora səs əmri göndər",
|
||||
"Description[bg]": "Изпращане на гласови команди към телевизора с Bigscreen на Plasma",
|
||||
"Description[ca@valencia]": "Envieu ordres de veu al TV executant Plasma Bigscreen",
|
||||
"Description[ca]": "Envieu ordres de veu al TV executant el Plasma Bigscreen",
|
||||
"Description[cs]": "Posílejte hlasové příkazy TV, na které běží Plasma Bigscreen",
|
||||
"Description[en_GB]": "Send voice commands to your TV running Plasma Bigscreen",
|
||||
"Description[es]": "Envie órdenes de voz a su televisor ejecutando Plasma Bigscreen",
|
||||
"Description[fi]": "Lähetä Plasma Bigscreen -TV:lle äänikomentoja",
|
||||
"Description[fr]": "Envoyer des commandes vocales vers votre télévision fonctionnant avec Plasma Bigscreen.",
|
||||
"Description[gl]": "Enviar ordes de voz a un televisor que use Plasma Bigscreen",
|
||||
"Description[ia]": "Invia commandos de voce a tu TV executante Bigscreen de Plasma",
|
||||
"Description[it]": "Invia comandi vocali alla tua TV con Plasma Bigscreen",
|
||||
"Description[ka]": "გაუგზავნეთ თქვენს TV-ზე გაშვებულ Plasma Bigscreen-ს ხმოვანი ბრძანებები",
|
||||
"Description[ko]": "Plasma 큰 화면을 실행 중인 TV에 음성 명령 보내기",
|
||||
"Description[nl]": "Stemcommando s naar uw TV zenden bij actief Plasma Bigscreen",
|
||||
"Description[nn]": "Send stemmekommandoar til fjernsyn som køyrer Plasma Bigscreen",
|
||||
"Description[pl]": "Wysyłaj polecenie głosowe do swojego TV, używając Dużego Ekranu Plazmy",
|
||||
"Description[pt]": "Enviar comandos de voz para a sua TV com o Plasma para Ecrãs Grandes",
|
||||
"Description[pt_BR]": "Envie comandos de voz para sua TV rodando Plasma Bigscreen",
|
||||
"Description[sl]": "Pošljite glasovne ukaze vašemu televizorju, kjer teče Plasma Bigscreen",
|
||||
"Description[tr]": "Plasma Büyük ekran kullanan televizyonlara ses komutları gönder",
|
||||
"Description[uk]": "Надсилання голосових команд вашому телевізору, де запущено Plasma Bigscreen",
|
||||
"Description[x-test]": "xxSend voice commands to your TV running Plasma Bigscreenxx",
|
||||
"Description[zh_CN]": "发送语音命令给运行 Plasma Bigscreen 的电视机",
|
||||
"EnabledByDefault": true,
|
||||
"Icon": "tvtrusted",
|
||||
"Id": "kdeconnect_bigscreen",
|
||||
"License": "GPL",
|
||||
"Name": "Bigscreen voice control",
|
||||
"Name[ar]": "التحكم الصوتي للشاشة الكبيرة",
|
||||
"Name[az]": "Böyük Ekran səs ilə idarəetmə",
|
||||
"Name[bg]": "Bigscreen управление на гласа",
|
||||
"Name[ca@valencia]": "Control de veu de Bigscreen",
|
||||
"Name[ca]": "Control de veu de la Bigscreen",
|
||||
"Name[cs]": "Hlasové ovládání pro Bigscreen",
|
||||
"Name[en_GB]": "Bigscreen voice control",
|
||||
"Name[es]": "Control de voz de Bigscreen",
|
||||
"Name[fi]": "Bigscreen-äänen hallinta",
|
||||
"Name[fr]": "Contrôle vocal pour Bigscreen",
|
||||
"Name[gl]": "Control de voz de Bigscreen",
|
||||
"Name[ia]": "Controlo de voce de BigScreen",
|
||||
"Name[it]": "Controllo vocale di Bigscreen",
|
||||
"Name[ka]": "Bigscreen-ის ხმოვანი კონტროლი",
|
||||
"Name[ko]": "큰 화면 음성 제어",
|
||||
"Name[nl]": "Bigscreen stembesturing",
|
||||
"Name[nn]": "Bigscreen-stemmestyring",
|
||||
"Name[pl]": "Sterowanie głosowe Dużym Ekranem",
|
||||
"Name[pt]": "Comando por voz do Ecrã Grande",
|
||||
"Name[pt_BR]": "Plugin para controle de voz do Bigscreen",
|
||||
"Name[sl]": "Glasovni nadzor velikega zaslona",
|
||||
"Name[tr]": "Büyük Ekran sesle denetim",
|
||||
"Name[uk]": "Голосове керування Bigscreen",
|
||||
"Name[x-test]": "xxBigscreen voice controlxx",
|
||||
"Name[zh_CN]": "Bigscreen 语音控制",
|
||||
"ServiceTypes": [
|
||||
"KdeConnect/Plugin"
|
||||
],
|
||||
|
|
|
@ -3,33 +3,7 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "albertvaka@gmail.com",
|
||||
"Name": "Albert Vaca Cintora",
|
||||
"Name[ar]": "ألبرت فاكا سينتورا",
|
||||
"Name[az]": "Albert Vaca Cintora",
|
||||
"Name[bg]": "Albert Vaca Cintora",
|
||||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[cs]": "Albert Vaca Cintora",
|
||||
"Name[de]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[es]": "Albert Vaca Cintora",
|
||||
"Name[fi]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[gl]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[it]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[ko]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
"Name[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
"Name": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Share the clipboard between devices",
|
||||
|
|
|
@ -3,33 +3,7 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "albertvaka@gmail.com",
|
||||
"Name": "Albert Vaca Cintora",
|
||||
"Name[ar]": "ألبرت فاكا سينتورا",
|
||||
"Name[az]": "Albert Vaca Cintora",
|
||||
"Name[bg]": "Albert Vaca Cintora",
|
||||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[cs]": "Albert Vaca Cintora",
|
||||
"Name[de]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[es]": "Albert Vaca Cintora",
|
||||
"Name[fi]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[gl]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[it]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[ko]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
"Name[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
"Name": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Remote control your music and videos",
|
||||
|
|
|
@ -3,33 +3,7 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "albertvaka@gmail.com",
|
||||
"Name": "Albert Vaca Cintora",
|
||||
"Name[ar]": "ألبرت فاكا سينتورا",
|
||||
"Name[az]": "Albert Vaca Cintora",
|
||||
"Name[bg]": "Albert Vaca Cintora",
|
||||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[cs]": "Albert Vaca Cintora",
|
||||
"Name[de]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[es]": "Albert Vaca Cintora",
|
||||
"Name[fi]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[gl]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[it]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[ko]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
"Name[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
"Name": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Show device's notifications on this computer and keep them in sync",
|
||||
|
|
|
@ -3,33 +3,7 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "albertvaka@gmail.com",
|
||||
"Name": "Albert Vaca Cintora",
|
||||
"Name[ar]": "ألبرت فاكا سينتورا",
|
||||
"Name[az]": "Albert Vaca Cintora",
|
||||
"Name[bg]": "Albert Vaca Cintora",
|
||||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[cs]": "Albert Vaca Cintora",
|
||||
"Name[de]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[es]": "Albert Vaca Cintora",
|
||||
"Name[fi]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[gl]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[it]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[ko]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
"Name[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
"Name": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Pause music/videos during a phone call",
|
||||
|
|
|
@ -3,33 +3,7 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "albertvaka@gmail.com",
|
||||
"Name": "Albert Vaca Cintora",
|
||||
"Name[ar]": "ألبرت فاكا سينتورا",
|
||||
"Name[az]": "Albert Vaca Cintora",
|
||||
"Name[bg]": "Albert Vaca Cintora",
|
||||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[cs]": "Albert Vaca Cintora",
|
||||
"Name[de]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[es]": "Albert Vaca Cintora",
|
||||
"Name[fi]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[gl]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[it]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[ko]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
"Name[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
"Name": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Send and receive pings",
|
||||
|
|
|
@ -3,33 +3,7 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "albertvaka@gmail.com",
|
||||
"Name": "Albert Vaca Cintora",
|
||||
"Name[ar]": "ألبرت فاكا سينتورا",
|
||||
"Name[az]": "Albert Vaca Cintora",
|
||||
"Name[bg]": "Albert Vaca Cintora",
|
||||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[cs]": "Albert Vaca Cintora",
|
||||
"Name[de]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[es]": "Albert Vaca Cintora",
|
||||
"Name[fi]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[gl]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[it]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[ko]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
"Name[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
"Name": "Albert Vaca Cintora"
|
||||
},
|
||||
{
|
||||
"Email": "david@davidedmundson.co.uk",
|
||||
|
|
|
@ -3,33 +3,7 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "albertvaka@gmail.com",
|
||||
"Name": "Albert Vaca Cintora",
|
||||
"Name[ar]": "ألبرت فاكا سينتورا",
|
||||
"Name[az]": "Albert Vaca Cintora",
|
||||
"Name[bg]": "Albert Vaca Cintora",
|
||||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[cs]": "Albert Vaca Cintora",
|
||||
"Name[de]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[es]": "Albert Vaca Cintora",
|
||||
"Name[fi]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[gl]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[it]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[ko]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
"Name[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
"Name": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Receive and send files, URLs or plain text easily",
|
||||
|
|
|
@ -3,33 +3,7 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "albertvaka@gmail.com",
|
||||
"Name": "Albert Vaca Cintora",
|
||||
"Name[ar]": "ألبرت فاكا سينتورا",
|
||||
"Name[az]": "Albert Vaca Cintora",
|
||||
"Name[bg]": "Albert Vaca Cintora",
|
||||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[cs]": "Albert Vaca Cintora",
|
||||
"Name[de]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[es]": "Albert Vaca Cintora",
|
||||
"Name[fi]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[gl]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[it]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[ko]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
"Name[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
"Name": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Show notifications for incoming calls",
|
||||
|
|
Loading…
Reference in a new issue