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-03 02:00:00 +00:00
parent c8aa083b81
commit e9fc7ccd42
2 changed files with 7 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

@ -10,6 +10,8 @@
"Description[fr]": "Vous connecter à vos périphériques et se synchroniser avec eux",
"Description[ka]": "თქვენი მოწყობილობების მიერთება და სინქრონიზაცია",
"Description[nl]": "Uw apparaten verbinden en synchroniseren",
"Description[pl]": "Podłącz i zsynchronizuj swoje urządzenia",
"Description[sl]": "Poveži in sinhroniziraj svoje naprave",
"Description[tr]": "Aygıtlarını bağla ve eşzamanla",
"Description[uk]": "З'єднання і синхронізація ваших пристроїв",
"Description[x-test]": "xxConnect and sync your devicesxx",
@ -22,7 +24,10 @@
"Name[es]": "KDE Connect",
"Name[eu]": "KDE Connect",
"Name[fr]": "KDE Connect",
"Name[ka]": "KDE Connect",
"Name[nl]": "KDE Connect",
"Name[pl]": "KDE Connect",
"Name[sl]": "KDE Connect",
"Name[tr]": "KDE Connect",
"Name[uk]": "KDE Connect",
"Name[x-test]": "xxKDE Connectxx"

2
plugins/mmtelephony/kdeconnect_mmtelephony.json
View file

@ -15,6 +15,7 @@
"Name[nl]": "Yoram Bar-Haim",
"Name[pl]": "Yoram Bar-Haim",
"Name[pt]": "Yoram Bar-Haim",
"Name[sl]": "Yoram Bar-Haim",
"Name[tr]": "Yoram Bar-Haim",
"Name[uk]": "Йорам Бар-Хаїм",
"Name[x-test]": "xxYoram Bar-Haimxx"
@ -77,6 +78,7 @@
"Name[nl]": "Modembeheerder telefoonintegratie",
"Name[pl]": "Integracja z telefonią zarządzania modemem",
"Name[pt]": "Integração telefónica com o ModemManager",
"Name[sl]": "Upravljalnik modema integracija telefonije",
"Name[tr]": "ModemManager Telefon tümleştirmesi",
"Name[uk]": "Інтеграція телефонії ModemManager",
"Name[x-test]": "xxModemManager Telephony integrationxx",