Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity
5,710 Commits 24 Branches 54 Tags 50 MiB
1e1a3f8be2
Commit Graph

213 Commits

Author SHA1 Message Date
l10n daemon script
524697d139 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"
 2019-01-27 05:34:59 +01:00
l10n daemon script
caf1380774 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"
 2019-01-21 05:18:24 +01:00
l10n daemon script
8d321a72bf GIT_SILENT made messages (after extraction) 2019-01-21 03:00:18 +01:00
l10n daemon script
0684603930 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-12-24 05:18:23 +01:00
l10n daemon script
8f6054f788 GIT_SILENT made messages (after extraction) 2018-12-12 03:01:20 +01:00
l10n daemon script
5b831a3c8c GIT_SILENT made messages (after extraction) 2018-11-01 03:43:13 +01:00
l10n daemon script
116ba93b79 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-10-22 05:54:15 +02:00
l10n daemon script
5fb500465f GIT_SILENT made messages (after extraction) 2018-10-22 03:41:47 +02:00
l10n daemon script
b44134fd07 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-10-10 06:19:06 +02:00
l10n daemon script
82417ff4a5 GIT_SILENT made messages (after extraction) 2018-10-10 03:54:18 +02:00
l10n daemon script
e0d1175dd1 GIT_SILENT made messages (after extraction) 2018-08-26 03:34:44 +02:00
l10n daemon script
1500f2202a 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-08-03 05:36:42 +02:00
l10n daemon script
06020d9615 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-07-03 05:28:07 +02:00
l10n daemon script
1c6f5bd8e2 GIT_SILENT made messages (after extraction) 2018-07-03 03:23:47 +02:00
l10n daemon script
086d572e25 GIT_SILENT made messages (after extraction) 2018-06-26 03:24:35 +02:00
l10n daemon script
0e96dd33c2 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-06-17 05:29:07 +02:00
l10n daemon script
73123c72c2 GIT_SILENT made messages (after extraction) 2018-06-17 03:29:09 +02:00
l10n daemon script
c252de4bdd GIT_SILENT made messages (after extraction) 2018-06-13 03:38:24 +02:00
l10n daemon script
aca4f6c0a9 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-05-16 05:26:16 +02:00
David Rosca
3760a9ffd1
AppImage: Bundle KWindowSystem plugins 2018-05-09 18:11:57 +02:00
David Rosca
68ff092b4c
Update AppImage build Dockerfile 2018-05-07 13:33:52 +02:00
David Rosca
dd8d8b9007
Add Dockerfile for building AppImage 2018-05-01 22:59:49 +02:00
l10n daemon script
e36d092c08 GIT_SILENT made messages (after extraction) 2018-04-27 03:32:10 +02:00
l10n daemon script
dd60458d6a 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-04-24 05:25:10 +02:00
l10n daemon script
75d5f5d552 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-04-21 07:16:56 +02:00
l10n daemon script
08a3fe5476 GIT_SILENT made messages (after extraction) 2018-04-21 06:15:24 +02:00
l10n daemon script
a62fb97ed8 GIT_SILENT made messages (after extraction) 2018-04-17 06:17:22 +02:00
l10n daemon script
e0f390e986 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-04-07 07:11:21 +02:00
l10n daemon script
a931002465 GIT_SILENT made messages (after extraction) 2018-04-07 06:08:19 +02:00
David Rosca
04341b0981
Change homepage to falkon.org 2018-03-30 09:38:26 +02:00
David Rosca
87ce04b11d
Update build-appimage.sh 2018-02-28 22:03:18 +01:00
Jonathan Riddell
9f2c10216d more appstream data 2018-02-28 16:59:54 +00:00
Jonathan Riddell
18f13c7273 appstream screenshot 2018-02-28 16:59:54 +00:00
David Rosca
86d3ebebc7
Add new Falkon icon 2018-02-23 12:58:04 +01:00
l10n daemon script
788c795b62 GIT_SILENT made messages (after extraction) 2018-02-19 03:16:26 +01:00
l10n daemon script
a2828371ed GIT_SILENT made messages (after extraction) 2018-02-18 03:17:56 +01:00
l10n daemon script
a707926e13 GIT_SILENT made messages (after extraction) 2018-02-17 03:17:00 +01:00
David Rosca
2039710921
AppData: Remove qupzilla urls 2018-02-16 14:46:44 +01:00
l10n daemon script
39f78ad402 GIT_SILENT made messages (after extraction) 2018-02-12 03:19:51 +01:00
David Rosca
ef1f0256d3
Update build-appimage.sh 2018-02-11 19:25:42 +01:00
l10n daemon script
7bba5b79ed GIT_SILENT made messages (after extraction) 2018-02-04 03:24:04 +01:00
l10n daemon script
efe806e65e GIT_SILENT made messages (after extraction) 2018-01-30 03:21:50 +01:00
l10n daemon script
894394adbb GIT_SILENT made messages (after extraction) 2018-01-29 03:23:57 +01:00
David Rosca
32c613a35a
Fix appdata 2018-01-28 16:04:56 +01:00
l10n daemon script
6093245e4f GIT_SILENT made messages (after extraction) 2018-01-28 03:22:54 +01:00
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
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
Matija Skala
1d1c40ee7d Add slovenian translation (#2291) 2017-04-07 20:23:24 +02:00
scootergrisen
e9ba27eb3d Add danish (da) translation (#2249) 2017-03-14 10:01:31 +01:00