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 2022-11-07 01:49:31 +00:00
parent 1a8d50cb45
commit 5bce4746b5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/notifications/kdeconnect_notifications.json
View file

@ -52,7 +52,7 @@
"Description[ar]": "أظهر إخطارات الجهاز على هذا الحاسوب وأبقها متزامنة",
"Description[az]": "Cihaz bildirişlərini bu komputerdə göstərmək və onları eyniləşdirmək",
"Description[bg]": "Показване и синхронизиране на известията на устройството с този компютър",
"Description[ca@valencia]": "Mostra les notificacions del dispositiu a l'ordinador i les manté sincronitzades",
"Description[ca@valencia]": "Mostra les notificacions del dispositiu en l'ordinador i les manté sincronitzades",
"Description[ca]": "Mostra les notificacions del dispositiu a l'ordinador i les manté sincronitzades",
"Description[cs]": "Zobrazit oznámení telefonu v počítači a udržovat je synchronizovaná",
"Description[da]": "Vis enhedens bekendtgørelser på denne computer og hold dem synkroniseret",