Merge branch 'develop' into fix/settingsAlignment

share/translations/keepassx_en.ts

@@ -1297,11 +1297,6 @@ This is a one-way migration. You won't be able to open the imported databas
         <source>Sh&amp;ow a notification when credentials are requested</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Return only best matching entries for an URL instead
-of all entries for the whole domain</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&amp;Match URL schemes
 Only entries with the same scheme (http://, https://, ftp://, ...) are returned</source>
@@ -1311,10 +1306,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
         <source>Sort matching entries by &amp;username</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>R&amp;emove all shared encryption-keys from active database</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Re&amp;move all stored permissions from entries in active database</source>
         <translation type="unfinished"></translation>
@@ -1327,10 +1318,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Activate the following only, if you know what you are doing!</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Always allow &amp;access to entries</source>
         <translation type="unfinished"></translation>
@@ -1347,14 +1334,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
         <source>Only the selected database has to be connected with a client!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Return also advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic creates or updates are not supported for string fields!</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>HTTP Port:</source>
         <translation type="unfinished"></translation>
@@ -1389,6 +1368,27 @@ This is required for accessing your databases from ChromeIPass or PassIFox</sour
 Using default port 19455.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;Return only best matching entries for a URL instead
+of all entries for the whole domain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The following options can be dangerous. Change them only if you know what you are doing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
@@ -1761,10 +1761,6 @@ give it a unique name to identify and accept it.</source>
         <source>key file of the database</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>filename(s) of the password database(s) to open (*.kdbx)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>KeePassXC - cross-platform password manager</source>
         <translation type="unfinished"></translation>
@@ -1773,5 +1769,9 @@ give it a unique name to identify and accept it.</source>
         <source>read password of the database from stdin</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

snapcraft.yaml

@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.1.0
+version: 2.1.3
 grade: stable
 summary: community driven port of the windows application “Keepass Password Safe”
 description: |
@@ -11,7 +11,7 @@ confinement: strict
 apps:
   keepassxc:
     command: desktop-launch keepassxc
-    plugs: [unity7, opengl, gsettings, home]
+    plugs: [unity7, opengl, gsettings, home, network, network-bind]
 
 parts:
   keepassxc:
@@ -21,6 +21,7 @@ parts:
       - -DCMAKE_BUILD_TYPE=Release
       - -DWITH_TESTS=OFF
       - -DWITH_XC_AUTOTYPE=ON
+      - -DWITH_XC_HTTP=ON
     build-packages:
       - g++
       - libgcrypt20-dev

src/http/OptionDialog.ui

@@ -42,7 +42,7 @@ This is required for accessing your databases from ChromeIPass or PassIFox</stri
        <item>
         <widget class="QCheckBox" name="bestMatchOnly">
          <property name="text">
-          <string>&amp;Return only best matching entries for an URL instead
+          <string>&amp;Return only best matching entries for a URL instead
 of all entries for the whole domain</string>
          </property>
         </widget>
@@ -79,7 +79,7 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
        <item>
         <widget class="QPushButton" name="removeSharedEncryptionKeys">
          <property name="text">
-          <string>R&amp;emove all shared encryption-keys from active database</string>
+          <string>R&amp;emove all shared encryption keys from active database</string>
          </property>
         </widget>
        </item>
@@ -145,7 +145,7 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
           <string notr="true">color: rgb(255, 0, 0);</string>
          </property>
          <property name="text">
-          <string>Activate the following only if you know what you are doing!</string>
+          <string>The following options can be dangerous. Change them only if you know what you are doing.</string>
          </property>
         </widget>
        </item>
@@ -183,14 +183,14 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
        <item>
         <widget class="QCheckBox" name="supportKphFields">
          <property name="text">
-          <string>&amp;Return also advanced string fields which start with &quot;KPH: &quot;</string>
+          <string>&amp;Return advanced string fields which start with &quot;KPH: &quot;</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QLabel" name="label_2">
          <property name="text">
-          <string>Automatic creates or updates are not supported for string fields!</string>
+          <string>Automatically creating or updating string fields is not supported.</string>
          </property>
          <property name="indent">
           <number>30</number>

src/main.cpp

@@ -64,7 +64,7 @@ int main(int argc, char** argv)
 
     QCommandLineParser parser;
     parser.setApplicationDescription(QCoreApplication::translate("main", "KeePassXC - cross-platform password manager"));
-    parser.addPositionalArgument("filename", QCoreApplication::translate("main", "filename(s) of the password database(s) to open (*.kdbx)"), "[filename(s)]");
+    parser.addPositionalArgument("filename", QCoreApplication::translate("main", "filenames of the password databases to open (*.kdbx)"), "[filename(s)]");
 
     QCommandLineOption configOption("config",
                                     QCoreApplication::translate("main", "path to a custom config file"),