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

40 commits

Author SHA1 Message Date
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
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
l10n daemon script
4ed16c9f49 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-17 10:08:57 +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
l10n daemon script
e31eed3243 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-13 11:32:14 +00:00
l10n daemon script
a0fdfe9c31 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-12 10:28:51 +00:00
l10n daemon script
2e5b8ae265 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-10 10:43:22 +00:00
l10n daemon script
e890207d07 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-09 14:10:28 +00:00
Markus S
44965f5157 Unify desktop files 
and bring it in line with official KDE brand guidelines
 2015-06-08 20:37:24 -07: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
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
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
Albert Vaca
d8a2aac952 Merge branch 'master' into frameworks 2015-03-01 21:33:47 -08:00
l10n daemon script
5f0811dff8 SVN_SILENT made messages (.desktop file) 2015-02-21 04:46:14 +00:00
Albert Vaca
dcfec8c593 Merge branch 'master' into frameworks 2015-02-03 19:05:12 -08:00
Albert Vaca
438f9a1846 Added a menu entry for the KCM in non-kde desktops 2015-01-30 22:22:37 -08: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
Aleix Pol
21ab5a4f81 Merge branch 'master' into frameworks 
Mostly kDebug -> qCDebug
Also some KCmdLineArgs -> QCommandLineParser

Conflicts:
	cli/kdeconnect-cli.cpp
	core/CMakeLists.txt
	core/backends/lan/lanlinkprovider.cpp
	core/daemon.cpp
	core/pluginloader.cpp
	interfaces/CMakeLists.txt
	kio/kiokdeconnect.cpp
	plugins/mousepad/CMakeLists.txt
	plugins/mousepad/mousepadplugin.h
	plugins/mpriscontrol/mpriscontrolplugin.cpp
	plugins/sftp/sftpplugin.cpp
 2014-11-04 19:12:29 +01:00
l10n daemon script
3b192ea18e SVN_SILENT made messages (.desktop file) 2014-11-02 04:01:28 +00:00
Elias Probst
0b67371b11 Correct kcmshell version in desktop files (4 → 5). 
REVIEW: 119856
 2014-08-20 14:58:48 +02:00
l10n daemon script
c23b83ea09 SVN_SILENT made messages (.desktop file) 2014-06-19 04:30:11 +00:00
l10n daemon script
c641fd50c0 SVN_SILENT made messages (.desktop file) 2014-06-04 04:19:06 +00:00
l10n daemon script
ab3d38d677 SVN_SILENT made messages (.desktop file) 2014-05-31 04:21:12 +00:00
l10n daemon script
fe7763026d SVN_SILENT made messages (.desktop file) 2014-04-20 04:38:36 +00:00
l10n daemon script
13970fed8b SVN_SILENT made messages (.desktop file) 2014-03-26 04:43:05 +00:00
l10n daemon script
b6475a8d37 SVN_SILENT made messages (.desktop file) 2014-03-24 04:36:04 +00:00
l10n daemon script
bb28de3373 SVN_SILENT made messages (.desktop file) 2014-03-18 05:07:34 +00:00
l10n daemon script
b3bfb41f29 SVN_SILENT made messages (.desktop file) 2014-03-10 04:46:57 +00:00
l10n daemon script
5290189811 SVN_SILENT made messages (.desktop file) 2014-03-05 04:38:53 +00:00
l10n daemon script
24c4a6ab44 SVN_SILENT made messages (.desktop file) 2014-03-02 05:38:29 +00:00
l10n daemon script
197405887f SVN_SILENT made messages (.desktop file) 2014-02-24 04:39:11 +00:00
Albert Vaca
29719ccce5 New icon by Malcer <malcer@gmx.com> 2014-02-19 21:10:41 +01:00
Albert Vaca
52e822ef28 That was an "additional category" and we need a "main category" 2014-02-19 19:12:45 +01:00
Albert Vaca
b679c4e2df Fixed desktop file because ubuntu was complaining about it 2014-02-19 17:48:02 +01:00
l10n daemon script
0ec9ea1706 SVN_SILENT made messages (.desktop file) 2014-02-19 05:17:04 +00:00
l10n daemon script
22f34ecde1 SVN_SILENT made messages (.desktop file) 2014-02-17 04:41:38 +00:00
l10n daemon script
cf65ef9fc7 SVN_SILENT made messages (.desktop file) 2014-02-16 06:56:20 +00:00
l10n daemon script
ffba8bedc3 SVN_SILENT made messages (.desktop file) 2014-02-15 04:22:13 +00:00
Rohan Garg
a14517a486 Add a desktop file so that app-install-data can pick it up and display 
it on software center's

REVIEWED-BY: Albert Vaca <albertvaka@gmail.com>
 2014-02-14 20:40:08 +01:00