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-03-13 01:45:53 +00:00
parent 56c44df3ae
commit f9404b83ed
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/sms/kdeconnect_sms.json
View file

@ -54,7 +54,7 @@
"Description[ca]": "Envia i rep SMS", "Description[ca]": "Envia i rep SMS",
"Description[cs]": "Posílat a přijímat SMS", "Description[cs]": "Posílat a přijímat SMS",
"Description[da]": "Send og modtag sms", "Description[da]": "Send og modtag sms",
"Description[de]": "Senden und Empfangen von SMS", "Description[de]": "SMS senden und empfangen",
"Description[el]": "Αποστολή και λήψη SMS", "Description[el]": "Αποστολή και λήψη SMS",
"Description[en_GB]": "Send and receive SMS", "Description[en_GB]": "Send and receive SMS",
"Description[es]": "Enviar y recibir SMS", "Description[es]": "Enviar y recibir SMS",