1
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00

SVN_SILENT made messages (.desktop file) - always resolve ours

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-06-12 01:53:33 +00:00
parent d1afb50055
commit 22f11a2e19

View File

@ -114,7 +114,7 @@ GenericName[ru]=Веб-браузер
GenericName[sk]=Webový prehliadač GenericName[sk]=Webový prehliadač
GenericName[sl]=Spletni brskalnik GenericName[sl]=Spletni brskalnik
GenericName[sv]=Webbläsare GenericName[sv]=Webbläsare
GenericName[tr]=Web Tarayıcı GenericName[tr]=Web Tarayıcısı
GenericName[uk]=Переглядач інтернету GenericName[uk]=Переглядач інтернету
GenericName[x-test]=xxWeb Browserxx GenericName[x-test]=xxWeb Browserxx
GenericName[zh_CN]= GenericName[zh_CN]=