From 036e843361ef2068de69d86233c278c52d805611 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Fri, 16 Mar 2018 16:22:38 +0300
Subject: [PATCH] #3159 Resources fix (double quote char)

---
 .../dbeaver/core/CoreResources.properties     | 70 +++++++++----------
 .../model/messages/ModelResources.properties  |  4 +-
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties
index d744e52eaa..6ac0bfd9ab 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties
@@ -35,14 +35,14 @@ actions_ContentFormatProposal_label = Format SQL
 actions_ContentFormatProposal_tooltip = Format SQL
 
 actions_navigator__objects = \ Objects
-actions_navigator_bookmark_error_message = Can''t create new bookmark
+actions_navigator_bookmark_error_message = Can't create new bookmark
 actions_navigator_bookmark_error_title = New Bookmark
 actions_navigator_bookmark_title = Bookmark Name
 actions_navigator_copy_fqn_title = Copy Fully Qualified Name
 actions_navigator_copy_fqn_titles = Copy Fully Qualified Names
 actions_navigator_copy_object_copy_node = Copy {0}
 actions_navigator_copy_object_copy_objects = Copy Objects
-actions_navigator_create_folder_error_message = Can''t create new folder "{0}"
+actions_navigator_create_folder_error_message = Can't create new folder "{0}"
 actions_navigator_create_folder_error_title = Create folder
 actions_navigator_create_folder_folder_name = Folder name
 actions_navigator_create_new = Create New
@@ -56,7 +56,7 @@ actions_navigator_error_dialog_open_resource_title = Open resource
 actions_navigator_open = Open
 actions_navigator_view = View
 actions_navigator_view_script_button = &View Script
-actions_navigator_filter_objects = Configure ''{0}'' filter...
+actions_navigator_filter_objects = Configure "{0}" filter...
 actions_spreadsheet_copy_special = Advanced copy ...
 
 common_error_sql = SQL Error
@@ -84,7 +84,7 @@ action_popup_sqleditor_layout_vertical = Vertical
 ## Confirmations ##
 confirm_exit_title = Exit DBeaver
 confirm_exit_message = Are you sure?
-confirm_exit_toggleMessage = Don''t ask again
+confirm_exit_toggleMessage = Don't ask again
 
 confirm_close_resultset_edit_message = Result set was edited. Do you want to save changes in database?
 confirm_close_resultset_edit_title = Save result set edit
@@ -98,7 +98,7 @@ confirm_close_entity_edit_message = Object "{0}" was changed. Do you want to per
 confirm_close_entity_edit_title = Persist object changes
 confirm_close_entity_edit_toggleMessage = Remember choice
 
-confirm_dangerous_sql_message = You are about to execute {0} statement without a WHERE clause on ''{1}''.\nPossible data loss. Are you sure?
+confirm_dangerous_sql_message = You are about to execute {0} statement without a WHERE clause on "{1}".\nPossible data loss. Are you sure?
 confirm_dangerous_sql_title = Confirm dangerous query execution
 confirm_dangerous_sql_toggleMessage = Remember choice
 
@@ -112,22 +112,22 @@ confirm_disconnect_txn_toggleMessage = Remember choice
 
 confirm_driver_download_message = Driver files ({1}) are missing for database "{0}".\nDo you want to download these files?
 confirm_driver_download_title = Download database driver
-confirm_driver_download_toggleMessage = Don''t ask again
+confirm_driver_download_toggleMessage = Don't ask again
 
-confirm_driver_download_manual_message = JDBC driver "{0}" is missing. According to vendor policy this driver isn''t publicly available and you have to download it manually from vendor''s web site.\n\nAfter successful driver download you will need to manually add JAR files in DBeaver libraries list.\nDriver files: {1}.\n\nDo you want to proceed to vendor web site?
+confirm_driver_download_manual_message = JDBC driver "{0}" is missing. According to vendor policy this driver isn't publicly available and you have to download it manually from vendor's web site.\n\nAfter successful driver download you will need to manually add JAR files in DBeaver libraries list.\nDriver files: {1}.\n\nDo you want to proceed to vendor web site?
 confirm_driver_download_manual_title = Manual driver download
-confirm_driver_download_manual_toggleMessage = Don''t ask again
+confirm_driver_download_manual_toggleMessage = Don't ask again
 
 confirm_entity_delete_message = Are you sure you want to delete {0} "{1}"?
 confirm_entity_delete_title = Delete object
 
 confirm_entity_reject_message = This action will reject all changes in "{0}" and close editor, so all changes will be lost_\nAre you sure you want to reject changes?
 confirm_entity_reject_title = Reject object
