Updates to error screen

startsession/errordialog.cpp

@@ -48,29 +48,22 @@ ErrorDialog::ErrorDialog(bool started, int errorCount, QString output, QWidget *
         ui->backtrace->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
     }
 
-    ui->errorIcon->setPixmap(QIcon(":/icons/error.svg").pixmap(128 * theLibsGlobal::instance()->getDPIScaling(), 128 * theLibsGlobal::instance()->getDPIScaling()));
+    ui->errorIcon->setPixmap(QIcon(":/icons/error.svg").pixmap(SC_DPI(128), SC_DPI(128)));
     if (started) {
-        if (errorCount >= 3) {
+        ui->titleLabel->setText(tr("Well, this is bad."));
-            ui->restartButton->setVisible(false);
+        ui->errorLabel->setText(tr("theShell ran into an unrecoverable error."));
-            ui->titleLabel->setText(tr("Unfortunately, theShell keeps running into errors."));
+        ui->restartButton->setText(tr("Restart theShell"));
-            ui->repeatFrame->setVisible(true);
-            ui->errorLabel->setVisible(false);
-            //ui->errorLabel->setText(tr("theShell keeps running into errors."));
-        } else {
-            ui->repeatFrame->setVisible(false);
-        }
     } else {
-        if (errorCount >= 3) {
+        ui->titleLabel->setText(tr("theShell failed to start"));
-            ui->restartButton->setVisible(false);
+        ui->errorLabel->setText(tr("theShell wasn't able to start properly."));
-            ui->titleLabel->setText(tr("theShell can't start"));
+        ui->restartButton->setText(tr("Try again"));
-            ui->repeatFrame->setVisible(true);
+    }
-            ui->errorLabel->setVisible(false);
+
-        } else {
+    if (errorCount >= 3) {
-            ui->repeatFrame->setVisible(false);
+        ui->repeatFrame->setVisible(true);
-            ui->titleLabel->setText(tr("theShell failed to start"));
+        ui->errorLabel->setVisible(false);
-            ui->errorLabel->setText(tr("theShell wasn't able to start properly."));
+    } else {
-            ui->restartButton->setText(tr("Try again"));
+        ui->repeatFrame->setVisible(false);
-        }
     }
 
     ui->logoutButton->setProperty("type", "destructive");
@@ -121,6 +114,6 @@ void ErrorDialog::on_resetTSButton_clicked()
         QSettings("theSuite", "theShell").clear();
 
         ui->resetTSButton->setEnabled(false);
-        ui->resetTSButton->setText("Settings reset successfully");
+        ui->resetTSButton->setText(tr("Settings reset successfully"));
     }
 }

startsession/errordialog.ui

@@ -76,7 +76,7 @@
           </font>
          </property>
          <property name="text">
-          <string>Well, this is bad.</string>
+          <string notr="true">Well, this is bad.</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -86,7 +86,7 @@
        <item>
         <widget class="QLabel" name="errorLabel">
          <property name="text">
-          <string>theShell ran into an unrecoverable error.</string>
+          <string notr="true">theShell ran into an unrecoverable error.</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -159,7 +159,7 @@
                <item>
                 <widget class="QLabel" name="label">
                  <property name="text">
-                  <string>- Try resetting theShell. This will reset theShell back to its default state.</string>
+                  <string>· Try resetting theShell. This will reset theShell back to its default state.</string>
                  </property>
                  <property name="wordWrap">
                   <bool>true</bool>
@@ -182,14 +182,14 @@
              <item>
               <widget class="QLabel" name="label_5">
                <property name="text">
-                <string>- Try reinstalling or rebuilding theShell.</string>
+                <string>· Try reinstalling or rebuilding theShell.</string>
                </property>
               </widget>
              </item>
              <item>
               <widget class="QLabel" name="label_6">
                <property name="text">
-                <string>- Try reinstalling any dependencies of theShell.</string>
+                <string>· Try reinstalling any dependencies of theShell.</string>
                </property>
               </widget>
              </item>

statuscenter/OverviewPane/overviewsettings.ui

@@ -71,7 +71,7 @@
      <item row="1" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
-        <string>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</string>
+        <string>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</string>
        </property>
        <property name="wordWrap">
         <bool>true</bool>
@@ -81,7 +81,7 @@
      <item row="0" column="0">
       <widget class="QCheckBox" name="weatherCheckBox">
        <property name="text">
-        <string>Show weather for current location (coming soon)</string>
+        <string>Show weather for current location</string>
        </property>
       </widget>
      </item>

statuscenter/OverviewPane/translations/au_AU.ts

@@ -95,12 +95,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/cy_GB.ts

@@ -95,12 +95,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/da_DK.ts

@@ -95,12 +95,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/de_DE.ts

@@ -96,12 +96,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/en_AU.ts

@@ -96,12 +96,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/en_GB.ts

@@ -96,12 +96,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/en_NZ.ts

@@ -96,12 +96,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/en_US.ts

@@ -96,12 +96,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/es_ES.ts

@@ -96,12 +96,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/fr_FR.ts

@@ -96,12 +96,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/id_ID.ts

@@ -95,12 +95,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/it_IT.ts

@@ -96,12 +96,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/lt_LT.ts

@@ -97,12 +97,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/nb_NO.ts

@@ -96,12 +96,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/nl_NL.ts

@@ -96,12 +96,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/no_NO.ts

@@ -96,12 +96,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/pl_PL.ts

@@ -97,12 +97,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/pt_BR.ts

@@ -96,12 +96,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/ro_RO.ts

@@ -97,12 +97,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/ru_RU.ts

@@ -97,12 +97,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/sv_SE.ts

@@ -97,12 +97,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

statuscenter/OverviewPane/translations/vi_VN.ts

@@ -95,12 +95,12 @@
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="74"/>
-        <source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source>
+        <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../overviewsettings.ui" line="84"/>
-        <source>Show weather for current location (coming soon)</source>
+        <source>Show weather for current location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>