Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

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-05-03 01:48:40 +00:00
parent 437ba0be77
commit f40b707e58
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux/applications/org.kde.falkon.desktop
View File

@ -105,7 +105,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ısı GenericName[tr]=Web Tarayıcı
GenericName[uk]=Переглядач інтернету GenericName[uk]=Переглядач інтернету
GenericName[x-test]=xxWeb Browserxx GenericName[x-test]=xxWeb Browserxx
GenericName[zh_CN]=网页浏览器 GenericName[zh_CN]=网页浏览器