tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2744 commits 81 branches 117 tags 12 MiB
Commit graph

152 commits

Author SHA1 Message Date
Nicolas Fella
e4385042eb Show icons in plugin list 
Summary:
Show the plugin's icons in the list

Depends on D14567

{F6172885}

Reviewers: #kde_connect, apol

Reviewed By: #kde_connect, apol

Subscribers: kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D14571
 2018-08-03 02:25:39 +02:00
Nicolas Fella
f094408171 Show message and hide controls if no player is available 
Summary: Instead of showing empty controls show a message that no players are available

Test Plan: Use eyes

Reviewers: #kde_connect, apol

Reviewed By: #kde_connect, apol

Subscribers: kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D12830
 2018-07-12 15:22:38 +02:00
Nicolas Fella
17e1e1eced Enable running commands from app 
Summary:
The RemotecommandsPlugin lacks a graphical frontend.

Inlcudes a Dbus Interface for fetching the commands and a Model exposing them to QML. For this I oriented on the NotificatonsPlugin.

Test Plan:
Open command list in app, check available commands, trigger some. Do same for CLI.
Activate edit action, check KCM opening on remote device, add command, check for new command in list

Reviewers: #kde_connect, apol

Reviewed By: #kde_connect, apol

Subscribers: apol, kdeconnect, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D13503
 2018-06-20 08:23:15 +02:00
l10n daemon script
e40312bf5e 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-18 05:27:46 +02:00
Nicolas Fella
51f3394a21 Do not disable paired devices in list 
Summary: There is no reason to disable it. On Android we do the same

Test Plan: Click on paired device in list, correct Page opens

Reviewers: #kde_connect, apol

Reviewed By: #kde_connect, apol

Subscribers: kdeconnect, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D13454
 2018-06-12 14:27:29 +02:00
Nicolas Fella
cb470ce311 Enable accepting/rejecting pairing from app 
Test Plan: Open app, request pairing from other device, accept/reject it

Reviewers: #kde_connect, apol

Reviewed By: #kde_connect, apol

Subscribers: kdeconnect, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D13452
 2018-06-12 14:25:26 +02:00
Aleix Pol
f171f76d74 Fix warning 2018-06-08 20:23:03 +02:00
Aleix Pol
db2e1af179 kcapp: Make both the device and find device page look similar 
Use ScrollablePage or drop paddings
Don't add spacing between delegates
 2018-06-08 20:22:54 +02:00
Aleix Pol
9bc9aba474 kcapp: Add a presentation mode 
Just does presentation things, could do more.
 2018-06-08 20:17:06 +02:00
Aleix Pol
b4b48b97d6 Port to QQC2 2018-06-08 01:58:50 +02:00
Aleix Pol
4e0588adc7 Include a kirigami header to the application 
It helps and it looks less empty
 2018-06-08 01:50:50 +02:00
Aleix Pol
61d3d6c1a1 Kirigami: Don't clear the stack when changing devices from finddevice page 
It allows simpler navigation and it doesn't show the weird behavior we
used to have.
 2018-06-08 01:49:35 +02:00
Nicolas Fella
1934585c41 Use title, album and artist in UI 
Summary: Depends on D12546

Test Plan: Look at it

Reviewers: #kde_connect, apol, mtijink

Reviewed By: #kde_connect, mtijink

Subscribers: kdeconnect, mtijink, apol, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D12552
 2018-05-12 18:04:44 +02:00
Nicolas Fella
aa5aeedf0a Fix another DBus connection in Kirigami app 
Summary: When a DevicePage is created from FindDevicePage the device is not passed correctly, resulting in some device is null warnings. The pair button still does not work, but it seems to be another issue.

Test Plan: I could set the button text to the device id, so the device is passed correctly. The button still does not work as intended though.

Reviewers: #kde_connect

Subscribers: apol, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D12506
 2018-04-28 00:25:17 +02:00
Nicolas Fella
25cbf66e58 Fix DBus connection in Kirigami app 
Summary: The device id was not properly passed to the interface factory, rendering the Mpris and mousepad UI useless

Test Plan: Mpris and mousepad UI in app are now actually filled with content

