Merge branch 'master' of git.calculate.ru:calculate2/calculate-client

14 years ago · 5732ab237f
parent c5d38c84f7 55f06f7446
commit 5732ab237f
2 changed files with 13 additions and 0 deletions
--- a/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kglobalshortcutsrc
+++ b/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kglobalshortcutsrc
@ -0,0 +1,10 @@
+# Calculate format=kde
+[kopete]
+ReadMessage=Ctrl+`,Ctrl+Shift+I,Прочитать сообщение
+
+[krunner]
+Lock Session=ScrollLock,Ctrl+Alt+L,Заблокировать сеанс
+
+[plasma]
+Activate Блокирование/Выход Widget=none,ScrollLock,Блокирование/Выход
+
--- a/client-profiles/30-gnome-2.6/.local/share/applications/gfloppy.desktop
+++ b/client-profiles/30-gnome-2.6/.local/share/applications/gfloppy.desktop
@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/gfloppy.desktop mirror
+[Desktop Entry]
+NoDisplay=true