tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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-15 01:42:57 +00:00
parent 79a87c2c0b
commit 3b42d0fc27
11 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/battery/kdeconnect_battery.json
View file

@ -8,6 +8,7 @@
"Name[bg]": "Albert Vaca Cintora", "Name[bg]": "Albert Vaca Cintora",
"Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",

2
plugins/bigscreen/kdeconnect_bigscreen.json
View file

@ -51,6 +51,7 @@
"Description[bg]": "Изпращане на гласови команди към телевизора с Bigscreen на Plasma", "Description[bg]": "Изпращане на гласови команди към телевизора с Bigscreen на Plasma",
"Description[ca@valencia]": "Envieu ordres de veu al TV executant Plasma Bigscreen", "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[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[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[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[ia]": "Invia commandos de voce a tu TV executante Bigscreen de Plasma",
@ -71,6 +72,7 @@
"Name[bg]": "Bigscreen управление на гласа", "Name[bg]": "Bigscreen управление на гласа",
"Name[ca@valencia]": "Control de veu de Bigscreen", "Name[ca@valencia]": "Control de veu de Bigscreen",
"Name[ca]": "Control de veu de la Bigscreen", "Name[ca]": "Control de veu de la Bigscreen",
"Name[cs]": "Hlasové ovládání pro Bigscreen",
"Name[fr]": "Contrôle vocal pour Bigscreen", "Name[fr]": "Contrôle vocal pour Bigscreen",
"Name[ia]": "Controlo de voce de BigScreen", "Name[ia]": "Controlo de voce de BigScreen",
"Name[ka]": "Bigscreen-ის ხმოვანი კონტროლი", "Name[ka]": "Bigscreen-ის ხმოვანი კონტროლი",

1
plugins/clipboard/kdeconnect_clipboard.json
View file

@ -8,6 +8,7 @@
"Name[bg]": "Albert Vaca Cintora", "Name[bg]": "Albert Vaca Cintora",
"Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",

2
plugins/kdeconnect.notifyrc
View file

@ -863,6 +863,7 @@ Name[ar]=استُلمت نص
Name[bg]=Текстът е приет Name[bg]=Текстът е приет
Name[ca]=Text rebut Name[ca]=Text rebut
Name[ca@valencia]=Text rebut Name[ca@valencia]=Text rebut
Name[cs]=Text byl přijat
Name[en_GB]=Text Received Name[en_GB]=Text Received
Name[fr]=Texte reçu Name[fr]=Texte reçu
Name[gl]=Recibiuse texto Name[gl]=Recibiuse texto
@ -881,6 +882,7 @@ Comment[ar]=وصل نص إلى الجهاز
Comment[bg]=Получен е някакъв текст Comment[bg]=Получен е някакъв текст
Comment[ca]=S'ha rebut text Comment[ca]=S'ha rebut text
Comment[ca@valencia]=S'ha rebut text Comment[ca@valencia]=S'ha rebut text
Comment[cs]=Byl přijat nějaký text
Comment[en_GB]=Received some text Comment[en_GB]=Received some text
Comment[fr]=Réception de quelques éléments de texte Comment[fr]=Réception de quelques éléments de texte
Comment[gl]=Recibiuse un texto Comment[gl]=Recibiuse un texto

1
plugins/mpriscontrol/kdeconnect_mpriscontrol.json
View file

@ -8,6 +8,7 @@
"Name[bg]": "Albert Vaca Cintora", "Name[bg]": "Albert Vaca Cintora",
"Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",

1
plugins/notifications/kdeconnect_notifications.json
View file

@ -8,6 +8,7 @@
"Name[bg]": "Albert Vaca Cintora", "Name[bg]": "Albert Vaca Cintora",
"Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",

1
plugins/pausemusic/kdeconnect_pausemusic.json
View file

@ -8,6 +8,7 @@
"Name[bg]": "Albert Vaca Cintora", "Name[bg]": "Albert Vaca Cintora",
"Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",

1
plugins/ping/kdeconnect_ping.json
View file

@ -8,6 +8,7 @@
"Name[bg]": "Albert Vaca Cintora", "Name[bg]": "Albert Vaca Cintora",
"Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",

1
plugins/runcommand/kdeconnect_runcommand.json
View file

@ -8,6 +8,7 @@
"Name[bg]": "Albert Vaca Cintora", "Name[bg]": "Albert Vaca Cintora",
"Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",

1
plugins/share/kdeconnect_share.json
View file

@ -8,6 +8,7 @@
"Name[bg]": "Albert Vaca Cintora", "Name[bg]": "Albert Vaca Cintora",
"Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",

1
plugins/telephony/kdeconnect_telephony.json
View file

@ -8,6 +8,7 @@
"Name[bg]": "Albert Vaca Cintora", "Name[bg]": "Albert Vaca Cintora",
"Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",