l10n daemon script
16526b39a7
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-11 07:56:00 +01:00
l10n daemon script
0f68d6efc7
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-23 07:36:38 +01:00
l10n daemon script
a05ab9f841
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-02 05:47:37 +01:00
Albert Vaca
f41883f2f3
Known size, reserve.
2016-11-26 16:36:34 +01:00
Albert Vaca
60331ccbf1
Clazy says all this QStringLiteral and QLatin1String were missing/wrong
2016-11-26 16:21:29 +01:00
Albert Vaca
a1340c8042
Fixed old style connects with clazy
2016-11-26 15:14:19 +01:00
l10n daemon script
63dad0e8da
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 06:37:24 +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
Albert Vaca
6124e5273f
Merge branch 'master' (early part) into 1.x
...
# Conflicts:
# plugins/kdeconnect.notifyrc
# plugins/remotecommands/kdeconnect_remotecommands.json
# plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
# plugins/telephony/kdeconnect_telephony.json
2016-11-23 17:29:26 +01:00
l10n daemon script
c2fa1d6400
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-05 12:37:37 +00:00
l10n daemon script
760c2a8a7e
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-28 11:59:13 +00:00
l10n daemon script
77756ed73e
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-28 09:28:09 +00:00
l10n daemon script
cea97ef8b5
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-24 12:05:32 +00:00
l10n daemon script
abd5d5940f
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-20 12:06:29 +00:00
l10n daemon script
a3235189bc
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-20 09:38:58 +00:00
l10n daemon script
e0f8c4a6ac
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 11:29:39 +00: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
Albert Vaca
c847c99f5a
Merge branch 'master' into 1.x
...
# Conflicts:
# plugins/findmyphone/kdeconnect_findmyphone.json
# plugins/notifications/kdeconnect_notifications.json
# plugins/remotecommands/kdeconnect_remotecommands.json
# plugins/runcommand/kdeconnect_runcommand.json
# plugins/runcommand/kdeconnect_runcommand_config.desktop
# plugins/sftp/kdeconnect_sftp.json
2016-10-18 13:14:22 +02:00
l10n daemon script
5ad75b46f8
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-18 09:57:30 +00:00
l10n daemon script
63182c205c
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-17 09:29:24 +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
258a844588
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 10:30:54 +00:00
l10n daemon script
f6b501c2c9
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-08 09:56:21 +00:00
l10n daemon script
9dba2c6e9a
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-07 09:29:34 +00:00
Burkhard Lück
4c83b45422
fix warning in json file, Scripty seems to be very pedantic here
2016-10-06 20:46:13 +02:00
l10n daemon script
7ac6543c61
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-30 09:37:19 +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
Albert Vaca
0dbaceafa3
Merge branch 'master' into 1.x
...
# Conflicts:
# plugins/battery/kdeconnect_battery.json
# plugins/clipboard/kdeconnect_clipboard.json
# plugins/findmyphone/kdeconnect_findmyphone.json
# plugins/kdeconnect.notifyrc
# plugins/lockdevice/kdeconnect_lockdevice.json
# plugins/mousepad/kdeconnect_mousepad.json
# plugins/mpriscontrol/kdeconnect_mpriscontrol.json
# plugins/mprisremote/kdeconnect_mprisremote.json
# plugins/notifications/kdeconnect_notifications.json
# plugins/pausemusic/kdeconnect_pausemusic.json
# plugins/ping/kdeconnect_ping.json
# plugins/remotecommands/kdeconnect_remotecommands.json
# plugins/remotecontrol/kdeconnect_remotecontrol.json
# plugins/runcommand/kdeconnect_runcommand.json
# plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
# plugins/sendnotifications/kdeconnect_sendnotifications.json
# plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
# plugins/sftp/kdeconnect_sftp.json
# plugins/share/kdeconnect_share.json
# plugins/telephony/kdeconnect_telephony.json
2016-09-29 10:53:29 +02:00
l10n daemon script
167fd6cf59
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-28 11:51:45 +00:00
l10n daemon script
0423d6e5f7
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-25 12:01:18 +00:00
l10n daemon script
a8834dcbc3
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-21 11:54:11 +00:00
l10n daemon script
e884c4a9ac
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-18 09:32:51 +00:00
l10n daemon script
36f672beb8
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-14 11:52:55 +00:00
l10n daemon script
2d56c59386
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-14 09:17:50 +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
Holger Kaelberer
c122312c65
sendnotifications: also sync icon-data from notfication hints
...
According to the priorities defined in the notifications spec
version 1.2
REVIEW: 126722
2016-08-27 13:59:25 +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
8a2c59d5d7
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-14 11:54:14 +00:00
l10n daemon script
83c20daf30
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-13 12:14:28 +00:00
l10n daemon script
3215661fec
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-11 12:17:31 +00:00
l10n daemon script
89b61e03f5
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-10 11:53:40 +00:00
l10n daemon script
2058cbc1af
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-08 11:56:08 +00:00
l10n daemon script
fa1233b051
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-06 12:40:34 +00:00
l10n daemon script
9788f8f96b
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-05 11:37:14 +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
Albert Vaca
5933c6810c
More unused includes cleanup
2016-07-05 14:27:53 +02: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
f9406e8afc
Introduce QVariantMap as an argument of NetworkPackage
...
Makes it possible to specify the different properties sent at once,
rather than one by one as we used to do.
Also port whenever possible to the initializer-list syntax.
REVIEW: 128269
2016-06-21 20:07:12 +02:00
Albert Vaca
e880e14ed5
Preffer Q_FOREACH to foreach
2016-06-21 14:50:17 +02:00