From 91d99cb58e47d64934ce47053d22981f184db0cc Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 26 Nov 2013 22:03:01 +0100
Subject: [PATCH] csac

---
 src/core/defs.h.in       |  1 -
 src/gui/formmain.ui      | 42 +++++++++++++++++++++++++++++++++++++---
 src/gui/formsettings.cpp |  2 --
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/core/defs.h.in b/src/core/defs.h.in
index dd132f8a6..a5718762c 100644
--- a/src/core/defs.h.in
+++ b/src/core/defs.h.in
@@ -44,7 +44,6 @@
 #define APP_CFG_CUTS        "keyboard"
 #define APP_CFG_BROWSER     "browser"
 
-#define APP_HTML_MARKUP     "styled_pattern.html"
 #define APP_PREFIX          "@CMAKE_INSTALL_PREFIX@"
 #define APP_REVISION        "@APP_REVISION@"
 
diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui
index 01b35e62c..e5cdd321d 100644
--- a/src/gui/formmain.ui
+++ b/src/gui/formmain.ui
@@ -186,7 +186,7 @@
     <string>Add tab</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Shift+T</string>
+    <string notr="true">Ctrl+Shift+T</string>
    </property>
   </action>
   <action name="m_actionCloseAllTabs">
@@ -197,7 +197,7 @@
     <string>Close all tabs except current one</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Shift+O</string>
+    <string notr="true">Ctrl+Shift+O</string>
    </property>
   </action>
   <action name="m_actionCloseCurrentTab">
@@ -205,7 +205,7 @@
     <string>Close current &amp;tab</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Shift+C</string>
+    <string notr="true">Ctrl+Shift+C</string>
    </property>
   </action>
   <action name="m_actionNoActions">
@@ -229,6 +229,9 @@
    <property name="toolTip">
     <string>Update all feeds.</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="m_actionUpdateSelectedFeeds">
    <property name="text">
@@ -237,6 +240,9 @@
    <property name="toolTip">
     <string>Update selected feeds/categories.</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="m_actionEditSelectedFeed">
    <property name="text">
@@ -245,6 +251,9 @@
    <property name="toolTip">
     <string>Edit selected feed/category.</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="m_actionDeleteSelectedFeeds">
    <property name="text">
@@ -253,6 +262,9 @@
    <property name="toolTip">
     <string>Delete selected feeds/categories.</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="m_actionMarkSelectedMessagesAsRead">
    <property name="text">
@@ -261,6 +273,9 @@
    <property name="toolTip">
     <string>Mark selected messages as read.</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="m_actionMarkSelectedMessagesAsUnread">
    <property name="text">
@@ -269,6 +284,9 @@
    <property name="toolTip">
     <string>Mark selected messages as unread.</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="m_actionSwitchImportanceOfSelectedMessages">
    <property name="text">
@@ -277,31 +295,49 @@
    <property name="toolTip">
     <string>Switch importance of selected messages.</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="m_actionMarkFeedsAsRead">
    <property name="text">
     <string>Mark selected as read</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="m_actionMarkAllMessagesAsRead">
    <property name="text">
     <string>Mark &amp;all messages read</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="m_actionMarkAllMessagesAsUnread">
    <property name="text">
     <string>Mark a&amp;ll messages unread</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="m_actionDeleteSelectedMessages">
    <property name="text">
     <string>&amp;Delete selected messages</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="m_actionDeleteAllMessages">
    <property name="text">
     <string>Dele&amp;te all messages</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
  </widget>
  <customwidgets>
diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp
index b981ecbb9..d119e3791 100644
--- a/src/gui/formsettings.cpp
+++ b/src/gui/formsettings.cpp
@@ -27,7 +27,6 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form
   // Setup behavior.
   m_ui->m_treeLanguages->setColumnCount(5);
   m_ui->m_treeLanguages->setHeaderHidden(false);
-
   m_ui->m_treeLanguages->setHeaderLabels(QStringList()
                                          << tr("Language")
                                          << tr("Code")
@@ -37,7 +36,6 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form
 
   m_ui->m_treeSkins->setColumnCount(4);
   m_ui->m_treeSkins->setHeaderHidden(false);
-
   m_ui->m_treeSkins->setHeaderLabels(QStringList()
                                      << tr("Name")
                                      << tr("Version")