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

118 Commits

Author SHA1 Message Date
l10n daemon script
86c7c98a86 GIT_SILENT made messages (after extraction) 2018-01-27 03:22:26 +01:00
David Rosca
93ff0c324c
Update description in appdata 2018-01-26 12:53:16 +01:00
l10n daemon script
d67fe39c2f GIT_SILENT made messages (after extraction) 2018-01-26 03:21:30 +01:00
l10n daemon script
7b0d1abdc9 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"
2018-01-25 05:05:01 +01:00
David Rosca
31fd06cde1 Remove scripts 2018-01-24 15:30:28 +01:00
David Rosca
d1502ba68e Use lowercase f in reverse domain name 2018-01-24 11:56:25 +01:00
l10n daemon script
20bc412317 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"
2018-01-23 05:11:58 +01:00
l10n daemon script
fc38215e2b 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"
2018-01-21 04:59:16 +01:00
l10n daemon script
b739b74181 GIT_SILENT made messages (after extraction) 2018-01-21 03:18:37 +01:00
l10n daemon script
f1a3b7643e 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"
2018-01-20 04:54:01 +01:00
l10n daemon script
10a5689b74 GIT_SILENT made messages (after extraction) 2018-01-20 03:18:30 +01:00
Luigi Toscano
f81989b5db Clean up and appdata appdata (pass validate-relax)
- update to the latest versions of the XML (application->component,
  updatecontact->update_contact);
- remove useless i18n from some fields where it's not needed (id,
  metadata_license, project_license, screenshot, url, updatecontact);
- update the links to the screenshots and their sizes to match the
  current images on the website.
2018-01-20 02:15:12 +01:00
l10n daemon script
26307bd387 GIT_SILENT made messages (after extraction) 2018-01-07 03:12:05 +01:00
l10n daemon script
ae3bd573cc GIT_SILENT made messages (after extraction) 2018-01-06 03:04:50 +01:00
l10n daemon script
7615773a43 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"
2018-01-05 05:02:06 +01:00
l10n daemon script
30e3f98878 GIT_SILENT made messages (after extraction) 2018-01-05 03:13:29 +01:00
l10n daemon script
362740bbfd 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"
2018-01-04 04:51:59 +01:00
l10n daemon script
8fd47fe27d GIT_SILENT made messages (after extraction) 2017-12-29 03:02:54 +01:00
l10n daemon script
fd13f7fcd8 GIT_SILENT made messages (after extraction) 2017-12-27 05:05:13 +01:00
l10n daemon script
4464e57f79 GIT_SILENT made messages (after extraction) 2017-12-23 03:18:44 +01:00
l10n daemon script
8f542a6ed2 GIT_SILENT made messages (after extraction) 2017-12-22 03:07:35 +01:00
l10n daemon script
7faf9e2e8d 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-12-21 04:50:47 +01:00
l10n daemon script
a9c8ab7045 GIT_SILENT made messages (after extraction) 2017-12-21 03:18:07 +01:00
l10n daemon script
dac1f9b762 GIT_SILENT made messages (after extraction) 2017-12-20 05:23:00 +01:00
Joel Barrios
7fbf120521 Default screenshot in appdata does not exist.
The default screenshot in appdata file (https://www.qupzilla.com/screens/gnome.png) does not exist. Redirects to https://www.qupzilla.com/home.
2017-12-18 12:52:31 +01:00
Joey Riches
f19eb53d3c linux: add 'StartupWMClass' to desktop file
This fixes various system integration things for when WM_CLASS and
WM_NAME don't match, some desktop enviroments handle this
better than others. This fixes:

* The application appearing twice in docks
* No pin to panel option shown in Budgie Desktop
* The themed icon not being used in certain situations.

Signed-off-by: Joey Riches <josephriches@gmail.com>
2017-12-03 19:09:47 +01:00
l10n daemon script
4f8b1f57e7 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-11-27 05:03:51 +01:00
l10n daemon script
c01b4de078 GIT_SILENT made messages (after extraction) 2017-11-27 03:16:39 +01:00
l10n daemon script
abb8a9db15 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-11-10 04:54:04 +01:00
l10n daemon script
86ebe85aa7 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-10-25 08:45:55 +02:00
l10n daemon script
63d64ff5b9 GIT_SILENT made messages (after extraction) 2017-10-25 05:41:25 +02:00
l10n daemon script
524237b202 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-09-19 05:03:47 +02:00
l10n daemon script
f28e986abe GIT_SILENT made messages (after extraction) 2017-09-19 03:30:38 +02:00
l10n daemon script
395cb5d2f5 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-09-18 05:00:58 +02:00
l10n daemon script
86f7eba427 GIT_SILENT made messages (after extraction) 2017-09-18 03:27:10 +02:00
David Faure
31d0e1f6b3 CMake buildsystem for src/main as well.
I had to rename PNGs, but updated qmake buildsystem so it still works
(kind of, there are duplicate pngs installed, no big deal...)

Only tested on Linux, but tried to write the cmake code for OSX and
Windows specific things too.
2017-09-10 13:35:21 +02:00
l10n daemon script
ca377a0d65 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-09-06 08:25:21 +02:00
l10n daemon script
a9add1b568 GIT_SILENT made messages (after extraction) 2017-09-06 06:50:35 +02:00
l10n daemon script
d42b1ecf52 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-09-05 04:29:09 +02:00
l10n daemon script
c153adce6b GIT_SILENT made messages (after extraction) 2017-09-05 03:05:06 +02:00
l10n daemon script
691723e4f6 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-09-03 04:44:27 +02:00
l10n daemon script
3dc4685561 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-09-01 04:37:46 +02:00
l10n daemon script
07db7a25db GIT_SILENT made messages (after extraction) 2017-09-01 03:05:40 +02:00
l10n daemon script
765d27cde5 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-30 08:02:14 +02:00
l10n daemon script
28e5441250 GIT_SILENT made messages (after extraction) 2017-08-30 06:14:22 +02:00
l10n daemon script
b6dabb55aa 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-27 04:43:13 +02:00
l10n daemon script
b8a38cac7c GIT_SILENT made messages (after extraction) 2017-08-27 03:08:55 +02:00
l10n daemon script
d718a61042 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-26 04:46:29 +02:00
David Rosca
d00e769749 Initial rename to Falkon 2017-08-25 17:32:32 +02:00
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