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-02 02:27:35 +00:00
parent 985c51a95c
commit a72d22101c
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kcm/kcm_kdeconnect.json
View file

@ -3,9 +3,12 @@
"KPlugin": {
"Description": "Connect and sync your devices",
"Description[ar]": "اتّصل وزامن أجهزتك",
"Description[ca@valencia]": "Connecta i sincronitza els vostres dispositius",
"Description[ca]": "Connecta i sincronitza els vostres dispositius",
"Description[en_GB]": "Connect and sync your devices",
"Description[eu]": "Zure gailuak konektatu eta sinkronizatzea",
"Description[fr]": "Vous connecter à vos périphériques et se synchroniser avec eux",
"Description[ka]": "თქვენი მოწყობილობების მიერთება და სინქრონიზაცია",
"Description[nl]": "Uw apparaten verbinden en synchroniseren",
"Description[tr]": "Aygıtlarını bağla ve eşzamanla",
"Description[uk]": "З'єднання і синхронізація ваших пристроїв",
@ -13,10 +16,12 @@
"Icon": "preferences-kde-connect",
"Name": "KDE Connect",
"Name[ar]": "كدي المتّصل",
"Name[ca@valencia]": "KDE Connect",
"Name[ca]": "KDE Connect",
"Name[en_GB]": "KDE Connect",
"Name[es]": "KDE Connect",
"Name[eu]": "KDE Connect",
"Name[fr]": "KDE Connect",
"Name[nl]": "KDE Connect",
"Name[tr]": "KDE Connect",
"Name[uk]": "KDE Connect",