Merge remote-tracking branch 'origin/main'

# Conflicts:
#	PasteIntoFile/Properties/Resources.Designer.cs

.editorconfig

@@ -18,18 +18,39 @@ trim_trailing_whitespace = true
 ###############################
 [*.cs]
 # New line preferences
-csharp_new_line_before_open_brace =
+csharp_new_line_before_open_brace = none
 csharp_new_line_before_else = false
 csharp_new_line_before_catch = false
 csharp_new_line_before_finally = false
 csharp_new_line_before_members_in_object_initializers = false
 csharp_new_line_before_members_in_anonymous_types = true
 csharp_new_line_between_query_expression_clauses = true
+csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_blocks = true
+resharper_new_line_before_while = true
+resharper_blank_lines_after_block_statements = 0
+resharper_blank_lines_around_local_method = 0
+resharper_blank_lines_around_property = 0
+resharper_csharp_blank_lines_around_field = 0
+resharper_csharp_blank_lines_around_invocable = 0
+resharper_csharp_blank_lines_around_region = 0
+resharper_csharp_keep_blank_lines_in_declarations = 100
+resharper_csharp_remove_blank_lines_near_braces_in_code = false
+resharper_csharp_remove_blank_lines_near_braces_in_declarations = false
+resharper_csharp_empty_block_style = multiline
+resharper_csharp_max_line_length = 184
 # Indentation preferences
 csharp_indent_case_contents = true
 csharp_indent_switch_labels = true
 csharp_indent_labels = flush_left
 csharp_indent_braces = false
+resharper_indent_inside_namespace = false
+# Bracing preferences
+resharper_braces_for_for = required
+resharper_braces_for_foreach = required
+resharper_braces_for_ifelse = not_required
+resharper_braces_redundant = false
+resharper_parentheses_redundancy_style = remove
 # Space preferences
 csharp_space_after_cast = false
 csharp_space_after_keywords_in_control_flow_statements = true
@@ -52,7 +73,14 @@ csharp_space_before_semicolon_in_for_statement = false
 csharp_space_between_empty_square_brackets = false
 csharp_space_between_method_declaration_name_and_open_parenthesis = false
 csharp_space_between_square_brackets = false
-# Wrapping preferences
-csharp_preserve_single_line_statements = true
-csharp_preserve_single_line_blocks = true
-
+# Code order preferences
+csharp_preferred_modifier_order = private, public, protected, static, new, internal, async, virtual, abstract, sealed, override, extern, unsafe, volatile, readonly
+resharper_force_attribute_style = join
+resharper_instance_members_qualify_declared_in =
+resharper_keep_existing_embedded_arrangement = true
+resharper_keep_existing_invocation_parens_arrangement = true
+resharper_place_expr_property_on_single_line = true
+resharper_place_simple_initializer_on_single_line = false
+resharper_wrap_array_initializer_style = chop_if_long
+resharper_wrap_before_declaration_rpar = false
+resharper_wrap_object_and_collection_initializer_style = chop_always

PasteIntoFile/Properties/AssemblyInfo.cs

@@ -32,7 +32,7 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 #if DEBUG
-[assembly: AssemblyVersion("5.1.*")]
+[assembly: AssemblyVersion("5.2.*")]
 #else
-[assembly: AssemblyVersion("5.1")]
+[assembly: AssemblyVersion("5.2")]
 #endif

PasteIntoFile/Properties/Resources.de.resx

@@ -93,9 +93,6 @@
     <comment>str_select_folder
 Tooltip</comment>
   </data>
-  <data name="str_autosave_balloontext" xml:space="preserve">
-    <value>Umschalttaste gedrückt halten, um Optionen wieder anzuzeigen.</value>
-  </data>
   <data name="str_autosave_infotext" xml:space="preserve">
     <value>Dateien werden nun automatisch gespeichert, ohne dass der Dialog zur Eingabe von Dateinamen und -typ geöffnet wird. Stattdessen wird die erstellte Datei im Explorer zum Umbenennen markiert. Um den Dialog wieder anzuzeigen, kann PasteIntoFile ohne Argumente ausgeführt werden, oder während des Programmstarts aus dem Kontextmenü die Umschalttaste gedrückt gehalten werden.</value>
   </data>
