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

197 commits

Author SHA1 Message Date
l10n daemon script
66e77997d6 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-25 06:09:45 +02:00
Albert Vaca
ef0e80c91f Merge branch 'master' into 1.x 
# Conflicts:
#	indicator/org.kde.kdeconnect.nonplasma.desktop
#	org.kde.kdeconnect.kcm.appdata.xml
#	plugins/runcommand/kdeconnect_runcommand.json
#	urlhandler/org.kde.kdeconnect.telhandler.desktop
 2017-07-24 16:49:06 +02:00
l10n daemon script
aa30780329 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-19 08:33:01 +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
c070b4d445 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-04 04:17:49 +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
l10n daemon script
eddcaddaea 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-15 04:33:11 +02:00
l10n daemon script
4626df02fa 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-04-14 03:55:22 +02:00
l10n daemon script
8c6f7582e2 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 06:03:33 +01:00
l10n daemon script
f935af6903 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 05:43:26 +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
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
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
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
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
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
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
l10n daemon script
e55be85cf5 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-13 10:44:25 +00:00
l10n daemon script
6e17178c0f 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-03-04 09:11:29 +00:00
l10n daemon script
c2ff5c5101 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-03-03 09:54:08 +00:00
l10n daemon script
2c88a0ab39 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-27 09:28:44 +00:00
l10n daemon script
1dbadf133a 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-24 09:10:43 +00:00
l10n daemon script
5df0923b22 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-22 10:51:54 +00: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
7f668b59a3 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-13 09:43:43 +00:00
l10n daemon script
024c1d0860 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-09 10:33:53 +00:00
l10n daemon script
770c356371 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-08 13:39:47 +00:00
l10n daemon script
4b57abd556 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-06 09:47:03 +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
Albert Vaca
95622ded12 Typo 
BUG: 358972
 2016-02-04 03:55:53 -08:00
l10n daemon script
7558fdd93c 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-22 09:53:09 +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
d33800a748 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-17 11:59:25 +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
l10n daemon script
397e6f69e3 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-05-26 13:51:37 +00:00
l10n daemon script
ab93807baf 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-05-25 10:12:32 +00:00
l10n daemon script
aa91c6bbd6 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-04-10 10:24:31 +00:00
l10n daemon script
8349588c77 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-04-06 09:54:12 +00:00
l10n daemon script
8e729f3ab2 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-04-04 11:03:11 +00:00
l10n daemon script
ff9d6b336b 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-04-03 10:36:58 +00:00
l10n daemon script
cda092d2bb 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-03-31 13:16:15 +00:00
l10n daemon script
92cd693566 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-03-29 09:58:52 +00:00
l10n daemon script
98bb1ee564 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-03-27 09:50:58 +00:00
l10n daemon script
2cb090d2c9 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-03-26 10:12:56 +00:00
l10n daemon script
08eaaf11e1 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-03-25 09:09:47 +00:00
l10n daemon script
d1d2677746 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-03-23 04:18:37 +00:00
l10n daemon script
c66fe08382 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-03-22 04:16:27 +00:00
l10n daemon script
4060e048f5 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-03-21 04:21:58 +00:00
l10n daemon script
f8ba80c7f3 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-03-20 04:31:37 +00:00
Aleix Pol
ccf03f16d1 Merge branch 'frameworks' to master 
The last version using qt/kde4 was moved into the kde4 branch.

CCMAIL: kdeconnect@kde.org
 2015-03-19 17:23:27 +01:00
l10n daemon script
b2349f99dd SVN_SILENT made messages (.desktop file) 2015-03-09 04:16:29 +00:00
Albert Vaca
d8a2aac952 Merge branch 'master' into frameworks 2015-03-01 21:33:47 -08:00
l10n daemon script
ffe8a0c2d6 SVN_SILENT made messages (.desktop file) 2015-02-25 04:21:00 +00:00
Albert Vaca
dcfec8c593 Merge branch 'master' into frameworks 2015-02-03 19:05:12 -08:00
l10n daemon script
93ceecf1bd SVN_SILENT made messages (.desktop file) 2015-02-01 04:01:24 +00:00
Kai Uwe Broulik
930c107f7b Cleanup notifications 
Use iconName instead of sending a fixed-size pixmap around, fix wording and use title
capitalization, more meaningful names in notifyrc, QStringLiteral and new style connect.

REVIEW: 122121
 2015-01-18 01:53:20 +01:00
l10n daemon script
a2b04c3f25 SVN_SILENT made messages (.desktop file) 2015-01-03 03:53:09 +00:00
l10n daemon script
73e3a1d683 SVN_SILENT made messages (.desktop file) 2015-01-02 04:06:52 +00:00
l10n daemon script
5baab6c7a9 SVN_SILENT made messages (.desktop file) 2014-12-31 04:00:47 +00:00
l10n daemon script
917104ff99 SVN_SILENT made messages (.desktop file) 2014-12-26 04:20:08 +00:00
l10n daemon script
365b2c55b2 SVN_SILENT made messages (.desktop file) 2014-12-25 04:06:46 +00:00
l10n daemon script
bba11e7978 SVN_SILENT made messages (.desktop file) 2014-12-10 03:58:34 +00:00
l10n daemon script
77748fd2ff SVN_SILENT made messages (.desktop file) 2014-11-28 04:14:57 +00:00
l10n daemon script
955f0dbd13 SVN_SILENT made messages (.desktop file) 2014-11-21 04:13:59 +00:00
l10n daemon script
f93be0b2fe SVN_SILENT made messages (.desktop file) 2014-11-18 04:36:09 +00:00
l10n daemon script
f58591d6f7 SVN_SILENT made messages (.desktop file) 2014-11-17 04:06:25 +00:00
l10n daemon script
6ef641ab0f SVN_SILENT made messages (.desktop file) 2014-11-16 04:14:23 +00:00
l10n daemon script
e15af622b7 SVN_SILENT made messages (.desktop file) 2014-11-15 04:11:51 +00:00
l10n daemon script
b3661c5480 SVN_SILENT made messages (.desktop file) 2014-11-14 04:16:16 +00:00
l10n daemon script
fa0b22f89f SVN_SILENT made messages (.desktop file) 2014-11-13 04:06:07 +00:00
l10n daemon script
4478db8dce SVN_SILENT made messages (.desktop file) 2014-11-12 04:10:17 +00:00
Albert Vaca
7d3fe6239c Updating .notifyrc file 2014-11-09 20:36:45 -08:00
Renamed from kded/kdeconnect.notifyrc (Browse further)