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-23 01:46:30 +00:00
parent b399d51762
commit eb04209601
11 changed files with 14 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

@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com", "Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora", "Name": "Albert Vaca Cintora",
"Name[ar]": "ألبرت فاكا سينتورا", "Name[ar]": "ألبرت فاكا سينتورا",
"Name[az]": "Albert Vaca Cintora",
"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",

3
plugins/bigscreen/kdeconnect_bigscreen.json
View file

@ -48,6 +48,7 @@
], ],
"Description": "Send voice commands to your TV running Plasma Bigscreen", "Description": "Send voice commands to your TV running Plasma Bigscreen",
"Description[ar]": "أرسل أوامر صوتية إلى تلفازك الذي يشغل بلازما الشاشة الكبيرة", "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[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",
@ -74,10 +75,12 @@
"License": "GPL", "License": "GPL",
"Name": "Bigscreen voice control", "Name": "Bigscreen voice control",
"Name[ar]": "التحكم الصوتي للشاشة الكبيرة", "Name[ar]": "التحكم الصوتي للشاشة الكبيرة",
"Name[az]": "Böyük Ekran səs ilə idarəetmə",
"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[cs]": "Hlasové ovládání pro Bigscreen",
"Name[en_GB]": "Bigscreen voice control",
"Name[es]": "Control de voz de Bigscreen", "Name[es]": "Control de voz de Bigscreen",
"Name[fr]": "Contrôle vocal pour Bigscreen", "Name[fr]": "Contrôle vocal pour Bigscreen",
"Name[gl]": "Control de voz de Bigscreen", "Name[gl]": "Control de voz de Bigscreen",

1
plugins/clipboard/kdeconnect_clipboard.json
View file

@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com", "Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora", "Name": "Albert Vaca Cintora",
"Name[ar]": "ألبرت فاكا سينتورا", "Name[ar]": "ألبرت فاكا سينتورا",
"Name[az]": "Albert Vaca Cintora",
"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",

2
plugins/kdeconnect.notifyrc
View file

@ -860,6 +860,7 @@ Action=Popup
[Event/textShareReceived] [Event/textShareReceived]
Name=Text Received Name=Text Received
Name[ar]=استُلمت نص Name[ar]=استُلمت نص
Name[az]=Mətn alındı
Name[bg]=Текстът е приет Name[bg]=Текстът е приет
Name[ca]=Text rebut Name[ca]=Text rebut
Name[ca@valencia]=Text rebut Name[ca@valencia]=Text rebut
@ -884,6 +885,7 @@ Name[x-test]=xxText Receivedxx
Name[zh_CN]=收到文本 Name[zh_CN]=收到文本
Comment=Received some text Comment=Received some text
Comment[ar]=وصل نص إلى الجهاز Comment[ar]=وصل نص إلى الجهاز
Comment[az]=Bəzi mətnlər alındı
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

1
plugins/mpriscontrol/kdeconnect_mpriscontrol.json
View file

@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com", "Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora", "Name": "Albert Vaca Cintora",
"Name[ar]": "ألبرت فاكا سينتورا", "Name[ar]": "ألبرت فاكا سينتورا",
"Name[az]": "Albert Vaca Cintora",
"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",

1
plugins/notifications/kdeconnect_notifications.json
View file

@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com", "Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora", "Name": "Albert Vaca Cintora",
"Name[ar]": "ألبرت فاكا سينتورا", "Name[ar]": "ألبرت فاكا سينتورا",
"Name[az]": "Albert Vaca Cintora",
"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",

1
plugins/pausemusic/kdeconnect_pausemusic.json
View file

@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com", "Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora", "Name": "Albert Vaca Cintora",
"Name[ar]": "ألبرت فاكا سينتورا", "Name[ar]": "ألبرت فاكا سينتورا",
"Name[az]": "Albert Vaca Cintora",
"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",

1
plugins/ping/kdeconnect_ping.json
View file

@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com", "Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora", "Name": "Albert Vaca Cintora",
"Name[ar]": "ألبرت فاكا سينتورا", "Name[ar]": "ألبرت فاكا سينتورا",
"Name[az]": "Albert Vaca Cintora",
"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",

1
plugins/runcommand/kdeconnect_runcommand.json
View file

@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com", "Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora", "Name": "Albert Vaca Cintora",
"Name[ar]": "ألبرت فاكا سينتورا", "Name[ar]": "ألبرت فاكا سينتورا",
"Name[az]": "Albert Vaca Cintora",
"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",

1
plugins/share/kdeconnect_share.json
View file

@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com", "Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora", "Name": "Albert Vaca Cintora",
"Name[ar]": "ألبرت فاكا سينتورا", "Name[ar]": "ألبرت فاكا سينتورا",
"Name[az]": "Albert Vaca Cintora",
"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",

1
plugins/telephony/kdeconnect_telephony.json
View file

@ -5,6 +5,7 @@
"Email": "albertvaka@gmail.com", "Email": "albertvaka@gmail.com",
"Name": "Albert Vaca Cintora", "Name": "Albert Vaca Cintora",
"Name[ar]": "ألبرت فاكا سينتورا", "Name[ar]": "ألبرت فاكا سينتورا",
"Name[az]": "Albert Vaca Cintora",
"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",