Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +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-07-03 03:28:02 +00:00
parent a57094bfc1
commit d0d552d634
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

@ -34,7 +34,7 @@ Name[sv]=Falkon
Name[tr]=Falkon
Name[uk]=Falkon
Name[x-test]=xxFalkonxx
Name[zh_CN]=Falkon
Name[zh_CN]=Falkon 浏览器
Name[zh_TW]=Falkon
Type=Application
Icon=falkon