-confirm_entity_reject_toggleMessage = Don''t ask again
+confirm_entity_reject_toggleMessage = Don't ask again
 
 confirm_entity_revert_message = Are you sure you want to revert all changes in "{0}"?
 confirm_entity_revert_title = Revert changes
-confirm_entity_revert_toggleMessage = Don''t ask again
+confirm_entity_revert_toggleMessage = Don't ask again
 
 confirm_fetch_all_rows_message = Reading all rows of result set can take much time and memory.\n\nAre you sure you want to fetch all rows?
 confirm_fetch_all_rows_title = Read all rows
@@ -142,11 +142,11 @@ confirm_local_folder_delete_title = Delete folder
 
 confirm_order_resultset_message = Ordering of result set can take a lot of time for big tables when there is no appropriate index for this column.\n\nAre you sure you want to order this result set by column {0}?
 confirm_order_resultset_title = Order result set
-confirm_order_resultset_toggleMessage = Don''t ask again
+confirm_order_resultset_toggleMessage = Don't ask again
 
 confirm_version_check_message = New {0} version {1} has been released on {2}.\nDo you want to update your current version?
 confirm_version_check_title = Download new version
-confirm_version_check_toggleMessage = Don''t ask again
+confirm_version_check_toggleMessage = Don't ask again
 
 
 controls_client_home_selector_browse = Browse ...
@@ -227,7 +227,7 @@ controls_querylog_script = Script
 controls_querylog_shell_text = View 
 controls_querylog_success = Success
 controls_querylog_transaction = Transaction
-controls_resultset_check_autocommit_state = Check connection''s auto-commit state
+controls_resultset_check_autocommit_state = Check connection's auto-commit state
 controls_resultset_config_panels = Panels
 controls_resultset_config_record = Record
 controls_resultset_edit_cancel = Cancle
@@ -329,7 +329,7 @@ dialog_connection_auth_checkbox_save_password = Save password
 dialog_connection_auth_group_user_cridentials = User Credentials: 
 dialog_connection_auth_label_password = Password:
 dialog_connection_auth_label_username = Username:
-dialog_connection_auth_title = '' Authentication
+dialog_connection_auth_title = ' Authentication
 dialog_connection_auth_title_for_handler = Specify password for {0}
 dialog_connection_button_test = &Test Connection ...
 #page conn setting
@@ -344,7 +344,7 @@ dialog_connection_events_checkbox_wait_finish = Wait For Process To Finish
 dialog_connection_events_checkbox_wait_finish_timeout = Timeout (ms)
 dialog_connection_events_label_command = Command
 dialog_connection_events_label_event = Event
-dialog_connection_events_title = Edit connection''s events
+dialog_connection_events_title = Edit connection's events
 dialog_connection_message = {0} connection settings
 #page conn network
 dialog_connection_network_title = Network
@@ -420,9 +420,9 @@ dialog_driver_manager_button_new = &New
 dialog_driver_manager_button_copy = &Copy
 dialog_driver_manager_label_unavailable = - Unavailable
 dialog_driver_manager_label_user_defined = - User defined
-dialog_driver_manager_message_cant_delete_text = Your can''t delete driver "{0}" because it''s used by following datasource(s):
-dialog_driver_manager_message_cant_delete_title = Can''t delete driver
-dialog_driver_manager_message_delete_driver_text = Are you sure you want to delete driver ''
+dialog_driver_manager_message_cant_delete_text = Your can't delete driver "{0}" because it's used by following datasource(s):
+dialog_driver_manager_message_cant_delete_title = Can't delete driver
+dialog_driver_manager_message_delete_driver_text = Are you sure you want to delete driver '
 dialog_driver_manager_message_delete_driver_title = Delete driver
 dialog_driver_manager_title = Driver Manager
 dialog_edit_driver_button_add_artifact = Add &Artifact
@@ -436,7 +436,7 @@ dialog_edit_driver_button_down = Do&wn
 dialog_edit_driver_button_reset_to_defaults = Reset to Defaults
 dialog_edit_driver_button_up = &Up
 dialog_edit_driver_button_update_version = &Download/Update
-dialog_edit_driver_dialog_driver_error_message = Can''t load driver
+dialog_edit_driver_dialog_driver_error_message = Can't load driver
 dialog_edit_driver_dialog_driver_error_title = Driver Error
 dialog_edit_driver_dialog_open_driver_directory = Open driver directory
 dialog_edit_driver_dialog_open_driver_library = Open driver library
@@ -459,7 +459,7 @@ dialog_edit_driver_tab_tooltip_driver_libraries = Additional Driver Libraries
 dialog_edit_driver_tab_tooltip_license = Driver license
 dialog_edit_driver_text_driver_license = Driver license
 dialog_edit_driver_title_create_driver = Create new driver
