Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity
5,663 Commits 32 Branches 57 Tags 59 MiB
6765b10f8d
Commit Graph

4425 Commits

Author SHA1 Message Date
Juraj Oravec
52370301aa
PIM: Fix typo, missing brackets around if 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 16:24:00 +01:00
Juraj Oravec
be4d55795f
PIM: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 16:22:20 +01:00
Juraj Oravec
ff94cf69da
StatusBarIcons: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 16:00:28 +01:00
Luigi Toscano
9de051fb20 Merge remote-tracking branch 'origin/Falkon/3.1' 2019-12-16 00:36:11 +01:00
Luigi Toscano
f1b7661b1f Update a few internal KDE URLs 
Use the generic redirect commits.kde.org insteaf of:
- projects.kde.org, which has been obsolete for a while;
- cgit.kde.org, which is not a future-proof URL anyway.
 2019-12-16 00:34:12 +01:00
Tobias C. Berner
3efda1bda4 Add Intl_LIBRARIES and Intl_INCLUDE_DIRS to FalkonPrivate 
Summary: See https://build.kde.org/view/OS%20-%20FreeBSD/job/Extragear/job/falkon/job/stable-kf5-qt5%20FreeBSDQt5.13/13/console

Reviewers: #freebsd, aacid, drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D26007
 2019-12-14 22:46:52 +01:00
Albert Astals Cid
95790ce9e5 Merge remote-tracking branch 'origin/Falkon/3.1' 2019-12-14 00:32:31 +01:00
Albert Astals Cid
29f96b7504 Fix lupdate warnings 
Summary:
Class 'XXX' lacks Q_OBJECT macro

If you use tr() in a class it needs Q_OBJECT

Test Plan: It builds

Reviewers: drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D25911
 2019-12-14 00:32:16 +01:00
l10n daemon script
c2b4350521 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-12-03 05:37:17 +01:00
Laurent Montel
bbde5c6955 Add missing include in last qt5.14 2019-12-02 13:30:36 +01:00
Laurent Montel
f64811b77f convert setMargin 2019-11-27 21:25:21 +01:00
David Rosca
2d5bf8d45f
Merge branch 'Falkon/3.1' 2019-10-31 11:23:40 +01:00
David Rosca
bfb9420cbb
PyFalkon: Fix C linkage issues 
BUG: 413093
FIXED-IN: 3.1.1
 2019-10-31 10:37:24 +01:00
David Rosca
7b404e73a8
CookieManager: Add support for selecting more than one cookie at once 
Summary:
When manually cleaning cookies, it is very convenient to be able to delete
a bunch of them at once, when we do not want to delete all cookies.

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D24967
 2019-10-31 10:15:12 +01:00
Juraj Oravec
8f2cf86117
Set current tab as parent for duplicated tab 
Summary: BUG: 408518

Test Plan: Duplicate tab, the change is visible in TreeView of Vertical Tabs plugin.

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon, drosca

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D24933
 2019-10-31 10:14:09 +01:00
l10n daemon script
1363b848a5 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-09-30 08:39:50 +02:00
Laurent Montel
c772438470 GIT_SILENT: minor qstring optimization 2019-09-13 08:03:02 +02:00
l10n daemon script
74e55c59d3 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-09-05 09:04:23 +02:00
l10n daemon script
8b4d2556a0 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-08-31 08:46:56 +02:00
l10n daemon script
821b1c6f81 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-08-30 09:20:27 +02:00
Christoph Cullmann
44e753fc9f Added QLoggingCategory to Falkon 
Summary:
Getting to know how the application works i needed a way to investigate some bits and pieces in the code. That's why I created the following patch.
Debug lines can be created with the following code:

`qCDebug(FALKON_PRIVATE_LOG) << "testing 123, testing";`

and debug lines can be activated with the runtime flag:

` QT_LOGGING_RULES="org.kde.falkon.debug=true"`

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: cullmann, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21770
 2019-08-24 17:19:53 +02:00
l10n daemon script
1162a5cf20 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-08-24 08:41:15 +02:00
l10n daemon script
220e609d47 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-08-24 05:01:51 +02:00
l10n daemon script
6f1c729906 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-08-13 05:19:36 +02:00
l10n daemon script
677380520c 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-08-06 08:27:21 +02:00
l10n daemon script
310a2e2d2d 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-08-06 04:49:17 +02:00
Pino Toscano
ae7fff8695 Merge remote-tracking branch 'origin/Falkon/3.1' 2019-06-30 11:29:30 +02:00
Pino Toscano
070bce531c i18n: use https for bugs.kde.org 2019-06-30 11:26:59 +02:00
l10n daemon script
c89de7f463 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-06-24 05:03:22 +02:00
l10n daemon script
6ae5f0e9e5 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-06-23 18:39:57 +02:00
l10n daemon script
3fdd1d95d3 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-06-21 08:51:00 +02:00
l10n daemon script
483f5f70b5 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-06-19 08:52:28 +02:00
l10n daemon script
d6c4cfeb74 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-06-19 05:21:30 +02:00
Juraj Oravec
dfb3d2357d
Vertical Tabs: Add child tab with middle click on "New Tab" button 
Summary:
BUG: 393656

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: drosca, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21664
 2019-06-10 12:07:26 +02:00
