1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-13 10:32:11 +01:00
Commit Graph

4 Commits

Author SHA1 Message Date
l10n daemon script
418333d453 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"
2017-08-25 04:49:17 +02:00
Sérgio Marques
54f0796aab Update org.qupzilla.QupZilla.desktop 2017-07-25 17:13:25 +02:00
Laszlo Espadas
6da89425a9 Add hungarian strings for qupzilla.desktop file 2017-07-23 22:46:36 +02:00
David Rosca
0d2b8b6b81 Change linux desktop file name to org.qupzilla.QupZilla
Closes #2308
2017-06-06 17:56:49 +02:00