From 1d669124882e0ca296c0b789d9ffc85bd4fe9f07 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 28 Feb 2014 07:42:16 +0100
Subject: [PATCH] Fixed bug with saving/restoring shortcuts on multilingual
 setup.

---
 src/core/dynamicshortcuts.cpp | 6 +++---
 src/main.cpp                  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/core/dynamicshortcuts.cpp b/src/core/dynamicshortcuts.cpp
index fc2fd5fcf..d0eab8f26 100644
--- a/src/core/dynamicshortcuts.cpp
+++ b/src/core/dynamicshortcuts.cpp
@@ -32,7 +32,7 @@ void DynamicShortcuts::save(const QList<QAction *> actions) {
   foreach (QAction *action, actions) {
     settings->setValue(APP_CFG_CUTS,
                        action->objectName(),
-                       action->shortcut().toString(QKeySequence::NativeText));
+                       action->shortcut().toString(QKeySequence::PortableText));
   }
 }
 
@@ -42,8 +42,8 @@ void DynamicShortcuts::load(const QList<QAction *> actions) {
   foreach (QAction *action, actions) {
     QString shortcut_for_action = settings->value(APP_CFG_CUTS,
                                                   action->objectName(),
-                                                  action->shortcut().toString(QKeySequence::NativeText)).toString();
+                                                  action->shortcut().toString(QKeySequence::PortableText)).toString();
     action->setShortcut(QKeySequence::fromString(shortcut_for_action,
-                                                 QKeySequence::NativeText));
+                                                 QKeySequence::PortableText));
   }
 }
diff --git a/src/main.cpp b/src/main.cpp
index 2c9f07e79..c3f3708a7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -83,7 +83,6 @@ int main(int argc, char *argv[]) {
   SkinFactory::instance()->loadCurrentSkin();
 
   // Load localization and setup locale before any widget is constructed.
-  //LoadLocalization();
   Localization::instance()->load();
 
   // These settings needs to be set before any QSettings object.