Juraj Oravec
493421dd84
RunAction: Fix string conversion from bytestring, correct codestyle 
Summary:
- Fix action execution when url wrongly converted to string as bytestring.
  This resulted in not working actions (loading b"b"url"")
- Make codestyle more pythonic
- Remove not required imports
- Configue dialog:
 - Set label weight to bold in QtDesigner (UI file)
 - Make listview scroll per pixel

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21718
 2019-06-10 12:07:15 +02:00
David Rosca
4b85dab3d7
Vertical tabs: Draw unloaded tabs with "Disabled" color palette 
Summary: BUG: 405833

Reviewers: #falkon

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21548
 2019-06-03 17:42:42 +02:00
David Rosca
721d203366
Merge branch 'Falkon/3.1' 2019-06-01 10:28:17 +02:00
David Rosca
107e75b469
Hello Python: Remove semicolons from sidebar.py (E703) 
Reviewers: #falkon, cullmann

Reviewed By: #falkon, cullmann

Subscribers: cullmann, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21386
 2019-06-01 10:26:40 +02:00
l10n daemon script
44c85c7f65 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-05-30 08:26:40 +02:00
l10n daemon script
2887d87ed5 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-05-30 05:09:20 +02:00
l10n daemon script
cc248c72c8 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-05-25 08:42:22 +02:00
David Rosca
3075477492
IconProvider: Add mutex around icon cache 
BUG: 406972
FIXED-IN: 3.1.1
 2019-05-24 21:47:20 +02:00
David Rosca
2098d69ad1
PyFalkon: Fix build with clang 
BUG: 407734
FIXED-IN: 3.2.0
 2019-05-20 15:21:09 +02:00
David Rosca
fb09c266a7
VerticalTabs: Corectly recognize tree collapse / expand button 
Summary:
In treeview when the tab has no children the collapse / expand button
is not visible but the control logic still thought that is is.
By clicking on place where this button normaly is nothing happens
and user has to click again somewhere else to change the selected tab.

Test Plan:
In treeview mode check the function of collapse / expand button when visible and invisible.

  - Visible: Expand / collapse the tree
  - Not visible: Select tab

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21304
 2019-05-20 15:03:28 +02:00
David Rosca
bb8a3a799f
RunAction plugin: set alternatingRowColors for listWidget 
Summary:
Before:
{F6824266}
After:
{F6824265}

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21227
 2019-05-20 15:03:11 +02:00
l10n daemon script
fbf7f956ff 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-05-12 05:52:11 +02:00
l10n daemon script
8e57d0895c 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-05-11 09:01:28 +02:00
Nicolas Fella
e3cca98e0d Fix name and set desktop entry for notifications 
Summary: With the Plasma notification rewrite the name passed with the notification is user-visible, so use "Falkon" instead of "falkon here". Also pass the desktop entry. This allows Plasma to embed the app icon in the notification

Test Plan:
Before:
{F6815655}
After:
{F6815657}

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: kossebau, broulik, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21087
 2019-05-09 10:07:38 +02:00
l10n daemon script
8393f62ad4 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-05-04 08:50:18 +02:00
l10n daemon script
5614a32d5c 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-05-03 08:53:24 +02:00
l10n daemon script
3bc0c165af 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-05-03 05:50:54 +02:00
l10n daemon script
0d5e79a8a9 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-04-24 09:02:26 +02:00
l10n daemon script
d636dff966 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-04-24 05:52:57 +02:00
l10n daemon script
05b63efb59 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-04-23 09:11:22 +02:00
l10n daemon script
3bf1f80e85 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-04-23 06:05:39 +02:00
David Rosca
ee4dbad676
Merge branch 'Falkon/3.1' 2019-04-22 09:50:50 +02:00
David Rosca
66d6e81e23
main: Remove backtrace handler 2019-04-22 09:46:39 +02:00
David Rosca
f38265230d
SideBarManager: Clear active sidebar upon close 
BUG: 406724
FIXED-IN: 3.1.1
 2019-04-21 11:21:29 +02:00
David Rosca
b9fb89a31c
Remove GnomeKeyringPasswords plugin 
Modern distributions no longer have the deprecated library in repos.
 2019-04-21 11:03:35 +02:00
David Rosca
9828237159
Plugins: Use embedded JSON metadata for shared library plugins 
It is no longer needed to load the library to retrieve metadata.
 2019-04-21 11:03:26 +02:00
