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

View file

@ -5,6 +5,7 @@
"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",

View file

@ -48,6 +48,7 @@
],
"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",
@ -74,10 +75,12 @@
"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[fr]": "Contrôle vocal pour Bigscreen",
"Name[gl]": "Control de voz de Bigscreen",

View file

@ -5,6 +5,7 @@
"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",

View file

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

View file

@ -5,6 +5,7 @@
"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",

View file

@ -5,6 +5,7 @@
"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",

View file

@ -5,6 +5,7 @@
"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",

View file

@ -5,6 +5,7 @@
"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",

View file

@ -5,6 +5,7 @@
"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",

View file

@ -5,6 +5,7 @@
"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",

View file

@ -5,6 +5,7 @@
"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",