Updated english localization

MacPass/en.lproj/Localizable.strings

@@ -37,6 +37,19 @@
 /* Alert informative text to ask the user if he really want to uninstall the plugin */
 "ALERT_INFORMATIVE_TEXT_REALLY_UNINSTALL_PLUGIN" = "The Plugin will be moved to the Trash.";
 
+/* Button in dialog to cancel merge of KDB file changes! */
+"ALERT_MERGE_CANCEL" = "Cancel";
+
+/* Button in dialog to merge KDB changes into file! */
+"ALERT_MERGE_CONTINUE" = "Merge files!";
+
+/* Informative text displayed when merging KDB files */
+"ALERT_MERGE_KDB_FILE_INFO_TEXT" = "KDB databases do not contain enough information for a seamless merge. Entries will get merged and no data is lost. But due to groups only being matched by name, hence unexpected changes might occur. Such as moved entries will get moved back to their old group, or renamed groups will not get merged. Also deleted entries might reappear due to no information regarding deleted objects being stored. Are you sure you want to proceed?
+";
+
+/* Alert message warning user about KDB file merge */
+"ALERT_MERGE_KDB_FILE_MESSAGE" = "You're a merging KDB database";
+
 /* Alert message text when plugins or their settings change and require a restart */
 "ALERT_MESSAGE_PLUGINS_CHANGED_SUGGEST_RESTART" = "Plugin settings changed. Please restart.";
 
@@ -47,6 +60,9 @@
    Menu item to toggle display of attachment count column in entry table */
 "ATTACHMENTS" = "Attachments";
 
+/* Sucessfully merged external changes */
+"AUTO_MERGE_NOTIFICATION_TEXT" = "Auto merge successfull!";
+
 /* Menu item for automatic trash creation */
 "AUTOCREATE_TRASH_FOLDER" = "Create Automatically";
 
@@ -68,9 +84,6 @@
 /* Enable autotype menu item */
 "AUTOTYPE_YES" = "Enable Autotype";
 
-/* Sucessfully merged external changes */
-"AUTO_MERGE_NOTIFICATION_TEXT" = "Auto merge successfull!";
-
 /* Cancel */
 "CANCEL" = "Cancel";
 
@@ -87,15 +100,15 @@
 /* Menu item in the database outline context menu to change the trash group */
 "CHANGE_TRASH_GROUP" = "Change Trash Group";
 
-/* String displayed at dock badge when clipboard is about to be cleared */
-"CLEARING_PASTEBOARD" = "Cleared";
-
 /* Clear Autotype Button */
 "CLEAR_AUTOTYPE" = "Clear Autotype";
 
 /* Menu to clear recent searches */
 "CLEAR_RECENT_SEARCHES" = "Clear recent searches";
 
+/* String displayed at dock badge when clipboard is about to be cleared */
+"CLEARING_PASTEBOARD" = "Cleared";
+
 /* Field name that was copied to the pasteboard */
 "COPIED_FIELD_%@" = "Copied %@";
 
@@ -232,12 +245,6 @@
 /* The master key was changed by an external program! */
 "EXTERN_CHANGE_OF_MASTERKEY" = "Master key was changed by another program";
 
-/* Informative text displayed when the file was change from another application */
-"FILE_CHANGED_BY_OTHERS_INFO_TEXT" = "The database loaded is not the same as the one on disk. How do you want to move on?";
-
-/* Message displayed when an open file was changed from another application */
-"FILE_CHANGED_BY_OTHERS_MESSAGE_TEXT" = "The database file was modified!";
-
 /* External file change strategy option: ask what to do */
 "FILE_CHANGE_STRATEGY_ASK" = "Ask";
 
@@ -251,6 +258,12 @@
 /* External file change strategy option: Use the changed file and discard local changes */
 "FILE_CHANGE_STRATEGY_USE_OTHER" = "Load Changed Version and Discard Mine";
 
+/* Informative text displayed when the file was change from another application */
+"FILE_CHANGED_BY_OTHERS_INFO_TEXT" = "The database loaded is not the same as the one on disk. How do you want to move on?";
+
+/* Message displayed when an open file was changed from another application */
+"FILE_CHANGED_BY_OTHERS_MESSAGE_TEXT" = "The database file was modified!";
+
 /* Error while reopening last known documents */
 "FILE_OPEN_ERROR" = "Error opening file.";
 
@@ -316,6 +329,9 @@
 /* Action title for moving a group via drag and drop */
 "MOVE_GROUP" = "Move Group";
 
+/* Menu displayed as popup selection for search options when multiple items are selected */
+"MULTIPLE_FILTERS_ACTIVE_WITH_DOTS" = "Multiple…";
+
 /* Name for a newly created Database */
 "NEW_DATABASE" = "Database";
 
@@ -332,6 +348,15 @@
    Toolbar item new group */
 "NEW_GROUP" = "New Group";
 
+/* Expiration date format, when item does not expire */
+"NO_EXPIRE_DATE_SET" = "Never expires.";
+
+/* Menu item to reset the template groups */
+"NO_TEMPLATE_GROUP" = "No Templates";
+
+/* Menu item added to show that no templates are defined */
+"NO_TEMPLATES" = "No Templates found";
+
 /* Null placeholder for item input field
    Placeholder text for input fields if no entry or group is selected */
 "NONE" = "None";
@@ -342,15 +367,6 @@
    Notes reference item */
 "NOTES" = "Notes";
 
-/* Expiration date format, when item does not expire */
-"NO_EXPIRE_DATE_SET" = "Never expires.";
-
-/* Menu item added to show that no templates are defined */
-"NO_TEMPLATES" = "No Templates found";
-
-/* Menu item to reset the template groups */
-"NO_TEMPLATE_GROUP" = "No Templates";
-
 /* Ok button */
 "OK" = "OK";
 
@@ -510,7 +526,7 @@
 /* Message for the dialog to open a file for merge */
 "SELECT_FILE_TO_MERGE" = "Select file to merge";
 
-/* Menu displayed as popup selection for search options */
+/* Menu displayed as popup selection for search options if no filter is selected */
 "SELECT_FILTER_WITH_DOTS" = "Select…";
 
 /* Checkbox in dialog to set the selection as default file change strategy! */
@@ -556,6 +572,9 @@
 /* Update Settings Label */
 "UPDATE_SETTINGS" = "Updates";
 
+/* Message text for disabled updates alert! */
+"Updates are disabled!" = "Updates are disabled!";
+
 /* Menu item to toggle display of url column in entry table
    Submenu with options what to do with the URL of an entry
    Url column title
@@ -571,9 +590,6 @@
    UUID reference item */
 "UUID" = "UUID";
 
-/* Message text for disabled updates alert! */
-"Updates are disabled!" = "Updates are disabled!";
-
 /* No Key or Password */
 "WARNING_NO_PASSWORD_OR_KEYFILE" = "No password or keyfile supplied!";