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-02-20 02:03:03 +00:00
parent 5d4b074ef5
commit 97be950a2d
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcm/kcm_kdeconnect.json
View file

@ -4,6 +4,7 @@
"BugReportUrl": "https://bugs.kde.org/enter_bug.cgi?product=systemsettings&component=kcm_kdeconnect",
"Description": "Connect and sync your devices",
"Description[ar]": "اتّصل وزامن أجهزتك",
"Description[az]": "Cihazlarını qoş və eyniləşdir",
"Description[bg]": "Свържете и синхронизирайте вашите устройства",
"Description[ca@valencia]": "Connecta i sincronitza els vostres dispositius",
"Description[ca]": "Connecta i sincronitza els vostres dispositius",
@ -33,6 +34,7 @@
"Icon": "preferences-kde-connect",
"Name": "KDE Connect",
"Name[ar]": "كدي المتّصل",
"Name[az]": "KDE Connect",
"Name[bg]": "KDE Connect",
"Name[ca@valencia]": "KDE Connect",
"Name[ca]": "KDE Connect",

2
plugins/mmtelephony/kdeconnect_mmtelephony.json
View file

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