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
6e2f218b55
commit
0a827f9e06
11 changed files with 47 additions and 10 deletions
|
@ -7,13 +7,16 @@
|
|||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "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[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Show your phone battery next to your computer battery",
|
||||
|
|
|
@ -50,13 +50,16 @@
|
|||
"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[en_GB]": "Send voice commands to your TV running Plasma Bigscreen",
|
||||
"Description[fr]": "Envoyer des commandes vocales vers votre télévision fonctionnant avec Plasma Bigscreen.",
|
||||
"Description[ia]": "Invia commandos de voce a tu TV executante Bigscreen de Plasma",
|
||||
"Description[ka]": "გაუგზავნეთ თქვენს TV-ზე გაშვებულ Plasma Bigscreen-ს ხმოვანი ბრძანებები",
|
||||
"Description[nl]": "Stemcommando s naar uw TV zenden bij actief Plasma Bigscreen",
|
||||
"Description[pl]": "Wysyłaj polecenie głosowe do swojego TV, używając Dużego Ekranu Plazmy",
|
||||
"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",
|
||||
|
@ -67,6 +70,7 @@
|
|||
"Name[ia]": "Controlo de voce de BigScreen",
|
||||
"Name[ka]": "Bigscreen-ის ხმოვანი კონტროლი",
|
||||
"Name[nl]": "Bigscreen stembesturing",
|
||||
"Name[pl]": "Sterowanie głosowe Dużym Ekranem",
|
||||
"Name[sl]": "Glasovni nadzor velikega zaslona",
|
||||
"Name[tr]": "Büyük Ekran sesle denetim",
|
||||
"Name[uk]": "Голосове керування Bigscreen",
|
||||
|
|
|
@ -7,13 +7,16 @@
|
|||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "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[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Share the clipboard between devices",
|
||||
|
|
|
@ -591,7 +591,7 @@ Comment[ta]=பிங் பெறப்பட்டது
|
|||
Comment[tr]=Ping alındı
|
||||
Comment[uk]=Отримано сигнал підтримки зв’язку
|
||||
Comment[x-test]=xxPing receivedxx
|
||||
Comment[zh_CN]=收到 ping
|
||||
Comment[zh_CN]=收到 Ping
|
||||
Comment[zh_TW]=接收到遠端 Ping 回應封包
|
||||
Action=Popup
|
||||
|
||||
|
@ -865,12 +865,15 @@ Name[en_GB]=Text Received
|
|||
Name[fr]=Texte reçu
|
||||
Name[gl]=Recibiuse texto
|
||||
Name[ia]=Texto Recipite
|
||||
Name[ka]=მიღებულია ტექსტი
|
||||
Name[nl]=Tekst ontvangen
|
||||
Name[pl]=Otrzymano tekst
|
||||
Name[sl]=Besedilo prejeto
|
||||
Name[ta]=குறுஞ்செய்தி வந்துள்ளது
|
||||
Name[tr]=Metin Alındı
|
||||
Name[uk]=Отримано текст
|
||||
Name[x-test]=xxText Receivedxx
|
||||
Name[zh_CN]=收到文本
|
||||
Comment=Received some text
|
||||
Comment[ca]=S'ha rebut text
|
||||
Comment[ca@valencia]=S'ha rebut text
|
||||
|
@ -878,11 +881,14 @@ Comment[en_GB]=Received some text
|
|||
Comment[fr]=Réception de quelques éléments de texte
|
||||
Comment[gl]=Recibiuse un texto
|
||||
Comment[ia]=Recipite alcun texto
|
||||
Comment[ka]=მიღებულია რაღაც ტექსტი
|
||||
Comment[nl]=Enige tekst ontvangen
|
||||
Comment[pl]=Otrzymano jakiś tekst
|
||||
Comment[sl]=Prejeto nekaj besedila
|
||||
Comment[ta]=குறுஞ்செய்தி வந்துள்ளது
|
||||
Comment[tr]=Metin alındı
|
||||
Comment[uk]=Отримано якийсь текст
|
||||
Comment[x-test]=xxReceived some textxx
|
||||
Comment[zh_CN]=收到文本
|
||||
Action=Popup
|
||||
Urgency=Low
|
||||
|
|
|
@ -7,13 +7,16 @@
|
|||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "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[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Remote control your music and videos",
|
||||
|
|
|
@ -7,13 +7,16 @@
|
|||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "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[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Show device's notifications on this computer and keep them in sync",
|
||||
|
|
|
@ -7,13 +7,16 @@
|
|||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "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[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Pause music/videos during a phone call",
|
||||
|
|
|
@ -7,13 +7,16 @@
|
|||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "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[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Send and receive pings",
|
||||
|
|
|
@ -7,13 +7,16 @@
|
|||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "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[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
},
|
||||
{
|
||||
"Email": "david@davidedmundson.co.uk",
|
||||
|
|
|
@ -7,13 +7,16 @@
|
|||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "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[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Receive and send files, URLs or plain text easily",
|
||||
|
|
|
@ -7,13 +7,16 @@
|
|||
"Name[ca@valencia]": "Albert Vaca Cintora",
|
||||
"Name[ca]": "Albert Vaca Cintora",
|
||||
"Name[en_GB]": "Albert Vaca Cintora",
|
||||
"Name[fr]": "Albert Vaca Cintora",
|
||||
"Name[ia]": "Albert Vaca Cintora",
|
||||
"Name[ka]": "Albert Vaca Cintora",
|
||||
"Name[nl]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "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[x-test]": "xxAlbert Vaca Cintoraxx",
|
||||
"Name[zh_CN]": "Albert Vaca Cintora"
|
||||
}
|
||||
],
|
||||
"Description": "Show notifications for incoming calls",
|
||||
|
|
Loading…
Reference in a new issue