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