X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=inline;f=src%2Fcommon%2Fmain.cpp;h=f6da8f577edefb8f74eca9a57cbb09b65dffa949;hb=0b881e26eb5d741effae4a8096b319c9f5bcd462;hp=00d7c86ecb2e4f84b79382e19fa64a1fa93a0ab8;hpb=d6b056e936ec441258d291b7a8af7b83f9f53016;p=quassel.git

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 00d7c86e..f6da8f57 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -76,15 +76,15 @@ int main(int argc, char **argv) {
   QApplication app(argc, argv);
 #endif
 
-  //Just for testing
-  //QTranslator translator;
-  //translator.load(":i18n/quassel_de");
-  //app.installTranslator(&translator);
+  // Set up i18n support
+  QLocale locale = QLocale::system();
+  QTranslator translator;
+  translator.load(QString(":i18n/quassel_%1").arg(locale.name()));
+  app.installTranslator(&translator);
 
-            
   QCoreApplication::setOrganizationDomain("quassel-irc.org");
   QCoreApplication::setApplicationName("Quassel IRC");
-  QCoreApplication::setOrganizationName("Quassel IRC Development Team");
+  QCoreApplication::setOrganizationName("Quassel IRC Development Team");  // FIXME
 
 #ifndef BUILD_QTUI
   Core::instance();  // create and init the core
@@ -98,8 +98,18 @@ int main(int argc, char **argv) {
   gui->init();
 #endif
 
+#ifndef BUILD_QTUI
+  if(!QCoreApplication::arguments().contains("--norestore")) {
+    Core::restoreState();
+  }
+#endif
+
   int exitCode = app.exec();
 
+#ifndef BUILD_QTUI
+  Core::saveState();
+#endif
+
 #ifndef BUILD_CORE
   // the mainWin has to be deleted before the Core
   // if not Quassel will crash on exit under certain conditions since the gui