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-04-09 01:40:22 +00:00
parent 459187f8ed
commit ad53dea58e
11 changed files with 93 additions and 9 deletions

View file

@ -3,7 +3,15 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora"
"Name": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx"
}
],
"Description": "Show your phone battery next to your computer battery",

View file

@ -47,6 +47,14 @@
}
],
"Description": "Send voice commands to your TV running 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[ka]": "გაუგზავნეთ თქვენს TV-ზე გაშვებულ Plasma Bigscreen-ს ხმოვანი ბრძანებები",
"Description[nl]": "Stemcommando s naar uw TV zenden bij actief 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",
"EnabledByDefault": true,
"Icon": "tvtrusted",
"Id": "kdeconnect_bigscreen",

View file

@ -3,7 +3,15 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora"
"Name": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx"
}
],
"Description": "Share the clipboard between devices",

View file

@ -855,6 +855,8 @@ Action=Popup
[Event/textShareReceived]
Name=Text Received
Name[ca]=Text rebut
Name[en_GB]=Text Received
Name[gl]=Recibiuse texto
Name[nl]=Tekst ontvangen
Name[sl]=Besedilo prejeto
Name[tr]=Metin Alındı
@ -862,6 +864,8 @@ Name[uk]=Отримано текст
Name[x-test]=xxText Receivedxx
Comment=Received some text
Comment[ca]=S'ha rebut text
Comment[en_GB]=Received some text
Comment[gl]=Recibiuse un texto
Comment[nl]=Enige tekst ontvangen
Comment[sl]=Prejeto nekaj besedila
Comment[tr]=Metin alındı

View file

@ -3,7 +3,15 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora"
"Name": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx"
}
],
"Description": "Remote control your music and videos",

View file

@ -3,7 +3,15 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora"
"Name": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx"
}
],
"Description": "Show device's notifications on this computer and keep them in sync",

View file

@ -3,7 +3,15 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora"
"Name": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx"
}
],
"Description": "Pause music/videos during a phone call",

View file

@ -3,7 +3,15 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora"
"Name": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx"
}
],
"Description": "Send and receive pings",

View file

@ -3,7 +3,15 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora"
"Name": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx"
},
{
"Email": "david@davidedmundson.co.uk",

View file

@ -3,7 +3,15 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora"
"Name": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx"
}
],
"Description": "Receive and send files, URLs or plain text easily",

View file

@ -3,7 +3,15 @@
"Authors": [
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora"
"Name": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx"
}
],
"Description": "Show notifications for incoming calls",