@@ -119,9 +116,6 @@ Tooltip</comment>
   <data name="str_wizard_contextentry_title" xml:space="preserve">
     <value>Einträge zum Kontextmenü hinzufügen?</value>
   </data>
-  <data name="str_autosave_balloontitle" xml:space="preserve">
-    <value>Zwischenablage als Datei gespeichert</value>
-  </data>
   <data name="str_version" xml:space="preserve">
     <value>Version {0}</value>
     <comment>Program version info

PasteIntoFile/Properties/Resources.it.resx

@@ -93,9 +93,6 @@
     <comment>str_select_folder
 Tooltip</comment>
   </data>
-  <data name="str_autosave_balloontext" xml:space="preserve">
-    <value>Tieni premuto il tasto Maiusc durante il salvataggio per mostrare la finestra delle opzioni.</value>
-  </data>
   <data name="str_autosave_infotext" xml:space="preserve">
     <value>I file vengono ora salvati automaticamente senza richiedere il nome e l'estensione del file. Invece, il file creato verrà selezionato per rinominare nella finestra dell'esploratore. Per mostrare nuovamente la finestra di dialogo, eseguire l'eseguibile di Incolla nel file senza argomenti o tenere premuto il tasto Maiusc durante la selezione della voce del menu contestuale.</value>
   </data>
@@ -119,9 +116,6 @@ Tooltip</comment>
   <data name="str_wizard_contextentry_title" xml:space="preserve">
     <value>Aggiungere le voci del menu contestuale?</value>
   </data>
-  <data name="str_autosave_balloontitle" xml:space="preserve">
-    <value>Appunti salvati nel file</value>
-  </data>
   <data name="str_version" xml:space="preserve">
     <value>Versione {0}</value>
     <comment>Program version info

PasteIntoFile/Properties/Resources.ko.resx

@@ -93,9 +93,6 @@
     <comment>str_select_folder
 Tooltip</comment>
   </data>
-  <data name="str_autosave_balloontext" xml:space="preserve">
-    <value>설정 창을 보려면 저장 도중 shift 키를 누르고 있으세요.</value>
-  </data>
   <data name="str_autosave_infotext" xml:space="preserve">
     <value>이제 파일명과 확장자를 묻지 않고 파일이 자동으로 저장됩니다. 이름 변경을 위해, 생성된 파일이 선택된 채로 새 탐색기 창이 열립니다. 대화 상자를 다시 표시하려면 명령행 인자 없이 프로그램을 실행하거나 컨텍스트 메뉴 항목을 선택할 때에 Shift 키를 누르세요.</value>
   </data>
@@ -119,9 +116,6 @@ Tooltip</comment>
   <data name="str_wizard_contextentry_title" xml:space="preserve">
     <value>탐색기 메뉴에 추가</value>
   </data>
-  <data name="str_autosave_balloontitle" xml:space="preserve">
-    <value>클립보드 내용 파일로 저장 완료</value>
-  </data>
   <data name="str_version" xml:space="preserve">
     <value>버전 {0}</value>
     <comment>Program version info

PasteIntoFile/Properties/Resources.resx

@@ -98,9 +98,6 @@
     <comment>str_select_folder
 Tooltip</comment>
   </data>
-  <data name="str_autosave_balloontext" xml:space="preserve">
-    <value>Hold shift key during save to show option window.</value>
-  </data>
   <data name="str_autosave_infotext" xml:space="preserve">
     <value>Files are now automatically saved without prompting for filename and extension. Instead, the file created will be selected for renaming in the explorer window. To show the dialog again, run the PasteInfoFile executable without arguments or hold the SHIFT key while selecting the context menu entry.</value>
   </data>
@@ -127,9 +124,6 @@ Tooltip</comment>
   <data name="str_wizard_contextentry_title" xml:space="preserve">
     <value>Add context menu entries?</value>
   </data>
-  <data name="str_autosave_balloontitle" xml:space="preserve">
-    <value>Clipboard saved to file</value>
-  </data>
   <data name="str_version" xml:space="preserve">
     <value>Version {0}</value>
     <comment>Program version info