David Rosca
92721449c0
VerticalTabs: Also override Ctrl+PgUp/PgDown shortcuts 2019-04-20 19:26:00 +02:00
David Rosca
dc3063fc63
Fix loading Python/QML extensions on startup 2019-04-20 16:54:06 +02:00
David Rosca
0b261874cb
Merge branch 'Falkon/3.1' 2019-04-20 16:15:29 +02:00
David Rosca
514097ef4c
BookmarksManager: Don't allow to create bookmark without parent 
BUG: 406433
FIXED-IN: 3.1.1
 2019-04-20 14:08:44 +02:00
David Rosca
3137cdfca2
Merge branch 'Falkon/3.1' 2019-04-20 12:10:35 +02:00
David Rosca
8e4328b03c
QmlUserScript: Automatically install/uninstall underlying script 2019-04-20 11:52:28 +02:00
David Rosca
a8d43ed0c8
QmlStaticData: Prevent deleting singletons by QML engine 2019-04-20 11:23:16 +02:00
David Rosca
231101151e
QmlPluginLoader: Fallback to main.qml as entrypoint if not set 2019-04-20 10:54:01 +02:00
David Rosca
10eb20c162
QmlExtensionScheme: Fix warning about QQmlParserStatus qobject_cast 2019-04-20 10:46:53 +02:00
David Rosca
8e5c478c90
Preferences: Add links to KDE store for installing themes/extensions 2019-04-20 10:23:30 +02:00
David Rosca
f792104be5
ThemeManager: Implement removing locally installed themes 2019-04-20 10:18:48 +02:00
David Rosca
b5988bbe1f
Merge branch 'Falkon/3.1' 2019-04-20 09:34:40 +02:00
David Rosca
eb4b68fdd9
MainApplication: Create private browsing QWebEngineProfile without parent 
Fixes crash on shutdown
 2019-04-20 09:33:44 +02:00
l10n daemon script
c5e1aab96a 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-04-20 09:03:19 +02:00
l10n daemon script
e4299fb85c 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-04-20 06:00:37 +02:00
David Rosca
d2d3d45932
Don't use subfolders for QML/Python extensions 2019-04-19 11:38:15 +02:00
David Rosca
ff9c70dccb
Fix build with QtWebEngine 5.9 2019-04-18 16:34:59 +02:00
David Rosca
5e6f92f7bc
OcsSupport: Add initial support for downloading themes/extensions 2019-04-18 16:25:27 +02:00
David Rosca
13449605eb
QmlPlugin: Change entrypoint to always be main.qml 2019-04-18 11:52:44 +02:00
David Rosca
7a562a4847
Plugins: Implement removing locally installed plugins 2019-04-18 11:52:25 +02:00
David Rosca
a3e320fb47
KWalletPasswordBackend: Add overrides 2019-04-18 10:54:22 +02:00
David Rosca
e44ba37063
Merge branch 'Falkon/3.1' 2019-04-18 10:24:47 +02:00
David Rosca
232eaa54bd
KDEFrameworksIntegration: Create Purpose menu in init 2019-04-17 16:28:45 +02:00
Saish Mhatre
e66835b4bf
Added focus for searchbar in history sidebar & bookmark sidebar 
Summary:
After Adding Focus , user can directly search after pressing ctrl+h in history sidebar
& ctrl+shift+b in bookmark sidebar
BUG: 393948

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: SGOrava, falkon, #falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D20022
 2019-04-10 17:11:47 +02:00
l10n daemon script
6e98af2f1c 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-04-10 09:15:23 +02:00
l10n daemon script
61f3cd89a1 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-04-08 08:42:31 +02:00
l10n daemon script
ae495bcc60 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-04-08 05:48:04 +02:00
l10n daemon script
bde26dc861 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-04-06 05:57:30 +02:00
David Rosca
cb30ecb994
Merge branch 'Falkon/3.1' 2019-04-05 20:40:15 +02:00
l10n daemon script
f322c4ed94 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-04-04 09:01:22 +02:00
l10n daemon script
4c2b453573 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-04-02 09:00:21 +02:00
l10n daemon script
95661276c5 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-04-01 08:54:43 +02:00
Anmol Gautam
3150def9fc added pause/resume for downloads 
Summary: Added button to pause/resume download from the download manager

Reviewers: drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D20037
 2019-03-31 18:03:39 +05:30
l10n daemon script
2a7176946b 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-03-31 09:30:03 +02:00
l10n daemon script
739f0d20d6 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-03-28 08:45:05 +01:00
David Rosca
479933e095
PyFalkon: Fix build with Qt 5.12.2 
BUG: 405833
FIXED-IN: 3.1.1
 2019-03-25 11:38:27 +01:00
l10n daemon script
2743002b2d 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-03-25 08:53:45 +01:00
l10n daemon script
dc140a7053 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-03-24 08:25:04 +01:00
l10n daemon script
f712500b2c 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-03-23 09:02:28 +01:00
l10n daemon script
1f1978751f 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-03-23 06:07:37 +01:00