Merge branch 'master' into ssl-error-digests

15 files changed, 31 insertions, 31 deletions

diff --git a/src/gui/accountsettings.ui b/src/gui/accountsettings.ui
index fcdd8365a..6fd35566f 100644
--- a/src/gui/accountsettings.ui
+++ b/src/gui/accountsettings.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="4" column="0">
diff --git a/src/gui/activitywidget.ui b/src/gui/activitywidget.ui
index 695e45008..7e5e9f73c 100644
--- a/src/gui/activitywidget.ui
+++ b/src/gui/activitywidget.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="sizeConstraint">
@@ -81,7 +81,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>TextLabel</string>
+      <string notr="true">TextLabel</string>
      </property>
      <property name="textFormat">
       <enum>Qt::RichText</enum>
diff --git a/src/gui/folderwizardsourcepage.ui b/src/gui/folderwizardsourcepage.ui
index 7522792be..c338617b1 100644
--- a/src/gui/folderwizardsourcepage.ui
+++ b/src/gui/folderwizardsourcepage.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="2" column="0">
diff --git a/src/gui/folderwizardtargetpage.ui b/src/gui/folderwizardtargetpage.ui
index 5dcefc73f..3a869c31f 100644
--- a/src/gui/folderwizardtargetpage.ui
+++ b/src/gui/folderwizardtargetpage.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_6">
    <item row="1" column="0">
diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui
index 34aa03510..fcdfc073c 100644
--- a/src/gui/generalsettings.ui
+++ b/src/gui/generalsettings.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <item row="2" column="0">
diff --git a/src/gui/legalnotice.ui b/src/gui/legalnotice.ui
index be3c67ba6..1411ad892 100644
--- a/src/gui/legalnotice.ui
+++ b/src/gui/legalnotice.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string notr="true">Dialog</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -33,7 +33,7 @@
    <item>
     <widget class="QLabel" name="notice">
      <property name="text">
-      <string>TextLabel</string>
+      <string notr="true">TextLabel</string>
      </property>
     </widget>
    </item>
diff --git a/src/gui/mnemonicdialog.ui b/src/gui/mnemonicdialog.ui
index e0b804f13..5f598c58b 100644
--- a/src/gui/mnemonicdialog.ui
+++ b/src/gui/mnemonicdialog.ui
@@ -20,7 +20,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string notr="true">Dialog</string>
   </property>
   <property name="sizeGripEnabled">
    <bool>false</bool>
diff --git a/src/gui/networksettings.ui b/src/gui/networksettings.ui
index 60c5ae9c2..a8245bdf6 100644
--- a/src/gui/networksettings.ui
+++ b/src/gui/networksettings.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <item row="0" column="0">
diff --git a/src/gui/sslerrordialog.ui b/src/gui/sslerrordialog.ui
index 900e746fc..438888a4a 100644
--- a/src/gui/sslerrordialog.ui
+++ b/src/gui/sslerrordialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="1" column="0">
diff --git a/src/gui/wizard/owncloudadvancedsetuppage.ui b/src/gui/wizard/owncloudadvancedsetuppage.ui
index d949d50ba..7f10417c1 100644
--- a/src/gui/wizard/owncloudadvancedsetuppage.ui
+++ b/src/gui/wizard/owncloudadvancedsetuppage.ui
@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>
@@ -29,7 +29,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>TextLabel</string>
+      <string notr="true">TextLabel</string>
      </property>
      <property name="textFormat">
       <enum>Qt::RichText</enum>
@@ -97,7 +97,7 @@
           <item>
            <widget class="QLabel" name="lSyncEverythingSizeLabel">
             <property name="text">
-             <string>TextLabel</string>
+             <string notr="true">TextLabel</string>
             </property>
             <property name="textFormat">
              <enum>Qt::PlainText</enum>
@@ -202,7 +202,7 @@
           <item>
            <widget class="QLabel" name="lSelectiveSyncSizeLabel">
             <property name="text">
-             <string>TextLabel</string>
+             <string notr="true">TextLabel</string>
             </property>
             <property name="textFormat">
              <enum>Qt::PlainText</enum>