Reviewers: #kde_connect, apol

Reviewed By: #kde_connect, apol

Subscribers: #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D12505
 2018-04-25 14:47:56 +02:00
Friedrich W. H. Kossebau
bb3ab8b631 Clean-up requirements: cmake 3.0, qt 5.7, use min versions, deduplicate KF5 
Summary:
* cmake 2.8.12 is really outdated, 3.0 is minimum in plasma & kf5
* cmake_minimum_required should be at begin of toplevel CMakeLists.txt
* bump qt version to 5.7, matching the min Qt version of kf5 5.42
* with ecm being part of kf5 since early versions, share ${KF5_MIN_VERSION}
* use QT_MIN_VERSION & KF5_MIN_VERSION also for separate find_package calls
* deduplicate all KF5 components searched for in unconditionally included
  subdirs

Test Plan: Still configures and builds with all options OFF & ON

Reviewers: #kde_connect, nicolasfella

Reviewed By: #kde_connect, nicolasfella

Subscribers: nicolasfella

Differential Revision: https://phabricator.kde.org/D11418
 2018-03-17 23:34:33 +01:00
l10n daemon script
057a114629 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 04:58:52 +02:00
Albert Vaca
84bba9429f Merge branch 'master' into 1.x 
# Conflicts:
#	core/backends/lan/downloadjob.cpp
#	core/backends/lan/downloadjob.h
#	core/filetransferjob.cpp
#	core/filetransferjob.h
#	plugins/notifications/sendreplydialog.cpp
#	plugins/notifications/sendreplydialog.h
#	plugins/telephony/sendsmsdialog.cpp
#	plugins/telephony/sendsmsdialog.h
 2017-09-03 22:05:54 +02:00