-dialog_edit_driver_title_edit_driver = Edit Driver ''
+dialog_edit_driver_title_edit_driver = Edit Driver '
 dialog_filter_button_add = Add
 dialog_filter_button_clear = Clear
 dialog_filter_button_enable = Enable
@@ -630,9 +630,9 @@ dialog_struct_edit_fk_column_ref_col_type = Ref Column Type
 dialog_struct_edit_fk_combo_on_delete = On Delete
 dialog_struct_edit_fk_combo_on_update = On Update
 dialog_struct_edit_fk_combo_unik = Unique Key
-dialog_struct_edit_fk_error_load_constraint_columns_message = Can''t load table constraint columns
+dialog_struct_edit_fk_error_load_constraint_columns_message = Can't load table constraint columns
 dialog_struct_edit_fk_error_load_constraint_columns_title = Load constraint columns
-dialog_struct_edit_fk_error_load_constraints_message = Can''t load table constraints
+dialog_struct_edit_fk_error_load_constraints_message = Can't load table constraints
 dialog_struct_edit_fk_error_load_constraints_title = Load constraints
 dialog_struct_edit_fk_label_columns = Columns
 dialog_struct_edit_fk_label_ref_table = Reference table
@@ -691,9 +691,9 @@ editors_entity_properties_text = Properties
 editors_entity_properties_tooltip_suffix = \ Properties
 editors_sql_data_grid = Results
 editors_sql_description = SQL Editor
-editors_sql_error_cant_execute_query_message = Can''t execute more than one query in one tab. Try to use multiple tabs for simultaneous query execution.
-editors_sql_error_cant_execute_query_title = Can''t execute query
-editors_sql_error_cant_obtain_session = Can''t obtain session
+editors_sql_error_cant_execute_query_message = Can't execute more than one query in one tab. Try to use multiple tabs for simultaneous query execution.
+editors_sql_error_cant_execute_query_title = Can't execute query
+editors_sql_error_cant_obtain_session = Can't obtain session
 editors_sql_error_execution_plan_message = Can not explain execution plan
 editors_sql_error_execution_plan_title = Execution plan
 editors_sql_execution_log = Execution Log
@@ -701,15 +701,15 @@ editors_sql_explain_plan = Explain Plan
 editors_sql_job_execute_query = Execute query
 editors_sql_job_execute_script = Execute script
 editors_sql_output = Output
-editors_sql_save_on_close_message = Editor can''t be closed while SQL query is being executed
+editors_sql_save_on_close_message = Editor can't be closed while SQL query is being executed
 editors_sql_save_on_close_text = Query is being executed
-editors_sql_status_cant_obtain_document = Can''t obtain editor''s document
+editors_sql_status_cant_obtain_document = Can't obtain editor's document
 editors_sql_status_empty_query_string = Empty query string
 editors_sql_status_not_connected_to_database = Not connected to database
 editors_sql_status_rows_updated = \ row(s) updated
 editors_sql_status_statement_executed = Statement executed
 editors_sql_status_statement_executed_no_rows_updated = Statement executed - no rows updated
-editors_sql_staus_connected_to = Connected to ''
+editors_sql_staus_connected_to = Connected to '
 
 
 model_html_read_database_meta_data = Read database metadata
@@ -736,7 +736,7 @@ model_navigator_resource_exception_already_exists = Folder "{0}" already exists
 model_project_Script = Script
 model_project_Scripts = Scripts
 model_project_bookmarks_folder = Bookmarks
-model_project_cant_open_bookmark = Can''t open bookmark
+model_project_cant_open_bookmark = Can't open bookmark
 model_project_open_bookmark = Open bookmark
 
 model_ssh_configurator_group_settings = Settings
@@ -906,7 +906,7 @@ toolbar_datasource_selector_combo_database_tooltip = Active catalog/schema
 toolbar_datasource_selector_combo_datasource_tooltip = Active datasource
 toolbar_datasource_selector_connected = Connected
 toolbar_datasource_selector_empty = <None>
-toolbar_datasource_selector_error_change_database_message = Can''t change active database
+toolbar_datasource_selector_error_change_database_message = Can't change active database
 toolbar_datasource_selector_error_change_database_title = Change active database
 toolbar_datasource_selector_error_database_change_not_supported = Active database change is not supported
 toolbar_datasource_selector_error_database_not_found = Can not find database "{0}"
@@ -1136,7 +1136,7 @@ pref_page_database_general_label_show_general_toolbar_everywhere_tip = Show gene
 pref_page_connection_types_label_table_column_name = Name
 pref_page_connection_types_label_table_column_description = Description
 pref_page_connection_types_label_delete_connection_type = Delete connection type
