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-01-08 01:59:58 +00:00
parent 3a089d068d
commit ed92c41245
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcm/kcm_kdeconnect.json
View file

@ -3,6 +3,7 @@
"KPlugin": { "KPlugin": {
"Description": "Connect and sync your devices", "Description": "Connect and sync your devices",
"Description[ar]": "اتّصل وزامن أجهزتك", "Description[ar]": "اتّصل وزامن أجهزتك",
"Description[bg]": "Свържете и синхронизирайте вашите устройства",
"Description[ca@valencia]": "Connecta i sincronitza els vostres dispositius", "Description[ca@valencia]": "Connecta i sincronitza els vostres dispositius",
"Description[ca]": "Connecta i sincronitza els vostres dispositius", "Description[ca]": "Connecta i sincronitza els vostres dispositius",
"Description[cs]": "Připojte a synchronizujte svá zařízení", "Description[cs]": "Připojte a synchronizujte svá zařízení",
@ -21,6 +22,7 @@
"Icon": "preferences-kde-connect", "Icon": "preferences-kde-connect",
"Name": "KDE Connect", "Name": "KDE Connect",
"Name[ar]": "كدي المتّصل", "Name[ar]": "كدي المتّصل",
"Name[bg]": "KDE Connect",
"Name[ca@valencia]": "KDE Connect", "Name[ca@valencia]": "KDE Connect",
"Name[ca]": "KDE Connect", "Name[ca]": "KDE Connect",
"Name[cs]": "KDE Connect", "Name[cs]": "KDE Connect",

2
plugins/mmtelephony/kdeconnect_mmtelephony.json
View file

@ -5,6 +5,7 @@
"Email": "bhyoram@protonmail.com", "Email": "bhyoram@protonmail.com",
"Name": "Yoram Bar-Haim", "Name": "Yoram Bar-Haim",
"Name[ar]": "يورام بار-هايم", "Name[ar]": "يورام بار-هايم",
"Name[bg]": "Yoram Bar-Haim",
"Name[ca@valencia]": "Yoram Bar-Haim", "Name[ca@valencia]": "Yoram Bar-Haim",
"Name[ca]": "Yoram Bar-Haim", "Name[ca]": "Yoram Bar-Haim",
"Name[cs]": "Yoram Bar-Haim", "Name[cs]": "Yoram Bar-Haim",
@ -69,6 +70,7 @@
"License": "GPL", "License": "GPL",
"Name": "ModemManager Telephony integration", "Name": "ModemManager Telephony integration",
"Name[ar]": "تكامل هاتف ModemManager", "Name[ar]": "تكامل هاتف ModemManager",
"Name[bg]": "Интеграция с телефон на ModemManager",
"Name[ca@valencia]": "Integració amb la telefonia de ModemManager", "Name[ca@valencia]": "Integració amb la telefonia de ModemManager",
"Name[ca]": "Integració amb la telefonia del ModemManager", "Name[ca]": "Integració amb la telefonia del ModemManager",
"Name[cs]": "Integrace telefonu pro ModemManager", "Name[cs]": "Integrace telefonu pro ModemManager",

2
plugins/remotecommands/kdeconnect_remotecommands.json
View file

@ -101,7 +101,7 @@
"Name": "Host remote commands", "Name": "Host remote commands",
"Name[ar]": "استضف الأوامر البعيدة", "Name[ar]": "استضف الأوامر البعيدة",
"Name[az]": "Hostun uzaq əmrləri", "Name[az]": "Hostun uzaq əmrləri",
"Name[bg]": "за", "Name[bg]": "Команди на отдалечения хост",
"Name[ca@valencia]": "Allotja ordres remotes", "Name[ca@valencia]": "Allotja ordres remotes",
"Name[ca]": "Allotja ordres remotes", "Name[ca]": "Allotja ordres remotes",
"Name[cs]": "Přijímat vzdálené příkazy", "Name[cs]": "Přijímat vzdálené příkazy",