Jean Vincent
72535ecf48 Make member variable names, & placement and * placement more coherent 
Summary:
Change all member variables to the form m_fooBar because it is the preferred form in Qt (it was half and half between this and mFooBar, and a minority didn't have anything).
Place all references and pointers on the side of the type since it is the majority.

Basically:
 - mFoo -> m_foo
 - foo -> m_foo (if it is a member variable)
 - Type &ref -> Type& ref
 - Type *ptr -> Type* ptr

Reviewers: #kde_connect, nicolasfella, albertvaka

Reviewed By: #kde_connect, nicolasfella, albertvaka

Subscribers: albertvaka, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D7312
 2017-09-03 21:45:08 +02:00
l10n daemon script
dadcc76841 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-06 06:02:06 +02:00
l10n daemon script
0356908fc8 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-06 04:42:32 +02:00
l10n daemon script
cc43a72884 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-07-14 05:43:50 +02:00
l10n daemon script
36269e6506 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-06-20 04:26:54 +02:00
l10n daemon script
0d217c58e1 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-05-27 04:22:53 +02:00
Aleix Pol
d42a65e621 Change how we specify devices 2017-05-18 11:45:28 +02:00
Aleix Pol
51c4eb68c6 Port to kirigami 2.0 2017-05-09 11:41:55 +02:00
Albert Vaca
bc0b182708 Name of the app 2017-02-08 14:58:31 +01:00
l10n daemon script
805c813537 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-02-03 06:09:47 +01:00
l10n daemon script
fd64a8bcc7 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-01-06 05:54:14 +01:00
l10n daemon script
e6a7df25aa 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"
 2016-12-20 12:45:03 +01:00
Albert Vaca
6a2a0b1c76 Merge branch '1.x' 
# Conflicts:
#	plugins/mpriscontrol/mpriscontrolplugin.cpp
#	plugins/sendnotifications/kdeconnect_sendnotifications.json
 2016-11-26 16:40:24 +01:00
Albert Vaca
60331ccbf1 Clazy says all this QStringLiteral and QLatin1String were missing/wrong 2016-11-26 16:21:29 +01:00
l10n daemon script
b4e008847a 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"
 2016-11-25 04:58:17 +01:00
l10n daemon script
73c6e1a306 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"
 2016-11-24 05:29:38 +01:00
l10n daemon script
f0eb32c350 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"
 2016-10-19 09:02:51 +00:00
l10n daemon script
3be06839a8 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"
 2016-10-11 13:08:45 +00:00
l10n daemon script
ec0ca3976d 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"
 2016-09-29 12:27:06 +00:00
l10n daemon script
2664b99864 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"
 2016-08-30 10:03:14 +00:00
Albert Vaca
5ad007a981 Merge branch '1.x' 2016-08-29 20:46:48 +02:00
Aleix Pol
d9e7f308c2 Show the announcedName in the qml app 
Makes it possible to display it and modify it
Introduces a DBusProperty component that can be used if we don't want
to go through the QtDBus property generation hell.
 2016-08-21 19:38:15 +02:00
Aleix Pol
b69247b4e5 Don't force the creation of a DeviceInterface for every pluginchecker 
Create one per device and share it
 2016-08-21 18:57:27 +02:00
Aleix Pol
d84a1a108b Mark the current section 2016-08-21 18:45:49 +02:00
Aleix Pol
bbf33f69a6 Use actions rather than visual elements 2016-08-21 17:55:13 +02:00
Aleix Pol
aef02c0cce Add findmyphone 2016-08-21 17:54:25 +02:00
Aleix Pol
64e0250d99 Properly case unpair 2016-08-21 17:54:15 +02:00
Aleix Pol
a89634c2b6 Don't show unavailable plugins 2016-08-21 17:53:58 +02:00
Aleix Pol
f654e75820 Improve how we handle the different plugin pages 2016-08-21 13:05:43 +02:00
l10n daemon script
1e574d18e3 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"
 2016-08-19 09:28:59 +00:00
l10n daemon script
ae766f5839 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"
 2016-08-04 12:30:52 +00:00
l10n daemon script
60c3bf9b90 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"
 2016-06-22 16:33:04 +00:00
Aleix Pol
70b6e5f804 Implement PluginChecker for plugin availability 2016-06-12 22:31:09 +02:00
Aleix Pol
fb8f468535 Unify naming with the Android client 2016-06-08 18:39:16 +02:00
Aleix Pol
e30a2d6bcf Move some of the options into the ContextDrawer 2016-06-08 18:38:48 +02:00
Aleix Pol
794e8c6904 Make the app work a bit more like the Android version 2016-06-08 18:37:57 +02:00
Aleix Pol
d6eb2d07bc Port the experimental application to kirigami 2016-06-06 01:21:37 +02:00
Aleix Pol
cc3f16ef34 Remove unneeded level of depth 2016-06-06 01:21:37 +02:00
l10n daemon script
f6724de704 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"
 2016-02-14 09:18:22 +00:00
l10n daemon script
5eb9a54bcc 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"
 2016-02-05 09:16:28 +00:00
l10n daemon script
fc2bd97e69 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"
 2015-11-17 12:54:36 +00:00
l10n daemon script
f92534583d 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"
 2015-11-13 10:40:06 +00:00
l10n daemon script
0145c837db 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"
 2015-11-11 10:30:30 +00:00
l10n daemon script
e424bcec1a 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"
 2015-11-04 17:00:05 +00:00
l10n daemon script
633952b638 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"
 2015-10-27 12:30:00 +00:00
l10n daemon script
dda5ec5385 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"
 2015-10-26 03:37:32 +00:00
l10n daemon script
4239b0525b 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"
 2015-10-25 03:57:27 +00:00
l10n daemon script
9f291d9ef7 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"
 2015-10-02 10:15:24 +00:00
l10n daemon script
f9db1e0fa5 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"
 2015-09-22 12:23:31 +00:00
l10n daemon script
d42bcb25a2 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"
 2015-09-19 11:56:19 +00:00
l10n daemon script
933cbd5bfd 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"
 2015-09-13 10:31:01 +00:00
l10n daemon script
5795e27191 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"
 2015-09-10 11:33:23 +00:00
l10n daemon script
af97d4476c 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"
 2015-09-08 12:50:45 +00:00
Aleix Pol
661d4579fc Merge branch 'stable' 2015-09-07 17:45:33 +02:00
Martin Gräßlin
cc148cea89 Setup KDeclarative before loading the Qml file 
Otherwise methods injected into the engine by KDeclarative are not
available in the loaded qml.

REVIEW: 124419
 2015-09-07 17:42:19 +02:00
Martin Gräßlin
e462c386cf Adjust application name to match desktop file 
The desktop file is called org.kde.kdeconnect.app - this needs to
be respected in the application name. This is a requirement to match
application windows to applications on Wayland. With a not-matching
name the compositor is not able to show a window icon.

REVIEW: 124418
 2015-09-07 17:40:50 +02:00
Aleix Pol
d41eab2fae add i18n for consistency 2015-09-07 15:03:04 +02:00
l10n daemon script
e6a759a071 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"
 2015-09-01 12:31:29 +00:00
Aleix Pol
a2aa2ab72b Fix qml touchpad interface 
On release, forget about the last position
 2015-08-07 15:02:36 +02:00
Martin Gräßlin
208cc573d2 [app] Add a title on the ApplicationWindow 
Without a title, it's not possible to identify the window on Wayland.
E.g. KWin doesn't have a title for the application in Present Windows
or application switchers filtering it out.

REVIEW: 124417
 2015-07-22 15:50:20 +02:00
Martin Gräßlin
56b6c019dc [app] Do not runtime depend on Qt 5.5 
Reviewed-By: apol
 2015-07-22 12:06:49 +02:00
Aleix Pol
be2a3252c2 Make it possible to lock the screen from KDE Connect 
Connects to freedesktop ScreenSaver interface and un/locks it upon request.

REVIEW: 124170
 2015-07-22 03:37:34 +02:00
Aleix Pol
058f7c7c90 Implement the touchpad forwarding into kcapp 
This way the computer's cursor can be controlled from the device. Keyboard
is not yet implemented.
 2015-07-22 03:21:28 +02:00
Aleix Pol
2b844e59da Improve app mpris interface 2015-07-19 22:20:47 +02:00
l10n daemon script
f86c5e4a4c 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"
 2015-07-03 10:06:32 +00:00
l10n daemon script
7d514bdd29 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"
 2015-06-30 13:47:48 +00:00
l10n daemon script
f075da1eab 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"
 2015-06-29 10:29:47 +00:00
l10n daemon script
320779b719 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"
 2015-06-25 10:38:53 +00:00
Aleix Pol
6d83827b18 Don't rely on Q_PROPERTY if we're inheriting QDBusAbstractInterfaceBase 
See bug:
https://bugreports.qt.io/browse/QTBUG-46858
 2015-06-25 04:08:00 +02:00
l10n daemon script
69d8a40aa6 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"
 2015-06-24 10:38:32 +00:00
Aleix Pol
d6c779c938 improve navigation button usability 2015-06-24 00:36:57 +02:00
Aleix Pol
c7055cfe15 Adapt to changes in DevicesModel 2015-06-22 06:47:31 +02:00
Aleix Pol
9f4d837b22 Adapt to changes in DevicesModel 2015-06-22 06:45:18 +02:00
l10n daemon script
d8b3d829e4 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"
 2015-06-20 11:56:14 +00:00
l10n daemon script
7fb21dec12 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"
 2015-06-19 10:41:31 +00:00
Aleix Pol
d741465473 Make it possible to go back from any page by having a back button on the toolbar 2015-06-19 07:22:00 +02:00
Aleix Pol
46b57003cd Display the device model section 
This way we can differentiate between the different states
 2015-06-19 07:14:02 +02:00
Aleix Pol
4654a61a5f Fix icon placing in the DeviceDelegate 2015-06-19 07:13:04 +02:00
l10n daemon script
700eff446e 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"
 2015-06-18 11:49:24 +00:00
Aleix Pol
5c79e8a7a6 Implement an MPRIS client plugin 
Makes it possible to control remote MPRIS instances.

REVIEW: 124100
 2015-06-18 04:01:01 +02:00
l10n daemon script
0899923dbc 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"
 2015-06-16 13:33:29 +00:00
l10n daemon script
d4074b42fa 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"
 2015-06-15 09:58:46 +00:00