@@ -232,7 +232,7 @@
        <item>
         <widget class="QLabel" name="lLocalIcon">
          <property name="text">
-          <string>TextLabel</string>
+          <string notr="true">TextLabel</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -282,7 +282,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>pbSelectLocalFolder</string>
+        <string notr="true">pbSelectLocalFolder</string>
        </property>
       </widget>
      </item>
@@ -291,7 +291,7 @@
        <item>
         <widget class="QLabel" name="lServerIcon">
          <property name="text">
-          <string>TextLabel</string>
+          <string notr="true">TextLabel</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -383,7 +383,7 @@
      <item row="4" column="1">
       <widget class="QLabel" name="lFreeSpace">
        <property name="text">
-        <string>TextLabel</string>
+        <string notr="true">TextLabel</string>
        </property>
       </widget>
      </item>
@@ -392,7 +392,7 @@
    <item>
     <widget class="QLabel" name="errorLabel">
      <property name="text">
-      <string>TextLabel</string>
+      <string notr="true">TextLabel</string>
      </property>
     </widget>
    </item>
@@ -418,7 +418,7 @@
    <item>
     <widget class="QLabel" name="bottomLabel">
      <property name="text">
-      <string>TextLabel</string>
+      <string notr="true">TextLabel</string>
      </property>
      <property name="textFormat">
       <enum>Qt::RichText</enum>
diff --git a/src/gui/wizard/owncloudhttpcredspage.ui b/src/gui/wizard/owncloudhttpcredspage.ui
index 9fd445f35..36c2a30e4 100644
--- a/src/gui/wizard/owncloudhttpcredspage.ui
+++ b/src/gui/wizard/owncloudhttpcredspage.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="5" column="1">
diff --git a/src/gui/wizard/owncloudoauthcredspage.ui b/src/gui/wizard/owncloudoauthcredspage.ui
index 285ef3a2b..2c3a79ed2 100644
--- a/src/gui/wizard/owncloudoauthcredspage.ui
+++ b/src/gui/wizard/owncloudoauthcredspage.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/src/gui/wizard/owncloudsetupnocredspage.ui b/src/gui/wizard/owncloudsetupnocredspage.ui
index bc0ec84b9..10a44e49b 100644
--- a/src/gui/wizard/owncloudsetupnocredspage.ui
+++ b/src/gui/wizard/owncloudsetupnocredspage.ui
@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <property name="autoFillBackground">
    <bool>false</bool>
@@ -35,7 +35,7 @@
       </size>
      </property>
      <property name="text">
-      <string>TextLabel</string>
+      <string notr="true">TextLabel</string>
      </property>
      <property name="textFormat">
       <enum>Qt::RichText</enum>
@@ -94,7 +94,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>TextLabel</string>
+      <string notr="true">TextLabel</string>
      </property>
      <property name="textFormat">
       <enum>Qt::RichText</enum>
diff --git a/src/gui/wizard/owncloudwizardresultpage.ui b/src/gui/wizard/owncloudwizardresultpage.ui
index 67eb5a617..44652f295 100644
--- a/src/gui/wizard/owncloudwizardresultpage.ui
+++ b/src/gui/wizard/owncloudwizardresultpage.ui
@@ -11,13 +11,13 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <widget class="QLabel" name="topLabel">
      <property name="text">
-      <string>TextLabel</string>
+      <string notr="true">TextLabel</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -95,7 +95,7 @@
               </size>
              </property>
              <property name="text">
-              <string>PushButton</string>
+              <string notr="true">PushButton</string>
              </property>
              <property name="toolButtonStyle">
               <enum>Qt::ToolButtonTextUnderIcon</enum>
@@ -117,7 +117,7 @@
               </size>
              </property>
              <property name="text">
-              <string>PushButton</string>
+              <string notr="true">PushButton</string>
              </property>
              <property name="toolButtonStyle">
               <enum>Qt::ToolButtonTextUnderIcon</enum>
diff --git a/src/gui/wizard/webview.ui b/src/gui/wizard/webview.ui
index 9cb513e49..ba3588ca8 100644
--- a/src/gui/wizard/webview.ui
+++ b/src/gui/wizard/webview.ui
@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">