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-02-07 02:50:57 +00:00
parent aad0065fb7
commit 97161cafce
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/pausemusic/kdeconnect_pausemusic.json
View file

@ -97,8 +97,8 @@
"Name[ar]": "ألبث الوسائط أثناء المكالمات",
"Name[ast]": "Posa de la reproducción demientres les llamaes",
"Name[az]": "Zəng zamanı media fasiləsi",
"Name[ca@valencia]": "Fa una pausa els suports durant les trucades",
"Name[ca]": "Fa una pausa els suports durant les trucades",
"Name[ca@valencia]": "Pausa als fitxers multimèdia durant les trucades",
"Name[ca]": "Pausa als fitxers multimèdia durant les trucades",
"Name[cs]": "Pozastavit média během telefonátu",
"Name[da]": "Sæt medier på pause under opkald",
"Name[de]": "Medium bei Anrufen anhalten",