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 2021-05-02 01:18:48 +00:00
parent 9b3441a229
commit 8e46bfd705
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/pausemusic/kdeconnect_pausemusic_config.desktop
View file

@ -43,7 +43,7 @@ Name[sr@ijekavian]=Поставке прикључка паузирања муз
Name[sr@ijekavianlatin]=Postavke priključka pauziranja muzike
Name[sr@latin]=Postavke priključka pauziranja muzike
Name[sv]=Inställningar av insticksprogram för paus i musik
Name[ta]=பாடல் இடைநிருத்த செருகுநிரலுக்கான அமைப்புகள்
Name[ta]=பாடல் இடைநிறுத்த செருகுநிரலுக்கான அமைப்புகள்
Name[tr]=Müziği Duraklat eklenti ayarları
Name[uk]=Параметри додатка призупинення відтворення музики
Name[x-test]=xxPause Music plugin settingsxx