Merge branch 'master' into develop

lvwvm · Oct 21, 2020 · cd519e1 · cd519e1
2 parents eb6f0eb + e9b9582
commit cd519e1
Show file tree

Hide file tree

Showing 44 changed files with 3,211 additions and 3,349 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,45 @@
 # Changelog
 
+## 2.6.2 (2020-10-21)
+
+### Added
+
+- Add option to keep window always on top to view menu [#5542]
+- Move show/hide usernames and passwords to view menu [#5542]
+- Add command line options and environment variables for changing the config locations [#5452]
+- Include TOTP settings in CSV import/export and add support for ISO datetimes [#5346]
+
+### Changed
+
+- Mask sensitive information in command execution confirmation prompt [#5542]
+- SSH Agent: Avoid shortcut conflict on macOS by changing "Add key" to Ctrl+H on all platforms [#5484]
+
+### Fixed
+
+- Prevent data loss with drag and drop between databases [#5536]
+- Fix crash when toggling Capslock rapidly [#5545]
+- Don't mark URL references as invalid URL [#5380]
+- Reset entry preview after search [#5483]
+- Set Qt::Dialog flag on database open dialog [#5356]
+- Fix sorting of database report columns [#5426]
+- Fix IfDevice matching logic [#5344]
+- Fix layout issues and a stray scrollbar appearing on top of the entry edit screen [#5424]
+- Fix tabbing into the notes field [#5424]
+- Fix password generator ignoring settings on load [#5340]
+- Restore natural entry sort order on application load [#5438]
+- Fix paperclip and TOTP columns not saving state [#5327]
+- Enforce fixed password font in entry preview [#5454]
+- Add scrollbar when new database wizard exceeds screen size [#5560]
+- Do not mark database as modified when viewing Auto-Type associations [#5542]
+- CLI: Fix two heap-use-after-free crashes [#5368,#5470]
+- Browser: Fix key exchange not working with multiple simultaneous users on Windows [#5485]
+- Browser: Fix entry retrieval when "only best matching" is enabled [#5316]
+- Browser: Ignore recycle bin on KeePassHTTP migration [#5481]
+- KeeShare: Fix import crash [#5542]
+- macOS: Fix toolbar theming and breadcrumb display issues [#5482]
+- macOS: Fix file dialog randomly closing [#5479]
+- macOS: Fix being unable to select OPVault files for import [#5341]
+
 ## 2.6.1 (2020-08-19)
 
 ### Added

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -100,7 +100,7 @@ endif()
 
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "6")
-set(KEEPASSXC_VERSION_PATCH "1")
+set(KEEPASSXC_VERSION_PATCH "2")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 set(OVERRIDE_VERSION "" CACHE STRING "Override the KeePassXC Version for Snapshot builds")
 

diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,41 @@
     </screenshots>
 
     <releases>
+        <release version="2.6.2" date="2020-10-21">
+            <description>
+                <ul>
+                    <li>Add option to keep window always on top to view menu [#5542]</li>
+                    <li>Move show/hide usernames and passwords to view menu [#5542]</li>
+                    <li>Add command line options and environment variables for changing the config locations [#5452]</li>
+                    <li>Include TOTP settings in CSV import/export and add support for ISO datetimes [#5346]</li>
+                    <li>Mask sensitive information in command execution confirmation prompt [#5542]</li>
+                    <li>SSH Agent: Avoid shortcut conflict on macOS by changing "Add key" to Ctrl+H on all platforms [#5484]</li>
+                    <li>Prevent data loss with drag and drop between databases [#5536]</li>
+                    <li>Fix crash when toggling Capslock rapidly [#5545]</li>
+                    <li>Don't mark URL references as invalid URL [#5380]</li>
+                    <li>Reset entry preview after search [#5483]</li>
+                    <li>Set Qt::Dialog flag on database open dialog [#5356]</li>
+                    <li>Fix sorting of database report columns [#5426]</li>
+                    <li>Fix IfDevice matching logic [#5344]</li>
+                    <li>Fix layout issues and a stray scrollbar appearing on top of the entry edit screen [#5424]</li>
+                    <li>Fix tabbing into the notes field [#5424]</li>
+                    <li>Fix password generator ignoring settings on load [#5340]</li>
+                    <li>Restore natural entry sort order on application load [#5438]</li>
+                    <li>Fix paperclip and TOTP columns not saving state [#5327]</li>
+                    <li>Enforce fixed password font in entry preview [#5454]</li>
+                    <li>Add scrollbar when new database wizard exceeds screen size [#5560]</li>
+                    <li>Do not mark database as modified when viewing Auto-Type associations [#5542]</li>
+                    <li>CLI: Fix two heap-use-after-free crashes [#5368,#5470]</li>
+                    <li>Browser: Fix key exchange not working with multiple simultaneous users on Windows [#5485]</li>
+                    <li>Browser: Fix entry retrieval when "only best matching" is enabled [#5316]</li>
+                    <li>Browser: Ignore recycle bin on KeePassHTTP migration [#5481]</li>
+                    <li>KeeShare: Fix import crash [#5542]</li>
+                    <li>macOS: Fix toolbar theming and breadcrumb display issues [#5482]</li>
+                    <li>macOS: Fix file dialog randomly closing [#5479]</li>
+                    <li>macOS: Fix being unable to select OPVault files for import [#5341]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.6.1" date="2020-08-19">
             <description>
                 <ul>

diff --git a/share/translations/keepassx_ar.ts b/share/translations/keepassx_ar.ts
@@ -135,6 +135,10 @@
         <source>Colorful</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>You must restart the application to set the new language. Would you like to restart now?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
@@ -166,10 +170,6 @@
         <source>Automatically save after every change</source>
         <translation>الحفظ تلقائيًا بعد كل تعديل</translation>
     </message>
-    <message>
-        <source>Automatically save on exit</source>
-        <translation>الحفظ تلقائيًا عند الإغلاق</translation>
-    </message>
     <message>
         <source>Automatically reload the database when modified externally</source>
         <translation>إعادة تحميل قاعدة البيانات تلقائيا عند تعديلها خارجيًا</translation>
@@ -305,10 +305,6 @@
         <source>Automatically launch KeePassXC at system startup</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Safely save database files (disable if experiencing problems with Dropbox, etc.)</source>
         <translation type="unfinished"/>
@@ -345,6 +341,18 @@
         <source>Auto-Type start delay:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Automatically save when locking database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save non-data changes when locking database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Tray icon type</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetSecurity</name>
@@ -4797,6 +4805,26 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>You must restart the application to apply this setting. Would you like to restart now?</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Perform Auto-Type Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{USERNAME}</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{USERNAME}{ENTER}</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{PASSWORD}</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{PASSWORD}{ENTER}</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
@@ -5280,10 +5308,6 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <comment>Password quality</comment>
         <translation>ممتازة</translation>
     </message>
-    <message>
-        <source>ExtendedASCII</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Switch to advanced mode</source>
         <translation type="unfinished"/>
@@ -5292,58 +5316,22 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Advanced</source>
         <translation>متقدم</translation>
     </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
     <message>
         <source>Braces</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>{[(</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Punctuation</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>.,:;</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Quotes</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>&quot; &apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&lt;*+!?=</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>\_|-/</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Logograms</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>#$%&amp;&amp;@^`~</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Character set to exclude from generated password</source>
         <translation type="unfinished"/>
@@ -5464,6 +5452,10 @@ Expect some bugs and minor issues, this version is not meant for production use.
         <source>Regenerate password (%1)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Special Characters</source>
+        <translation>محارف خاصة</translation>
+    </message>
 </context>
 <context>
     <name>QApplication</name>