-pref_page_connection_types_label_delete_connection_type_description = Are you sure you want to delete connection type ''{0}'' ?\n All connections of this type will be reset to default type ({1})
+pref_page_connection_types_label_delete_connection_type_description = Are you sure you want to delete connection type "{0}" ?\n All connections of this type will be reset to default type ({1})
 pref_page_connection_types_group_settings = Settings
 pref_page_connection_types_label_name = Name
 pref_page_connection_types_label_description = Description
@@ -1157,7 +1157,7 @@ pref_page_sql_editor_checkbox_create_script_folders = Create script folders
 
 
 ## Connection edit ##
-dialog_connection_edit_title = Connection ''{0}'' configuration
+dialog_connection_edit_title = Connection "{0}" configuration
 
 dialog_connection_edit_connection_settings_variables_hint_label = You can use variables in connection parameters.
 
@@ -1200,7 +1200,7 @@ dialog_connection_edit_wizard_sql_processing = SQL Processing
 dialog_connection_edit_wizard_sql_processing_description = SQL processing settings
 
 dialog_connection_edit_wizard_conn_change_title = Connection changed
-dialog_connection_edit_wizard_conn_change_question = Connection ''{0}'' has been changed.\nDo you want to reconnect?
+dialog_connection_edit_wizard_conn_change_question = Connection "{0}" has been changed.\nDo you want to reconnect?
 dialog_connection_edit_wizard_lock_pwd_title = Enter lock password
 dialog_connection_edit_wizard_bad_pwd_title = Bad password
 dialog_connection_edit_wizard_bad_pwd_msg = Password doesn't match
@@ -1219,7 +1219,7 @@ dialog_edit_driver_edit_maven_artifact_id_label = Artifact Id
 dialog_edit_driver_edit_maven_classfier_label = Classifier
 dialog_edit_driver_edit_maven_version_label = Version
 
-dialog_edit_driver_text_driver_library = Driver ''{0}'' library ''{1}''
+dialog_edit_driver_text_driver_library = Driver "{0}" library "{1}"
 dialog_edit_driver_info = Information
 dialog_edit_driver_driver = Driver
 dialog_edit_driver_library = Library
@@ -1271,7 +1271,7 @@ dialog_driver_download_auto_page_cannot_resolve_libraries_text = Can't resolve l
 dialog_driver_download_auto_page_driver_download_error = Driver download
 dialog_driver_download_auto_page_driver_download_error_msg = Error downloading driver files
 dialog_driver_download_auto_page_driver_security_warning = Security warning
-dialog_driver_download_auto_page_driver_security_warning_msg = Library ''{0}'' wasn't found in secure repositories.\nOnly non-secure version is available: {1}.\n\nIt is not recommended to use non-secure repositories because of possibility of malware infection.\n\nAre you sure you want to proceed?
+dialog_driver_download_auto_page_driver_security_warning_msg = Library "{0}"| wasn't found in secure repositories.\nOnly non-secure version is available: {1}.\n\nIt is not recommended to use non-secure repositories because of possibility of malware infection.\n\nAre you sure you want to proceed?
 dialog_driver_download_auto_page_download_rate = Download {0}/{1}
 dialog_driver_download_auto_page_download_failed_msg = Driver file download failed.\nDo you want to retry?
 ## Driver download ##
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/messages/ModelResources.properties b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/messages/ModelResources.properties
index f1c756abcb..c9bb84caae 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/messages/ModelResources.properties
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/messages/ModelResources.properties
@@ -19,7 +19,7 @@ model_jdbc_read_database_meta_data=Read database meta data
 model_jdbc__rows_fetched=\ rows fetched
 model_jdbc_array_result_set=Array result set
 model_jdbc_bad_content_value_=Bad content value: 
-model_jdbc_cant_create_null_cursor=Can''t create null cursor
+model_jdbc_cant_create_null_cursor=Can't create null cursor
 model_jdbc_column_size=Column Size
 model_jdbc_content_length=Content Length
 model_jdbc_content_type=Content Type
@@ -78,7 +78,7 @@ model_jdbc_load_tables=Load tables
 model_jdbc_load_type_info=Load type info
 model_jdbc_load_udt_attributes=Load UDT attributes
 model_jdbc_load_udts=Load UDTs
-model_jdbc_lob_and_binary_data_cant_be_edited_inline=LOB and binary data can''t be edited inline
+model_jdbc_lob_and_binary_data_cant_be_edited_inline=LOB and binary data can't be edited inline
 model_jdbc_max_length=Max Length
 model_jdbc_None=None
 model_jdbc_precision=Precision
-- 
GitLab