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 2017-10-10 04:52:00 +02:00
parent 214950b3bb
commit ba5e89f232
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
urlhandler/org.kde.kdeconnect.telhandler.desktop
View file

@ -13,6 +13,7 @@ Name[nl]=URL behandelaar van KDE-Connect-telefoon
Name[nn]=Telefon-URL-handsamar for KDE Connect
Name[pl]=KDE Connect - obsługa URL telefonu
Name[pt]=Tratamento de URL's Telefónicos do KDE Connect
Name[ru]=Обработчик телефонных ссылок KDE Connect
Name[sr]=КДЕ‑конекцијин руковалац телефонским УРЛ‑овима
Name[sr@ijekavian]=КДЕ‑конекцијин руковалац телефонским УРЛ‑овима
Name[sr@ijekavianlatin]=KDE‑konekcijin rukovalac telefonskim URL‑ovima