Index: Application/Application.Ringtoets/App.xaml.cs =================================================================== diff -u -rc12ff7f28c27dd40613a002c2053f6457f40854a -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision c12ff7f28c27dd40613a002c2053f6457f40854a) +++ Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -59,12 +59,12 @@ { RingtoetsApplication.SetLanguageAndRegionalSettions(Settings.Default); - log.Info(Core.Common.Gui.Properties.Resources.App_App_Starting_Ringtoets____); + log.Info(Core.Common.Gui.Properties.Resources.App_App_Starting_Ringtoets); } public static void RunRingtoets() { - log.Info(Core.Common.Gui.Properties.Resources.App_RunRingtoets_Starting_Ringtoets_Gui____); + log.Info(Core.Common.Gui.Properties.Resources.App_RunRingtoets_Starting_Ringtoets_Gui); var loaderDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); var startupDirectory = Directory.GetCurrentDirectory(); @@ -101,7 +101,7 @@ } else { - log.ErrorFormat(Core.Common.Gui.Properties.Resources.App_RunRingtoets_Specified_project___0___was_not_found_, projectFilePath); + log.ErrorFormat(Core.Common.Gui.Properties.Resources.App_RunRingtoets_Specified_project_0_was_not_found_, projectFilePath); } } @@ -111,7 +111,7 @@ { if (gui.Application.Project == null) { - log.ErrorFormat(Core.Common.Gui.Properties.Resources.App_RunRingtoets_No_project_found__load_project_first); + log.ErrorFormat(Core.Common.Gui.Properties.Resources.App_RunRingtoets_No_project_found_load_project_first); return; } @@ -123,18 +123,18 @@ if (activity == null) { log.ErrorFormat( - Core.Common.Gui.Properties.Resources.App_RunRingtoets_Activity___0___not_found_in_project__Typo__or_did_you_forget_to_load_a_project_, + Core.Common.Gui.Properties.Resources.App_RunRingtoets_Activity_0_not_found_in_project_Typo_or_did_you_forget_to_load_a_project, runActivity); return; } - log.InfoFormat(Core.Common.Gui.Properties.Resources.App_RunRingtoets_Starting_activity___0__, runActivity); + log.InfoFormat(Core.Common.Gui.Properties.Resources.App_RunRingtoets_Starting_activity_0_, runActivity); gui.Application.RunActivity(activity); - log.InfoFormat(Core.Common.Gui.Properties.Resources.App_RunRingtoets_Activity___0___ended_with_status__1_, runActivity, activity.Status); + log.InfoFormat(Core.Common.Gui.Properties.Resources.App_RunRingtoets_Activity_0_ended_with_status_1_, runActivity, activity.Status); - log.InfoFormat(Core.Common.Gui.Properties.Resources.App_RunRingtoets_Saving_project___0__, gui.Application.Project.Name); + log.InfoFormat(Core.Common.Gui.Properties.Resources.App_RunRingtoets_Saving_project_0_, gui.Application.Project.Name); gui.Application.SaveProject(); - log.InfoFormat(Core.Common.Gui.Properties.Resources.App_RunRingtoets_Saved_project___0__, gui.Application.Project.Name); + log.InfoFormat(Core.Common.Gui.Properties.Resources.App_RunRingtoets_Saved_project_0_, gui.Application.Project.Name); } }; @@ -208,7 +208,7 @@ { if (!AcquireSingleInstancePerUserMutex()) { - MessageBox.Show(Core.Common.Gui.Properties.Resources.App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Ringtoets__Please_close_the_other_instance_first_); + MessageBox.Show(Core.Common.Gui.Properties.Resources.App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Ringtoets_Please_close_the_other_instance_first); Shutdown(1); return true; //done here } @@ -327,7 +327,7 @@ previousExceptionsCount++; var s = previousExceptionsText; previousExceptionsText = - string.Format(Core.Common.Gui.Properties.Resources.App_HandleException_, + string.Format(Core.Common.Gui.Properties.Resources.App_HandleException_0_, previousExceptionsCount, dialog.ExceptionText, s); Index: Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs =================================================================== diff -u -r555c08c6f506516d96076f33c1d6d4c4217b2a1c -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 555c08c6f506516d96076f33c1d6d4c4217b2a1c) +++ Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -72,109 +72,109 @@ /// /// Looks up a localized string similar to Kan Execute() niet aanroepen voor activiteit met de '{0}' status.. /// - internal static string Activity_Execute_Can_t_call_Execute___for_activity_in__0__state_ { + internal static string Activity_Execute_Can_t_call_Execute_for_activity_in_0_state { get { - return ResourceManager.GetString("Activity_Execute_Can_t_call_Execute___for_activity_in__0__state_", resourceCulture); + return ResourceManager.GetString("Activity_Execute_Can_t_call_Execute_for_activity_in_0_state", resourceCulture); } } /// /// Looks up a localized string similar to Activiteit '{0}' geannuleerd.. /// - internal static string ActivityRunner_Completed_Cancelled_activity__0_ { + internal static string ActivityRunner_Completed_Cancelled_activity_0_ { get { - return ResourceManager.GetString("ActivityRunner_Completed_Cancelled_activity__0_", resourceCulture); + return ResourceManager.GetString("ActivityRunner_Completed_Cancelled_activity_0_", resourceCulture); } } /// /// Looks up a localized string similar to Activiteit '{0}' voltooid.. /// - internal static string ActivityRunner_Completed_Finished_activity__0_ { + internal static string ActivityRunner_Completed_Finished_activity_0_ { get { - return ResourceManager.GetString("ActivityRunner_Completed_Finished_activity__0_", resourceCulture); + return ResourceManager.GetString("ActivityRunner_Completed_Finished_activity_0_", resourceCulture); } } /// /// Looks up a localized string similar to Activiteit '{0}' in wachtrij gezet.. /// - internal static string ActivityRunner_Enqueue_Enqueued_activity__0_ { + internal static string ActivityRunner_Enqueue_Enqueued_activity_0_ { get { - return ResourceManager.GetString("ActivityRunner_Enqueue_Enqueued_activity__0_", resourceCulture); + return ResourceManager.GetString("ActivityRunner_Enqueue_Enqueued_activity_0_", resourceCulture); } } /// /// Looks up a localized string similar to Een fout is opgetreden tijdens het uitvoeren van een achtergrond activiteit:. /// - internal static string ActivityRunner_OnTaskCompleted_An_error_occured_while_running_a_background_activity__ { + internal static string ActivityRunner_OnTaskCompleted_An_error_occured_while_running_a_background_activity { get { return ResourceManager.GetString("ActivityRunner_OnTaskCompleted_An_error_occured_while_running_a_background_activi" + - "ty__", resourceCulture); + "ty", resourceCulture); } } /// /// Looks up a localized string similar to Een fout is opgetreden tijdens het uitvoeren van activiteit {0}:. /// - internal static string ActivityRunner_OnTaskCompleted_An_error_occured_while_running_activity__0___ { + internal static string ActivityRunner_OnTaskCompleted_An_error_occured_while_running_activity_0_ { get { - return ResourceManager.GetString("ActivityRunner_OnTaskCompleted_An_error_occured_while_running_activity__0___", resourceCulture); + return ResourceManager.GetString("ActivityRunner_OnTaskCompleted_An_error_occured_while_running_activity_0_", resourceCulture); } } /// /// Looks up a localized string similar to Opschonen van {0} is mislukt.. /// - internal static string ActivityRunner_RunActivity_Clean_up_of__0__has_failed_ { + internal static string ActivityRunner_RunActivity_Clean_up_of_0_has_failed { get { - return ResourceManager.GetString("ActivityRunner_RunActivity_Clean_up_of__0__has_failed_", resourceCulture); + return ResourceManager.GetString("ActivityRunner_RunActivity_Clean_up_of_0_has_failed", resourceCulture); } } /// /// Looks up a localized string similar to Uitvoering van {0} is geannuleerd.. /// - internal static string ActivityRunner_RunActivity_Execution_of__0__has_been_canceled_ { + internal static string ActivityRunner_RunActivity_Execution_of_0_has_been_canceled { get { - return ResourceManager.GetString("ActivityRunner_RunActivity_Execution_of__0__has_been_canceled_", resourceCulture); + return ResourceManager.GetString("ActivityRunner_RunActivity_Execution_of_0_has_been_canceled", resourceCulture); } } /// /// Looks up a localized string similar to Uitvoering van {0} is mislukt.. /// - internal static string ActivityRunner_RunActivity_Execution_of__0__has_failed_ { + internal static string ActivityRunner_RunActivity_Execution_of_0_has_failed { get { - return ResourceManager.GetString("ActivityRunner_RunActivity_Execution_of__0__has_failed_", resourceCulture); + return ResourceManager.GetString("ActivityRunner_RunActivity_Execution_of_0_has_failed", resourceCulture); } } /// /// Looks up a localized string similar to Afronden van {0} is mislukt.. /// - internal static string ActivityRunner_RunActivity_Finishing_of__0__has_failed_ { + internal static string ActivityRunner_RunActivity_Finishing_of_0_has_failed { get { - return ResourceManager.GetString("ActivityRunner_RunActivity_Finishing_of__0__has_failed_", resourceCulture); + return ResourceManager.GetString("ActivityRunner_RunActivity_Finishing_of_0_has_failed", resourceCulture); } } /// /// Looks up a localized string similar to Initialisatie van {0} is mislukt.. /// - internal static string ActivityRunner_RunActivity_Initialization_of__0__has_failed_ { + internal static string ActivityRunner_RunActivity_Initialization_of_0_has_failed { get { - return ResourceManager.GetString("ActivityRunner_RunActivity_Initialization_of__0__has_failed_", resourceCulture); + return ResourceManager.GetString("ActivityRunner_RunActivity_Initialization_of_0_has_failed", resourceCulture); } } /// /// Looks up a localized string similar to Uitvoeren activiteit {0}.. /// - internal static string ActivityRunner_StartTaskIfPossible_Run_activity__0_ { + internal static string ActivityRunner_StartTaskIfPossible_Run_activity_0_ { get { - return ResourceManager.GetString("ActivityRunner_StartTaskIfPossible_Run_activity__0_", resourceCulture); + return ResourceManager.GetString("ActivityRunner_StartTaskIfPossible_Run_activity_0_", resourceCulture); } } @@ -190,19 +190,19 @@ /// /// Looks up a localized string similar to Alle plugins zijn geactiveerd.. /// - internal static string RingtoetsApplication_ActivatePlugins_All_plugins_were_activated_ { + internal static string RingtoetsApplication_ActivatePlugins_All_plugins_were_activated { get { - return ResourceManager.GetString("RingtoetsApplication_ActivatePlugins_All_plugins_were_activated_", resourceCulture); + return ResourceManager.GetString("RingtoetsApplication_ActivatePlugins_All_plugins_were_activated", resourceCulture); } } /// /// Looks up a localized string similar to 'Run()' moet eerst worden aangeroepen voordat het project kan worden geopend.. /// - internal static string RingtoetsApplication_CreateNewProject_Run___must_be_called_first_before_project_can_be_opened { + internal static string RingtoetsApplication_CreateNewProject_Run_must_be_called_first_before_project_can_be_opened { get { - return ResourceManager.GetString("RingtoetsApplication_CreateNewProject_Run___must_be_called_first_before_project_c" + - "an_be_opened", resourceCulture); + return ResourceManager.GetString("RingtoetsApplication_CreateNewProject_Run_must_be_called_first_before_project_can" + + "_be_opened", resourceCulture); } } @@ -218,45 +218,45 @@ /// /// Looks up a localized string similar to Registreren van exporteer routine {0}.. /// - internal static string RingtoetsApplication_RegisterExporters_Registering_exporter__0_ { + internal static string RingtoetsApplication_RegisterExporters_Registering_exporter_0_ { get { - return ResourceManager.GetString("RingtoetsApplication_RegisterExporters_Registering_exporter__0_", resourceCulture); + return ResourceManager.GetString("RingtoetsApplication_RegisterExporters_Registering_exporter_0_", resourceCulture); } } /// /// Looks up a localized string similar to Registratie van de exporteer routines.... /// - internal static string RingtoetsApplication_RegisterExporters_Registering_exporters____ { + internal static string RingtoetsApplication_RegisterExporters_Registering_exporters { get { - return ResourceManager.GetString("RingtoetsApplication_RegisterExporters_Registering_exporters____", resourceCulture); + return ResourceManager.GetString("RingtoetsApplication_RegisterExporters_Registering_exporters", resourceCulture); } } /// /// Looks up a localized string similar to Registreren van importeer routine {0}.. /// - internal static string RingtoetsApplication_RegisterImporters_Registering_importer__0_ { + internal static string RingtoetsApplication_RegisterImporters_Registering_importer_0_ { get { - return ResourceManager.GetString("RingtoetsApplication_RegisterImporters_Registering_importer__0_", resourceCulture); + return ResourceManager.GetString("RingtoetsApplication_RegisterImporters_Registering_importer_0_", resourceCulture); } } /// /// Looks up a localized string similar to Registratie van de importeer routines.... /// - internal static string RingtoetsApplication_RegisterImporters_Registering_importers____ { + internal static string RingtoetsApplication_RegisterImporters_Registering_importers { get { - return ResourceManager.GetString("RingtoetsApplication_RegisterImporters_Registering_importers____", resourceCulture); + return ResourceManager.GetString("RingtoetsApplication_RegisterImporters_Registering_importers", resourceCulture); } } /// /// Looks up a localized string similar to Activeer plugins.... /// - internal static string RingtoetsApplication_Run_Activating_plugins____ { + internal static string RingtoetsApplication_Run_Activating_plugins { get { - return ResourceManager.GetString("RingtoetsApplication_Run_Activating_plugins____", resourceCulture); + return ResourceManager.GetString("RingtoetsApplication_Run_Activating_plugins", resourceCulture); } } @@ -272,18 +272,18 @@ /// /// Looks up a localized string similar to Nieuw project aanmaken.... /// - internal static string RingtoetsApplication_Run_Creating_new_project____ { + internal static string RingtoetsApplication_Run_Creating_new_project { get { - return ResourceManager.GetString("RingtoetsApplication_Run_Creating_new_project____", resourceCulture); + return ResourceManager.GetString("RingtoetsApplication_Run_Creating_new_project", resourceCulture); } } /// /// Looks up a localized string similar to Ringtoets is klaar, opstarttijd van {0:F3} seconden.. /// - internal static string RingtoetsApplication_Run_Ringtoets_is_ready__started_in__0_F3__seconds { + internal static string RingtoetsApplication_Run_Ringtoets_is_ready_started_in_0_F3_seconds { get { - return ResourceManager.GetString("RingtoetsApplication_Run_Ringtoets_is_ready__started_in__0_F3__seconds", resourceCulture); + return ResourceManager.GetString("RingtoetsApplication_Run_Ringtoets_is_ready_started_in_0_F3_seconds", resourceCulture); } } Index: Core/Common/src/Core.Common.Base/Properties/Resources.resx =================================================================== diff -u -r555c08c6f506516d96076f33c1d6d4c4217b2a1c -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision 555c08c6f506516d96076f33c1d6d4c4217b2a1c) +++ Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -123,79 +123,79 @@ Ringtoets wordt al uitgevoerd en kan daarom niet nog een keer gestart worden. - + Nieuw project aanmaken... - + Activeer plugins... Wachten tot alle plugins zijn geactiveerd... - + Ringtoets is klaar, opstarttijd van {0:F3} seconden. - + 'Run()' moet eerst worden aangeroepen voordat het project kan worden geopend. Omgevingsvariabelen: - + Alle plugins zijn geactiveerd. - + Registreren van importeer routine {0}. - + Registratie van de exporteer routines... - + Registreren van exporteer routine {0}. - + Registratie van de importeer routines... Activiteit is '{0}'. 'Initialize()' moet aangeroepen worden voor 'Execute()'. - + Kan Execute() niet aanroepen voor activiteit met de '{0}' status. - + Activiteit '{0}' geannuleerd. - + Activiteit '{0}' voltooid. - + Een fout is opgetreden tijdens het uitvoeren van een achtergrond activiteit: - + Een fout is opgetreden tijdens het uitvoeren van activiteit {0}: - + Activiteit '{0}' in wachtrij gezet. - + Initialisatie van {0} is mislukt. - + Uitvoering van {0} is geannuleerd. - + Uitvoering van {0} is mislukt. - + Afronden van {0} is mislukt. - + Opschonen van {0} is mislukt. {0} van {1} - + Uitvoeren activiteit {0}. \ No newline at end of file Index: Core/Common/src/Core.Common.Base/RingtoetsApplication.cs =================================================================== diff -u -r48e5d632b4f0c1124a7e574430c6030a290105ce -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Base/RingtoetsApplication.cs (.../RingtoetsApplication.cs) (revision 48e5d632b4f0c1124a7e574430c6030a290105ce) +++ Core/Common/src/Core.Common.Base/RingtoetsApplication.cs (.../RingtoetsApplication.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -208,10 +208,10 @@ isRunning = true; - log.Info(Properties.Resources.RingtoetsApplication_Run_Creating_new_project____); + log.Info(Properties.Resources.RingtoetsApplication_Run_Creating_new_project); CreateNewProject(); - log.Info(Properties.Resources.RingtoetsApplication_Run_Activating_plugins____); + log.Info(Properties.Resources.RingtoetsApplication_Run_Activating_plugins); ActivatePlugins(); RegisterImporters(); @@ -225,7 +225,7 @@ stopwatch.Stop(); - log.InfoFormat(Properties.Resources.RingtoetsApplication_Run_Ringtoets_is_ready__started_in__0_F3__seconds, stopwatch.ElapsedMilliseconds/1000.0); + log.InfoFormat(Properties.Resources.RingtoetsApplication_Run_Ringtoets_is_ready_started_in_0_F3_seconds, stopwatch.ElapsedMilliseconds/1000.0); if (AfterRun != null) { @@ -252,7 +252,7 @@ { if (!isRunning) { - throw new InvalidOperationException(Properties.Resources.RingtoetsApplication_CreateNewProject_Run___must_be_called_first_before_project_can_be_opened); + throw new InvalidOperationException(Properties.Resources.RingtoetsApplication_CreateNewProject_Run_must_be_called_first_before_project_can_be_opened); } projectBeingCreated = new Project(); @@ -267,7 +267,7 @@ { if (!isRunning) { - throw new InvalidOperationException(Properties.Resources.RingtoetsApplication_CreateNewProject_Run___must_be_called_first_before_project_can_be_opened); + throw new InvalidOperationException(Properties.Resources.RingtoetsApplication_CreateNewProject_Run_must_be_called_first_before_project_can_be_opened); } // TODO: implement and remove Project = new Project(); @@ -335,7 +335,7 @@ private void ActivatePlugins() { - log.Debug(Properties.Resources.RingtoetsApplication_Run_Activating_plugins____); + log.Debug(Properties.Resources.RingtoetsApplication_Run_Activating_plugins); // Activate all plugins foreach (var plugin in Plugins) @@ -356,7 +356,7 @@ Environment.CurrentDirectory = cwd; } - log.Debug(Properties.Resources.RingtoetsApplication_ActivatePlugins_All_plugins_were_activated_); + log.Debug(Properties.Resources.RingtoetsApplication_ActivatePlugins_All_plugins_were_activated); } /// @@ -398,25 +398,25 @@ private void RegisterImporters() { - log.Debug(Properties.Resources.RingtoetsApplication_RegisterImporters_Registering_importers____); + log.Debug(Properties.Resources.RingtoetsApplication_RegisterImporters_Registering_importers); foreach (var fileImporter in Plugins.SelectMany(plugin => plugin.GetFileImporters())) { fileImporters.Add(fileImporter); - log.DebugFormat(Properties.Resources.RingtoetsApplication_RegisterImporters_Registering_importer__0_, fileImporter.Name); + log.DebugFormat(Properties.Resources.RingtoetsApplication_RegisterImporters_Registering_importer_0_, fileImporter.Name); } } private void RegisterExporters() { - log.Debug(Properties.Resources.RingtoetsApplication_RegisterExporters_Registering_exporters____); + log.Debug(Properties.Resources.RingtoetsApplication_RegisterExporters_Registering_exporters); foreach (var fileExporter in Plugins.SelectMany(plugin => plugin.GetFileExporters())) { fileExporters.Add(fileExporter); - log.DebugFormat(Properties.Resources.RingtoetsApplication_RegisterExporters_Registering_exporter__0_, fileExporter.Name); + log.DebugFormat(Properties.Resources.RingtoetsApplication_RegisterExporters_Registering_exporter_0_, fileExporter.Name); } } Index: Core/Common/src/Core.Common.Base/Workflow/Activity.cs =================================================================== diff -u -r4f50d51f0faba8e846bbaedcf64e39a814b8d975 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Base/Workflow/Activity.cs (.../Activity.cs) (revision 4f50d51f0faba8e846bbaedcf64e39a814b8d975) +++ Core/Common/src/Core.Common.Base/Workflow/Activity.cs (.../Activity.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -74,7 +74,7 @@ if (Status != ActivityStatus.Executed && Status != ActivityStatus.Initialized) { - throw new InvalidOperationException(string.Format(Resources.Activity_Execute_Can_t_call_Execute___for_activity_in__0__state_, Status)); + throw new InvalidOperationException(string.Format(Resources.Activity_Execute_Can_t_call_Execute_for_activity_in_0_state, Status)); } try Index: Core/Common/src/Core.Common.Base/Workflow/ActivityRunner.cs =================================================================== diff -u -rf43e90a16e94b36691e0ebb8e9ffa5989678b093 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Base/Workflow/ActivityRunner.cs (.../ActivityRunner.cs) (revision f43e90a16e94b36691e0ebb8e9ffa5989678b093) +++ Core/Common/src/Core.Common.Base/Workflow/ActivityRunner.cs (.../ActivityRunner.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -123,7 +123,7 @@ todoTasks.RemoveAt(0); } - Debug.WriteLine(Resources.ActivityRunner_StartTaskIfPossible_Run_activity__0_, (taskToRun.Activity.Name)); + Debug.WriteLine(Resources.ActivityRunner_StartTaskIfPossible_Run_activity_0_, (taskToRun.Activity.Name)); if (beforeActualRun != null) { @@ -139,8 +139,8 @@ var task = (AsyncActivityRunner) sender; Debug.WriteLine(task.Activity.Status == ActivityStatus.Cancelled - ? string.Format(Resources.ActivityRunner_Completed_Cancelled_activity__0_, task.Activity.Name) - : string.Format(Resources.ActivityRunner_Completed_Finished_activity__0_, task.Activity.Name)); + ? string.Format(Resources.ActivityRunner_Completed_Cancelled_activity_0_, task.Activity.Name) + : string.Format(Resources.ActivityRunner_Completed_Finished_activity_0_, task.Activity.Name)); try { @@ -190,8 +190,8 @@ if (!sender.CompletedSuccesfully) { log.Error(String.IsNullOrEmpty(sender.Activity.Name) - ? Resources.ActivityRunner_OnTaskCompleted_An_error_occured_while_running_a_background_activity__ - : String.Format(Resources.ActivityRunner_OnTaskCompleted_An_error_occured_while_running_activity__0___, sender.Activity.Name), sender.Exception); + ? Resources.ActivityRunner_OnTaskCompleted_An_error_occured_while_running_a_background_activity + : String.Format(Resources.ActivityRunner_OnTaskCompleted_An_error_occured_while_running_activity_0_, sender.Activity.Name), sender.Exception); } if (ActivityCompleted != null) @@ -244,7 +244,7 @@ activities.Add(activity); } - Debug.WriteLine(string.Format(Resources.ActivityRunner_Enqueue_Enqueued_activity__0_, activity.Name)); + Debug.WriteLine(string.Format(Resources.ActivityRunner_Enqueue_Enqueued_activity_0_, activity.Name)); //TODO: it might already be running so running would not be changed. //fix and review @@ -259,14 +259,14 @@ if (activity.Status == ActivityStatus.Failed) { - throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Initialization_of__0__has_failed_, activity.Name)); + throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Initialization_of_0_has_failed, activity.Name)); } while (activity.Status != ActivityStatus.Done) { if (activity.Status == ActivityStatus.Cancelled) { - log.WarnFormat(Resources.ActivityRunner_RunActivity_Execution_of__0__has_been_canceled_, activity.Name); + log.WarnFormat(Resources.ActivityRunner_RunActivity_Execution_of_0_has_been_canceled, activity.Name); break; } @@ -277,7 +277,7 @@ if (activity.Status == ActivityStatus.Failed) { - throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Execution_of__0__has_failed_, activity.Name)); + throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Execution_of_0_has_failed, activity.Name)); } } @@ -287,15 +287,15 @@ if (activity.Status == ActivityStatus.Failed) { - throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Finishing_of__0__has_failed_, activity.Name)); + throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Finishing_of_0_has_failed, activity.Name)); } } activity.Cleanup(); if (activity.Status == ActivityStatus.Failed) { - throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Clean_up_of__0__has_failed_, activity.Name)); + throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Clean_up_of_0_has_failed, activity.Name)); } } catch (Exception exception) @@ -314,7 +314,7 @@ } catch (Exception) { - log.ErrorFormat(Resources.ActivityRunner_RunActivity_Clean_up_of__0__has_failed_, activity.Name); + log.ErrorFormat(Resources.ActivityRunner_RunActivity_Clean_up_of_0_has_failed, activity.Name); } } } Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs =================================================================== diff -u -r8e593693b22d3aff6994f810976d208e64bd5f96 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs (.../Chart.cs) (revision 8e593693b22d3aff6994f810976d208e64bd5f96) +++ Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs (.../Chart.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -320,7 +320,7 @@ case ".bmp": return ImageFormat.Bmp; default: - throw new ArgumentException(string.Format(Resources.Chart_GetImageFormatByExtension_Extension___0___not_supported, ext), "filename"); + throw new ArgumentException(string.Format(Resources.Chart_GetImageFormatByExtension_Extension_0_not_supported, ext), "filename"); } } @@ -352,7 +352,7 @@ format = chart.Export.Image.EPS; break; default: - throw new ArgumentException(string.Format(Resources.Chart_GetImageFormatByExtension_Extension___0___not_supported, ext), "filename"); + throw new ArgumentException(string.Format(Resources.Chart_GetImageFormatByExtension_Extension_0_not_supported, ext), "filename"); } return format; } Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Series/ChartSeries.cs =================================================================== diff -u -r8a9a2efad299327b082088189b9a37c32c55a890 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/Charting/Series/ChartSeries.cs (.../ChartSeries.cs) (revision 8a9a2efad299327b082088189b9a37c32c55a890) +++ Core/Common/src/Core.Common.Controls.Swf/Charting/Series/ChartSeries.cs (.../ChartSeries.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -92,7 +92,7 @@ } catch (InvalidCastException ex) { - throw new ArgumentException(Resources.ChartSeries_DataSource_Invalid_argument_for_series_datasource__Are_you_passing_IEnumerable__IList_and_IListSource_are_supported, ex); + throw new ArgumentException(Resources.ChartSeries_DataSource_Invalid_argument_for_series_datasource_Are_you_passing_IEnumerable_IList_and_IListSource_are_supported, ex); } } } @@ -398,7 +398,7 @@ if (!yIsNumeric) { - throw new NotSupportedException(String.Format(Resources.ChartSeries_Add_Input_format_not_supported__y_must_be_numeric_but_is_of_type___0__, y.GetType())); + throw new NotSupportedException(String.Format(Resources.ChartSeries_Add_Input_format_not_supported_y_must_be_numeric_but_is_of_type_0_, y.GetType())); } double yValue = Convert.ToDouble(y); Index: Core/Common/src/Core.Common.Controls.Swf/Charting/TeeChartHelper.cs =================================================================== diff -u -r8a9a2efad299327b082088189b9a37c32c55a890 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/Charting/TeeChartHelper.cs (.../TeeChartHelper.cs) (revision 8a9a2efad299327b082088189b9a37c32c55a890) +++ Core/Common/src/Core.Common.Controls.Swf/Charting/TeeChartHelper.cs (.../TeeChartHelper.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -55,7 +55,7 @@ } } //THIS is done because Tool.GetFirstLastSeries(series, out tmpMin, out tmpMax)) is not documented (unable to find) - Assert.IsTrue(result >= -1, Resources.TeeChartHelper_GetNearestPoint_Should_not_return_indexes_below__1__); + Assert.IsTrue(result >= -1, Resources.TeeChartHelper_GetNearestPoint_Should_not_return_indexes_below_1_); return result; } Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/ChartViewSeriesToolBase.cs =================================================================== diff -u -r8a9a2efad299327b082088189b9a37c32c55a890 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/ChartViewSeriesToolBase.cs (.../ChartViewSeriesToolBase.cs) (revision 8a9a2efad299327b082088189b9a37c32c55a890) +++ Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/ChartViewSeriesToolBase.cs (.../ChartViewSeriesToolBase.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -137,7 +137,7 @@ { if (iSeries != null && iSeries != value) { - throw new ArgumentException(String.Format(Resources.ChartViewSeriesToolBase_LastSelectedSeries_This_tool_only_accepts__0__as_series, iSeries)); + throw new ArgumentException(String.Format(Resources.ChartViewSeriesToolBase_LastSelectedSeries_This_tool_only_accepts_0_as_series, iSeries)); } lastSelectedSeries = value; } @@ -204,7 +204,7 @@ return matchingSeries; } } - throw new ArgumentException(Resources.ChartViewSeriesToolBase_GetChartSeriesFromInternalSeries_Unknown_TeeChart_series__not_related_to_any_known_ChartSeries); + throw new ArgumentException(Resources.ChartViewSeriesToolBase_GetChartSeriesFromInternalSeries_Unknown_TeeChart_series_Not_related_to_any_known_ChartSeries); } /// Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/EditPointTool.cs =================================================================== diff -u -r4f50d51f0faba8e846bbaedcf64e39a814b8d975 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/EditPointTool.cs (.../EditPointTool.cs) (revision 4f50d51f0faba8e846bbaedcf64e39a814b8d975) +++ Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/EditPointTool.cs (.../EditPointTool.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -154,7 +154,7 @@ SelectedPointIndex = -1; return; } - throw new NotImplementedException(Resources.KeyEvent_Deletion_not_implemented_for_this_type_of_datasource_); + throw new NotImplementedException(Resources.KeyEvent_Deletion_not_implemented_for_this_type_of_datasource); } } @@ -340,7 +340,7 @@ case DragStyle.Y: return Cursors.SizeNS; default: - throw new NotImplementedException(String.Format(Resources.EditPointTool_GetCursorIcon_No_cursor_assigned_for__0_, dragStyle)); + throw new NotImplementedException(String.Format(Resources.EditPointTool_GetCursorIcon_No_cursor_assigned_for_0_, dragStyle)); } } Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/ExportChartAsImageChartTool.cs =================================================================== diff -u -rf43e90a16e94b36691e0ebb8e9ffa5989678b093 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/ExportChartAsImageChartTool.cs (.../ExportChartAsImageChartTool.cs) (revision f43e90a16e94b36691e0ebb8e9ffa5989678b093) +++ Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/ExportChartAsImageChartTool.cs (.../ExportChartAsImageChartTool.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -41,7 +41,7 @@ menu.Items.Add(new ToolStripSeparator()); } - menu.Items.Add(new ToolStripMenuItem(Resources.KeyEvent_Deletion_not_implemented_for_this_type_of_datasource_, null, ExportChartEventHandler)); + menu.Items.Add(new ToolStripMenuItem(Resources.KeyEvent_Deletion_not_implemented_for_this_type_of_datasource, null, ExportChartEventHandler)); } private void ExportChartEventHandler(object sender, EventArgs e) Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/SelectPointTool.cs =================================================================== diff -u -r7284f9def6464e4b6f36dda3b29aba7d58108dc9 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/SelectPointTool.cs (.../SelectPointTool.cs) (revision 7284f9def6464e4b6f36dda3b29aba7d58108dc9) +++ Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/SelectPointTool.cs (.../SelectPointTool.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -259,7 +259,7 @@ } else { - throw new NotImplementedException(Resources.KeyEvent_Deletion_not_implemented_for_this_type_of_datasource_); + throw new NotImplementedException(Resources.KeyEvent_Deletion_not_implemented_for_this_type_of_datasource); } //// delete selected point from the series Index: Core/Common/src/Core.Common.Controls.Swf/ExportImageHelper.cs =================================================================== diff -u -rf43e90a16e94b36691e0ebb8e9ffa5989678b093 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/ExportImageHelper.cs (.../ExportImageHelper.cs) (revision f43e90a16e94b36691e0ebb8e9ffa5989678b093) +++ Core/Common/src/Core.Common.Controls.Swf/ExportImageHelper.cs (.../ExportImageHelper.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -63,7 +63,7 @@ Filter = filter, FilterIndex = 1, RestoreDirectory = true, - Title = Resources.Export_as_Image___ + Title = Resources.Export_as_Image }; if (saveFileDialog.ShowDialog() != DialogResult.OK) Index: Core/Common/src/Core.Common.Controls.Swf/FindAndReplaceControl.cs =================================================================== diff -u -r0c662ac435fd244395ce5fd7d94eeefcf940364c -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/FindAndReplaceControl.cs (.../FindAndReplaceControl.cs) (revision 0c662ac435fd244395ce5fd7d94eeefcf940364c) +++ Core/Common/src/Core.Common.Controls.Swf/FindAndReplaceControl.cs (.../FindAndReplaceControl.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -104,14 +104,14 @@ if (string.IsNullOrEmpty(textToSearch)) { - Log.Warn(Resources.FindAndReplaceControl_FindNext_There_is_no_text_to_search_); + Log.Warn(Resources.FindAndReplaceControl_FindNext_There_is_no_text_to_search); return; } var nextMatch = matches.OfType().FirstOrDefault(m => m.Index > GetCurrentPosition()); if (nextMatch == null) { - Log.Info(Resources.FindAndReplaceControl_FindNext_End_of_document_has_been_reached_); + Log.Info(Resources.FindAndReplaceControl_FindNext_End_of_document_has_been_reached); nextMatch = matches.OfType().FirstOrDefault(); } @@ -181,7 +181,7 @@ { ReplaceText(match.Index, match.Length, replaceTextBox.Text); } - Log.InfoFormat(Resources.FindAndReplaceControl_buttonReplaceAll_Click_Replaced__0__occurrences_of__1__with__2_, matches.Count, findTextBox.Text, replaceTextBox.Text); + Log.InfoFormat(Resources.FindAndReplaceControl_buttonReplaceAll_Click_Replaced_0_occurrences_of_1_with_2_, matches.Count, findTextBox.Text, replaceTextBox.Text); } private void button_KeyDown(object sender, KeyEventArgs e) Index: Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs =================================================================== diff -u -r6a2a618c5c06dcc94b092420bda2b193cfd2663a -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6a2a618c5c06dcc94b092420bda2b193cfd2663a) +++ Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -119,29 +119,28 @@ /// /// Looks up a localized string similar to Extensie ({0}) wordt niet ondersteund.. /// - internal static string Chart_GetImageFormatByExtension_Extension___0___not_supported { + internal static string Chart_GetImageFormatByExtension_Extension_0_not_supported { get { - return ResourceManager.GetString("Chart_GetImageFormatByExtension_Extension___0___not_supported", resourceCulture); + return ResourceManager.GetString("Chart_GetImageFormatByExtension_Extension_0_not_supported", resourceCulture); } } /// /// Looks up a localized string similar to Invoerformaat wordt niet ondersteund. Y moet numeriek zijn maar is van type: {0}.. /// - internal static string ChartSeries_Add_Input_format_not_supported__y_must_be_numeric_but_is_of_type___0__ { + internal static string ChartSeries_Add_Input_format_not_supported_y_must_be_numeric_but_is_of_type_0_ { get { - return ResourceManager.GetString("ChartSeries_Add_Input_format_not_supported__y_must_be_numeric_but_is_of_type___0_" + - "_", resourceCulture); + return ResourceManager.GetString("ChartSeries_Add_Input_format_not_supported_y_must_be_numeric_but_is_of_type_0_", resourceCulture); } } /// /// Looks up a localized string similar to Ongeldig argument voor databron van gegevensreeks. Biedt u een IEnumerable aan? IList en IListSource worden ondersteund.. /// - internal static string ChartSeries_DataSource_Invalid_argument_for_series_datasource__Are_you_passing_IEnumerable__IList_and_IListSource_are_supported { + internal static string ChartSeries_DataSource_Invalid_argument_for_series_datasource_Are_you_passing_IEnumerable_IList_and_IListSource_are_supported { get { - return ResourceManager.GetString("ChartSeries_DataSource_Invalid_argument_for_series_datasource__Are_you_passing_IE" + - "numerable__IList_and_IListSource_are_supported", resourceCulture); + return ResourceManager.GetString("ChartSeries_DataSource_Invalid_argument_for_series_datasource_Are_you_passing_IEn" + + "umerable_IList_and_IListSource_are_supported", resourceCulture); } } @@ -157,19 +156,19 @@ /// /// Looks up a localized string similar to Onbekende TeeChart gegevensreeks: houdt geen verband met een bekende ChartSeries.. /// - internal static string ChartViewSeriesToolBase_GetChartSeriesFromInternalSeries_Unknown_TeeChart_series__not_related_to_any_known_ChartSeries { + internal static string ChartViewSeriesToolBase_GetChartSeriesFromInternalSeries_Unknown_TeeChart_series_Not_related_to_any_known_ChartSeries { get { return ResourceManager.GetString("ChartViewSeriesToolBase_GetChartSeriesFromInternalSeries_Unknown_TeeChart_series_" + - "_not_related_to_any_known_ChartSeries", resourceCulture); + "Not_related_to_any_known_ChartSeries", resourceCulture); } } /// /// Looks up a localized string similar to Dit programma accepteert alleen {0} als gegevensreeks.. /// - internal static string ChartViewSeriesToolBase_LastSelectedSeries_This_tool_only_accepts__0__as_series { + internal static string ChartViewSeriesToolBase_LastSelectedSeries_This_tool_only_accepts_0_as_series { get { - return ResourceManager.GetString("ChartViewSeriesToolBase_LastSelectedSeries_This_tool_only_accepts__0__as_series", resourceCulture); + return ResourceManager.GetString("ChartViewSeriesToolBase_LastSelectedSeries_This_tool_only_accepts_0_as_series", resourceCulture); } } @@ -332,9 +331,9 @@ /// /// Looks up a localized string similar to Geen cursor toegewezen aan {0}.. /// - internal static string EditPointTool_GetCursorIcon_No_cursor_assigned_for__0_ { + internal static string EditPointTool_GetCursorIcon_No_cursor_assigned_for_0_ { get { - return ResourceManager.GetString("EditPointTool_GetCursorIcon_No_cursor_assigned_for__0_", resourceCulture); + return ResourceManager.GetString("EditPointTool_GetCursorIcon_No_cursor_assigned_for_0_", resourceCulture); } } @@ -361,19 +360,19 @@ /// /// Looks up a localized string similar to Er is een kritieke fout opgetreden. Ringtoets moet herstart worden.. /// - internal static string ExceptionDialog_InitializeComponent_An_unhandled_exception_has_occurred__Ringtoets_needs_to_be_restarted__ { + internal static string ExceptionDialog_InitializeComponent_An_unhandled_exception_has_occurred_Ringtoets_needs_to_be_restarted { get { - return ResourceManager.GetString("ExceptionDialog_InitializeComponent_An_unhandled_exception_has_occurred__Ringtoet" + - "s_needs_to_be_restarted__", resourceCulture); + return ResourceManager.GetString("ExceptionDialog_InitializeComponent_An_unhandled_exception_has_occurred_Ringtoets" + + "_needs_to_be_restarted", resourceCulture); } } /// /// Looks up a localized string similar to Exporteer als afbeelding.... /// - internal static string Export_as_Image___ { + internal static string Export_as_Image { get { - return ResourceManager.GetString("Export_as_Image___", resourceCulture); + return ResourceManager.GetString("Export_as_Image", resourceCulture); } } @@ -398,28 +397,27 @@ /// /// Looks up a localized string similar to {0} exemplaren van {1} zijn met {2} vervangen.. /// - internal static string FindAndReplaceControl_buttonReplaceAll_Click_Replaced__0__occurrences_of__1__with__2_ { + internal static string FindAndReplaceControl_buttonReplaceAll_Click_Replaced_0_occurrences_of_1_with_2_ { get { - return ResourceManager.GetString("FindAndReplaceControl_buttonReplaceAll_Click_Replaced__0__occurrences_of__1__with" + - "__2_", resourceCulture); + return ResourceManager.GetString("FindAndReplaceControl_buttonReplaceAll_Click_Replaced_0_occurrences_of_1_with_2_", resourceCulture); } } /// /// Looks up a localized string similar to Einde van document is bereikt.. /// - internal static string FindAndReplaceControl_FindNext_End_of_document_has_been_reached_ { + internal static string FindAndReplaceControl_FindNext_End_of_document_has_been_reached { get { - return ResourceManager.GetString("FindAndReplaceControl_FindNext_End_of_document_has_been_reached_", resourceCulture); + return ResourceManager.GetString("FindAndReplaceControl_FindNext_End_of_document_has_been_reached", resourceCulture); } } /// /// Looks up a localized string similar to Er is geen tekst om te zoeken.. /// - internal static string FindAndReplaceControl_FindNext_There_is_no_text_to_search_ { + internal static string FindAndReplaceControl_FindNext_There_is_no_text_to_search { get { - return ResourceManager.GetString("FindAndReplaceControl_FindNext_There_is_no_text_to_search_", resourceCulture); + return ResourceManager.GetString("FindAndReplaceControl_FindNext_There_is_no_text_to_search", resourceCulture); } } @@ -475,9 +473,9 @@ /// /// Looks up a localized string similar to Verwijderen is niet geïmplementeerd voor dit type databron.. /// - internal static string KeyEvent_Deletion_not_implemented_for_this_type_of_datasource_ { + internal static string KeyEvent_Deletion_not_implemented_for_this_type_of_datasource { get { - return ResourceManager.GetString("KeyEvent_Deletion_not_implemented_for_this_type_of_datasource_", resourceCulture); + return ResourceManager.GetString("KeyEvent_Deletion_not_implemented_for_this_type_of_datasource", resourceCulture); } } @@ -541,9 +539,9 @@ /// /// Looks up a localized string similar to {0} tot {1}. /// - internal static string RangeLabel__0__till__1_ { + internal static string RangeLabel_0_till_1_ { get { - return ResourceManager.GetString("RangeLabel__0__till__1_", resourceCulture); + return ResourceManager.GetString("RangeLabel_0_till_1_", resourceCulture); } } @@ -589,9 +587,9 @@ /// /// Looks up a localized string similar to Ongebonden kolommen van type {0} worden niet ondersteund.. /// - internal static string TableView_AddUnboundColumn_Unbound_columns_of_type__0__not_supported_ { + internal static string TableView_AddUnboundColumn_Unbound_columns_of_type_0_not_supported { get { - return ResourceManager.GetString("TableView_AddUnboundColumn_Unbound_columns_of_type__0__not_supported_", resourceCulture); + return ResourceManager.GetString("TableView_AddUnboundColumn_Unbound_columns_of_type_0_not_supported", resourceCulture); } } @@ -625,38 +623,38 @@ /// /// Looks up a localized string similar to Kan tekenreeks {0} niet omzetten naar {1} om te plakken.. /// - internal static string TableView_ConvertToColumnValue_Unable_to_convert_string__0__to__1__for_paste { + internal static string TableView_ConvertToColumnValue_Unable_to_convert_string_0_to_1_for_paste { get { - return ResourceManager.GetString("TableView_ConvertToColumnValue_Unable_to_convert_string__0__to__1__for_paste", resourceCulture); + return ResourceManager.GetString("TableView_ConvertToColumnValue_Unable_to_convert_string_0_to_1_for_paste", resourceCulture); } } /// /// Looks up a localized string similar to Niet in staat om cellen te selecteren wanneer tableView RowSelect ingeschakeld is. Gebruik in plaats daarvan SelectRow.. /// - internal static string TableView_SelectCells_Unable_to_select_cells_when_tableView_has_RowSelect_enabled__Use_SelectRow_instead_ { + internal static string TableView_SelectCells_Unable_to_select_cells_when_tableView_has_RowSelect_enabled_Use_SelectRow_instead { get { return ResourceManager.GetString("TableView_SelectCells_Unable_to_select_cells_when_tableView_has_RowSelect_enabled" + - "__Use_SelectRow_instead_", resourceCulture); + "_Use_SelectRow_instead", resourceCulture); } } /// /// Looks up a localized string similar to Actie {0} wordt niet ondersteund door de TableView.. /// - internal static string TableView_SelectedCellsCollectionChanged_Action__0__is_not_supported_by_the_TableView { + internal static string TableView_SelectedCellsCollectionChanged_Action_0_is_not_supported_by_the_TableView { get { - return ResourceManager.GetString("TableView_SelectedCellsCollectionChanged_Action__0__is_not_supported_by_the_Table" + - "View", resourceCulture); + return ResourceManager.GetString("TableView_SelectedCellsCollectionChanged_Action_0_is_not_supported_by_the_TableVi" + + "ew", resourceCulture); } } /// /// Looks up a localized string similar to Kan waarde in cel [{0}, {1}] niet instellen. Reden: {2}.. /// - internal static string TableView_SetCellValueInternal_Can_not_set_value_into_cell___0____1___reason__2_ { + internal static string TableView_SetCellValueInternal_Can_not_set_value_into_cell_0_1_reason_2_ { get { - return ResourceManager.GetString("TableView_SetCellValueInternal_Can_not_set_value_into_cell___0____1___reason__2_", resourceCulture); + return ResourceManager.GetString("TableView_SetCellValueInternal_Can_not_set_value_into_cell_0_1_reason_2_", resourceCulture); } } @@ -717,18 +715,18 @@ /// /// Looks up a localized string similar to Kan waarde voor rij {0} niet instellen. Reden: {1}.. /// - internal static string TableView_ValidateAndCommitRow_Can_not_set_value_for_row__0___reason___1_ { + internal static string TableView_ValidateAndCommitRow_Can_not_set_value_for_row_0_reason_1_ { get { - return ResourceManager.GetString("TableView_ValidateAndCommitRow_Can_not_set_value_for_row__0___reason___1_", resourceCulture); + return ResourceManager.GetString("TableView_ValidateAndCommitRow_Can_not_set_value_for_row_0_reason_1_", resourceCulture); } } /// /// Looks up a localized string similar to <aangepast>. /// - internal static string TableViewColumn_SetXtraGridCustomFormatterCore__custom_ { + internal static string TableViewColumn_SetXtraGridCustomFormatterCore_custom { get { - return ResourceManager.GetString("TableViewColumn_SetXtraGridCustomFormatterCore__custom_", resourceCulture); + return ResourceManager.GetString("TableViewColumn_SetXtraGridCustomFormatterCore_custom", resourceCulture); } } @@ -737,18 +735,18 @@ /// ///Kies Ja om de waarde zelf te corrigeren. Kies Nee als u de oorspronkelijke waarde wilt terugkrijgen.. /// - internal static string TableViewExceptionMessageController_GetLocalizedString_ { + internal static string TableViewExceptionMessageController_GetLocalizedString { get { - return ResourceManager.GetString("TableViewExceptionMessageController_GetLocalizedString_", resourceCulture); + return ResourceManager.GetString("TableViewExceptionMessageController_GetLocalizedString", resourceCulture); } } /// /// Looks up a localized string similar to Kan niet plakken in een gefilterde tableview.. /// - internal static string TableViewPasteController_CanPaste_Cannot_paste_into_filtered_tableview_ { + internal static string TableViewPasteController_CanPaste_Cannot_paste_into_filtered_tableview { get { - return ResourceManager.GetString("TableViewPasteController_CanPaste_Cannot_paste_into_filtered_tableview_", resourceCulture); + return ResourceManager.GetString("TableViewPasteController_CanPaste_Cannot_paste_into_filtered_tableview", resourceCulture); } } @@ -764,10 +762,10 @@ /// /// Looks up a localized string similar to Er zijn geen waardes om te plakken (kopteksten worden overgeslagen).. /// - internal static string TableViewPasteController_CanPaste_There_are_no_values_to_paste__headers_are_skipped__ { + internal static string TableViewPasteController_CanPaste_There_are_no_values_to_paste_Headers_are_skipped { get { - return ResourceManager.GetString("TableViewPasteController_CanPaste_There_are_no_values_to_paste__headers_are_skipp" + - "ed__", resourceCulture); + return ResourceManager.GetString("TableViewPasteController_CanPaste_There_are_no_values_to_paste_Headers_are_skippe" + + "d", resourceCulture); } } @@ -784,47 +782,47 @@ /// /// Looks up a localized string similar to Kan de waarde in cel [{0}, {1}] niet plakken. Rij {0} wordt overgeslagen.. /// - internal static string TableViewPasteController_PasteCellsToRow_Can_not_paste_value_into_cell___0____1____Row__0__will_be_skipped { + internal static string TableViewPasteController_PasteCellsToRow_Can_not_paste_value_into_cell_0_1_Row_0_will_be_skipped { get { - return ResourceManager.GetString("TableViewPasteController_PasteCellsToRow_Can_not_paste_value_into_cell___0____1__" + - "__Row__0__will_be_skipped", resourceCulture); + return ResourceManager.GetString("TableViewPasteController_PasteCellsToRow_Can_not_paste_value_into_cell_0_1_Row_0_" + + "will_be_skipped", resourceCulture); } } /// /// Looks up a localized string similar to Plakken waarden mislukt: {0}.. /// - internal static string TableViewPasteController_PasteCellsToRow_Pasting_values_failed___0_ { + internal static string TableViewPasteController_PasteCellsToRow_Pasting_values_failed_0_ { get { - return ResourceManager.GetString("TableViewPasteController_PasteCellsToRow_Pasting_values_failed___0_", resourceCulture); + return ResourceManager.GetString("TableViewPasteController_PasteCellsToRow_Pasting_values_failed_0_", resourceCulture); } } /// /// Looks up a localized string similar to Ongeldig geplakte rij {0} wordt overgeslagen.. /// - internal static string TableViewPasteController_PasteCellsToRow_Skipping_invalid_row__0__from_pasting { + internal static string TableViewPasteController_PasteCellsToRow_Skipping_invalid_row_0_from_pasting { get { - return ResourceManager.GetString("TableViewPasteController_PasteCellsToRow_Skipping_invalid_row__0__from_pasting", resourceCulture); + return ResourceManager.GetString("TableViewPasteController_PasteCellsToRow_Skipping_invalid_row_0_from_pasting", resourceCulture); } } /// /// Looks up a localized string similar to Klembord bevat geen tekst. Hierdoor kan het niet in de tabel worden geplakt.. /// - internal static string TableViewPasteController_PasteClipboardContents_Clipboard_does_not_contain_text__so_it_cannot_be_pasted_to_the_grid_ { + internal static string TableViewPasteController_PasteClipboardContents_Clipboard_does_not_contain_text_so_it_cannot_be_pasted_to_the_grid { get { - return ResourceManager.GetString("TableViewPasteController_PasteClipboardContents_Clipboard_does_not_contain_text__" + - "so_it_cannot_be_pasted_to_the_grid_", resourceCulture); + return ResourceManager.GetString("TableViewPasteController_PasteClipboardContents_Clipboard_does_not_contain_text_s" + + "o_it_cannot_be_pasted_to_the_grid", resourceCulture); } } /// /// Looks up a localized string similar to Ongeldig rijnummer {0}.. /// - internal static string TableViewPasteController_PasteValuesCore_Invalid_row_number__0_ { + internal static string TableViewPasteController_PasteValuesCore_Invalid_row_number_0_ { get { - return ResourceManager.GetString("TableViewPasteController_PasteValuesCore_Invalid_row_number__0_", resourceCulture); + return ResourceManager.GetString("TableViewPasteController_PasteValuesCore_Invalid_row_number_0_", resourceCulture); } } @@ -858,9 +856,9 @@ /// /// Looks up a localized string similar to Zou geen indices lager dan -1 moeten teruggeven!. /// - internal static string TeeChartHelper_GetNearestPoint_Should_not_return_indexes_below__1__ { + internal static string TeeChartHelper_GetNearestPoint_Should_not_return_indexes_below_1_ { get { - return ResourceManager.GetString("TeeChartHelper_GetNearestPoint_Should_not_return_indexes_below__1__", resourceCulture); + return ResourceManager.GetString("TeeChartHelper_GetNearestPoint_Should_not_return_indexes_below_1_", resourceCulture); } } @@ -886,18 +884,18 @@ /// /// Looks up a localized string similar to De methode of operatie is niet geïmplementeerd.. /// - internal static string TreeNodeList_GetEnumerator_The_method_or_operation_is_not_implemented_ { + internal static string TreeNodeList_GetEnumerator_The_method_or_operation_is_not_implemented { get { - return ResourceManager.GetString("TreeNodeList_GetEnumerator_The_method_or_operation_is_not_implemented_", resourceCulture); + return ResourceManager.GetString("TreeNodeList_GetEnumerator_The_method_or_operation_is_not_implemented", resourceCulture); } } /// /// Looks up a localized string similar to Weet u zeker dat u het volgende item wilt verwijderen: {0}. /// - internal static string TreeView_DeleteNodeData_Are_you_sure_you_want_to_delete_the_following_item___0_ { + internal static string TreeView_DeleteNodeData_Are_you_sure_you_want_to_delete_the_following_item_0_ { get { - return ResourceManager.GetString("TreeView_DeleteNodeData_Are_you_sure_you_want_to_delete_the_following_item___0_", resourceCulture); + return ResourceManager.GetString("TreeView_DeleteNodeData_Are_you_sure_you_want_to_delete_the_following_item_0_", resourceCulture); } } @@ -949,10 +947,10 @@ /// /// Looks up a localized string similar to Kan INodePresenter voor {0} niet vinden. Zorg ervoor dat u de ontbrekende INodePresenter aan de NodePresenters eigenchap van een TreeView heeft toegevoegd.. /// - internal static string TreeViewController_UpdateNode_Can_t_find_INodePresenter_for__0___make_sure_you_added_it_to_Presenters_collection_of_a_TreeView { + internal static string TreeViewController_UpdateNode_Can_t_find_INodePresenter_for_0_make_sure_you_added_it_to_Presenters_collection_of_a_TreeView { get { - return ResourceManager.GetString("TreeViewController_UpdateNode_Can_t_find_INodePresenter_for__0___make_sure_you_ad" + - "ded_it_to_Presenters_collection_of_a_TreeView", resourceCulture); + return ResourceManager.GetString("TreeViewController_UpdateNode_Can_t_find_INodePresenter_for_0_make_sure_you_added" + + "_it_to_Presenters_collection_of_a_TreeView", resourceCulture); } } Index: Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx =================================================================== diff -u -r6a2a618c5c06dcc94b092420bda2b193cfd2663a -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx (.../Resources.resx) (revision 6a2a618c5c06dcc94b092420bda2b193cfd2663a) +++ Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx (.../Resources.resx) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -202,19 +202,19 @@ Gearceerde stijl wordt niet ondersteund voor exporteren en zal genegeerd worden. - + Extensie ({0}) wordt niet ondersteund. - + Invoerformaat wordt niet ondersteund. Y moet numeriek zijn maar is van type: {0}. - + Ongeldig argument voor databron van gegevensreeks. Biedt u een IEnumerable aan? IList en IListSource worden ondersteund. - + Dit programma accepteert alleen {0} als gegevensreeks. - + Geen cursor toegewezen aan {0}. @@ -225,19 +225,19 @@ seconden - + Actie {0} wordt niet ondersteund door de TableView. - + Ongebonden kolommen van type {0} worden niet ondersteund. - + Ongeldig rijnummer {0}. - + Weet u zeker dat u het volgende item wilt verwijderen: {0} - + Kan INodePresenter voor {0} niet vinden. Zorg ervoor dat u de ontbrekende INodePresenter aan de NodePresenters eigenchap van een TreeView heeft toegevoegd. @@ -246,7 +246,7 @@ Aantal X-waarden moet gelijk zijn aan het aantal Y-waarden. - + Zou geen indices lager dan -1 moeten teruggeven! @@ -255,10 +255,10 @@ 'LastSelectedSeries' moet gezet zijn voordat 'SelectedPointIndex' wordt gezet. - + Onbekende TeeChart gegevensreeks: houdt geen verband met een bekende ChartSeries. - + Verwijderen is niet geïmplementeerd voor dit type databron. @@ -267,7 +267,7 @@ X-waarde wordt vastgelegd (rechter limiet) {0} => {1}. - + Exporteer als afbeelding... @@ -284,13 +284,13 @@ Foutmelding van de loader: - + Er is een kritieke fout opgetreden. Ringtoets moet herstart worden. Alle bestanden (*.*)|*.* - + {0} tot {1} @@ -320,7 +320,7 @@ Het geselecteerde item kan niet worden verwijderd. - + De methode of operatie is niet geïmplementeerd. @@ -335,51 +335,51 @@ Ongeldige rij: {0}. - + Plakken waarden mislukt: {0}. - + Ongeldig geplakte rij {0} wordt overgeslagen. - + Kan de waarde in cel [{0}, {1}] niet plakken. Rij {0} wordt overgeslagen. - + Kan niet plakken in een gefilterde tableview. Kan niet plakken in gesorteerde kolom. - + Er zijn geen waardes om te plakken (kopteksten worden overgeslagen). Kan alleen in rechthoekige selectie plakken. - + Klembord bevat geen tekst. Hierdoor kan het niet in de tabel worden geplakt. - + Wilt u de waarde corrigeren? Kies Ja om de waarde zelf te corrigeren. Kies Nee als u de oorspronkelijke waarde wilt terugkrijgen. - + <aangepast> Het is niet toegestaan om rijen aan deze tabel toe te voegen. - + Niet in staat om cellen te selecteren wanneer tableView RowSelect ingeschakeld is. Gebruik in plaats daarvan SelectRow. - + Kan tekenreeks {0} niet omzetten naar {1} om te plakken. - + Kan waarde in cel [{0}, {1}] niet instellen. Reden: {2}. - + Kan waarde voor rij {0} niet instellen. Reden: {1}. @@ -400,13 +400,13 @@ Controleer of de invoer geldig is. - + {0} exemplaren van {1} zijn met {2} vervangen. - + Er is geen tekst om te zoeken. - + Einde van document is bereikt. Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs =================================================================== diff -u -r8a9a2efad299327b082088189b9a37c32c55a890 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs (.../TableView.cs) (revision 8a9a2efad299327b082088189b9a37c32c55a890) +++ Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs (.../TableView.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -414,7 +414,7 @@ dxGridView.UnselectCell(cell.RowIndex, gridColumn); break; default: - throw new NotSupportedException(string.Format(Resources.TableView_SelectedCellsCollectionChanged_Action__0__is_not_supported_by_the_TableView, e.Action)); + throw new NotSupportedException(string.Format(Resources.TableView_SelectedCellsCollectionChanged_Action_0_is_not_supported_by_the_TableView, e.Action)); } } @@ -753,7 +753,7 @@ string errorText; if (!tableViewValidator.ValidateRow(rowIndex, out errorText)) { - Log.ErrorFormat(Resources.TableView_ValidateAndCommitRow_Can_not_set_value_for_row__0___reason___1_, rowIndex, errorText); + Log.ErrorFormat(Resources.TableView_ValidateAndCommitRow_Can_not_set_value_for_row_0_reason_1_, rowIndex, errorText); dxGridView.CancelUpdateCurrentRow(); tableViewValidator.RefreshRowData(); dxGridView.DeleteRow(rowIndex); @@ -784,14 +784,14 @@ : value; if (objectValue == null) { - Log.ErrorFormat(Resources.TableView_SetCellValueInternal_Can_not_set_value_into_cell___0____1___reason__2_, rowIndex, col.AbsoluteIndex, Resources.TableView_SetCellValueInternal_No_conversion_from_string_possible); + Log.ErrorFormat(Resources.TableView_SetCellValueInternal_Can_not_set_value_into_cell_0_1_reason_2_, rowIndex, col.AbsoluteIndex, Resources.TableView_SetCellValueInternal_No_conversion_from_string_possible); return false; } string error; if (!tableViewValidator.ValidateCell(new TableViewCell(rowIndex, GetColumnByDxColumn(col)), objectValue, out error)) { - Log.ErrorFormat(Resources.TableView_SetCellValueInternal_Can_not_set_value_into_cell___0____1___reason__2_, rowIndex, col.AbsoluteIndex, error); + Log.ErrorFormat(Resources.TableView_SetCellValueInternal_Can_not_set_value_into_cell_0_1_reason_2_, rowIndex, col.AbsoluteIndex, error); return false; } @@ -830,7 +830,7 @@ } } - Log.WarnFormat(Resources.TableView_ConvertToColumnValue_Unable_to_convert_string__0__to__1__for_paste, cellValue, columnType); + Log.WarnFormat(Resources.TableView_ConvertToColumnValue_Unable_to_convert_string_0_to_1_for_paste, cellValue, columnType); return null; } } @@ -1652,7 +1652,7 @@ dxGridView.BeginSelection(); if (RowSelect) { - throw new InvalidOperationException(Resources.TableView_SelectCells_Unable_to_select_cells_when_tableView_has_RowSelect_enabled__Use_SelectRow_instead_); + throw new InvalidOperationException(Resources.TableView_SelectCells_Unable_to_select_cells_when_tableView_has_RowSelect_enabled_Use_SelectRow_instead); } if (clearOldSelection) @@ -1858,7 +1858,7 @@ } else { - throw new ArgumentException(string.Format(Resources.TableView_AddUnboundColumn_Unbound_columns_of_type__0__not_supported_, columnType)); + throw new ArgumentException(string.Format(Resources.TableView_AddUnboundColumn_Unbound_columns_of_type_0_not_supported, columnType)); } if (editor != null) { Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableViewColumn.cs =================================================================== diff -u -r8a9a2efad299327b082088189b9a37c32c55a890 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/Table/TableViewColumn.cs (.../TableViewColumn.cs) (revision 8a9a2efad299327b082088189b9a37c32c55a890) +++ Core/Common/src/Core.Common.Controls.Swf/Table/TableViewColumn.cs (.../TableViewColumn.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -395,7 +395,7 @@ dxFormatInfo.FormatType = FormatType.Custom; dxFormatInfo.Format = new TableViewCellFormatterProvider(value); - dxFormatInfo.FormatString = Resources.TableViewColumn_SetXtraGridCustomFormatterCore__custom_; //must be non null/empty for custom formatting to work + dxFormatInfo.FormatString = Resources.TableViewColumn_SetXtraGridCustomFormatterCore_custom; //must be non null/empty for custom formatting to work } private FormatType GetFormatType(string value) Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableViewExceptionMessageController.cs =================================================================== diff -u -rf43e90a16e94b36691e0ebb8e9ffa5989678b093 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/Table/TableViewExceptionMessageController.cs (.../TableViewExceptionMessageController.cs) (revision f43e90a16e94b36691e0ebb8e9ffa5989678b093) +++ Core/Common/src/Core.Common.Controls.Swf/Table/TableViewExceptionMessageController.cs (.../TableViewExceptionMessageController.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -8,7 +8,7 @@ public override string GetLocalizedString(GridStringId id) { return id == GridStringId.ColumnViewExceptionMessage - ? Resources.TableViewExceptionMessageController_GetLocalizedString_ + ? Resources.TableViewExceptionMessageController_GetLocalizedString : base.GetLocalizedString(id); } } Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableViewPasteController.cs =================================================================== diff -u -r8a9a2efad299327b082088189b9a37c32c55a890 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/Table/TableViewPasteController.cs (.../TableViewPasteController.cs) (revision 8a9a2efad299327b082088189b9a37c32c55a890) +++ Core/Common/src/Core.Common.Controls.Swf/Table/TableViewPasteController.cs (.../TableViewPasteController.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -48,7 +48,7 @@ // for now only allow to paste text if (!Clipboard.ContainsText()) { - Log.Debug(Resources.TableViewPasteController_PasteClipboardContents_Clipboard_does_not_contain_text__so_it_cannot_be_pasted_to_the_grid_); + Log.Debug(Resources.TableViewPasteController_PasteClipboardContents_Clipboard_does_not_contain_text_so_it_cannot_be_pasted_to_the_grid); return; } @@ -221,7 +221,7 @@ if (clipboardLines.Length == 0) { - errorMessage = Resources.TableViewPasteController_CanPaste_There_are_no_values_to_paste__headers_are_skipped__; + errorMessage = Resources.TableViewPasteController_CanPaste_There_are_no_values_to_paste_Headers_are_skipped; return false; } @@ -241,7 +241,7 @@ } if (TableView.Columns.Any(col => !string.IsNullOrEmpty(col.FilterString))) { - errorMessage = Resources.TableViewPasteController_CanPaste_Cannot_paste_into_filtered_tableview_; //todo: add name of column here? + errorMessage = Resources.TableViewPasteController_CanPaste_Cannot_paste_into_filtered_tableview; //todo: add name of column here? return false; } return true; @@ -292,7 +292,7 @@ { if (!SafeSetCellValue(index, startColumnIndex + i, content[i%contentWidth])) { - Log.ErrorFormat(Resources.TableViewPasteController_PasteCellsToRow_Can_not_paste_value_into_cell___0____1____Row__0__will_be_skipped, + Log.ErrorFormat(Resources.TableViewPasteController_PasteCellsToRow_Can_not_paste_value_into_cell_0_1_Row_0_will_be_skipped, startRowIndex, startColumnIndex + i); if (addNewRow) { @@ -314,7 +314,7 @@ } if (!SafeSetRowCellValues(index, startColumnIndex, values)) { - Log.ErrorFormat(Resources.TableViewPasteController_PasteCellsToRow_Skipping_invalid_row__0__from_pasting, + Log.ErrorFormat(Resources.TableViewPasteController_PasteCellsToRow_Skipping_invalid_row_0_from_pasting, startRowIndex); if (addNewRow) { @@ -328,7 +328,7 @@ } catch (Exception e) { - Log.ErrorFormat(Resources.TableViewPasteController_PasteCellsToRow_Pasting_values_failed___0_, e.Message); + Log.ErrorFormat(Resources.TableViewPasteController_PasteCellsToRow_Pasting_values_failed_0_, e.Message); } finally { @@ -389,7 +389,7 @@ var startColumnIndex = targetSelection.Left; if (startRowIndex < 0) { - throw new ArgumentException(string.Format(Resources.TableViewPasteController_PasteValuesCore_Invalid_row_number__0_, startRowIndex), + throw new ArgumentException(string.Format(Resources.TableViewPasteController_PasteValuesCore_Invalid_row_number_0_, startRowIndex), "targetSelection"); } Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeNodeList.cs =================================================================== diff -u -r8a9a2efad299327b082088189b9a37c32c55a890 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeNodeList.cs (.../TreeNodeList.cs) (revision 8a9a2efad299327b082088189b9a37c32c55a890) +++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeNodeList.cs (.../TreeNodeList.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -133,7 +133,7 @@ IEnumerator IEnumerable.GetEnumerator() { - throw new NotImplementedException(Resources.TreeNodeList_GetEnumerator_The_method_or_operation_is_not_implemented_); + throw new NotImplementedException(Resources.TreeNodeList_GetEnumerator_The_method_or_operation_is_not_implemented); } #endregion Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs =================================================================== diff -u -r6a2a618c5c06dcc94b092420bda2b193cfd2663a -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs (.../TreeView.cs) (revision 6a2a618c5c06dcc94b092420bda2b193cfd2663a) +++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs (.../TreeView.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -306,7 +306,7 @@ return; } - var message = string.Format(Resources.TreeView_DeleteNodeData_Are_you_sure_you_want_to_delete_the_following_item___0_, SelectedNode.Text); + var message = string.Format(Resources.TreeView_DeleteNodeData_Are_you_sure_you_want_to_delete_the_following_item_0_, SelectedNode.Text); if (MessageBox.Show(message, Resources.TreeView_DeleteNodeData_Confirm, MessageBoxButtons.OKCancel) != DialogResult.OK) { return; Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewController.cs =================================================================== diff -u -r6a2a618c5c06dcc94b092420bda2b193cfd2663a -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewController.cs (.../TreeViewController.cs) (revision 6a2a618c5c06dcc94b092420bda2b193cfd2663a) +++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewController.cs (.../TreeViewController.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -160,7 +160,7 @@ if (nodePresenter == null) { - Log.Debug(string.Format(Resources.TreeViewController_UpdateNode_Can_t_find_INodePresenter_for__0___make_sure_you_added_it_to_Presenters_collection_of_a_TreeView, tag)); + Log.Debug(string.Format(Resources.TreeViewController_UpdateNode_Can_t_find_INodePresenter_for_0_make_sure_you_added_it_to_Presenters_collection_of_a_TreeView, tag)); return; } @@ -439,7 +439,7 @@ if (presenter == null) { - var message = String.Format(Resources.TreeViewController_UpdateNode_Can_t_find_INodePresenter_for__0___make_sure_you_added_it_to_Presenters_collection_of_a_TreeView, nodeData); + var message = String.Format(Resources.TreeViewController_UpdateNode_Can_t_find_INodePresenter_for_0_make_sure_you_added_it_to_Presenters_collection_of_a_TreeView, nodeData); throw new ArgumentNullException(message); } Index: Core/Common/src/Core.Common.Gui.Swf/Properties/Resources.Designer.cs =================================================================== diff -u -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui.Swf/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) +++ Core/Common/src/Core.Common.Gui.Swf/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -223,9 +223,9 @@ /// /// Looks up a localized string similar to ({0} meer problemen...). /// - internal static string ValidationReportControl_AddReport___0__more_issues____ { + internal static string ValidationReportControl_AddReport_0_more_issues { get { - return ResourceManager.GetString("ValidationReportControl_AddReport___0__more_issues____", resourceCulture); + return ResourceManager.GetString("ValidationReportControl_AddReport_0_more_issues", resourceCulture); } } } Index: Core/Common/src/Core.Common.Gui.Swf/Properties/Resources.resx =================================================================== diff -u -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui.Swf/Properties/Resources.resx (.../Resources.resx) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) +++ Core/Common/src/Core.Common.Gui.Swf/Properties/Resources.resx (.../Resources.resx) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + ..\Resources\collapse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -166,7 +166,7 @@ ..\Resources\restart_empty.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ({0} meer problemen...) \ No newline at end of file Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs =================================================================== diff -u -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs (.../ValidationReportControl.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) +++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs (.../ValidationReportControl.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -185,7 +185,7 @@ { AddIssues(categoryNode.Nodes, issues.Take(2)); - var additionalIssuesNode = new TreeNode(String.Format(Resources.ValidationReportControl_AddReport___0__more_issues____, issueCount - 2)); + var additionalIssuesNode = new TreeNode(String.Format(Resources.ValidationReportControl_AddReport_0_more_issues, issueCount - 2)); AddIssues(additionalIssuesNode.Nodes, issues.Skip(2)); additionalIssuesNode.Collapse(); categoryNode.Nodes.Add(additionalIssuesNode); Index: Core/Common/src/Core.Common.Gui/CustomSettingsProvider.cs =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/CustomSettingsProvider.cs (.../CustomSettingsProvider.cs) (revision eee6c7815d1e418eac38c1c552fb279c0887ef55) +++ Core/Common/src/Core.Common.Gui/CustomSettingsProvider.cs (.../CustomSettingsProvider.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -58,7 +58,7 @@ } catch { - log.ErrorFormat(Resources.PortableSettingsProvider_SetPropertyValues_Error_storing_settings_to__0_, SettingsFileName); + log.ErrorFormat(Resources.PortableSettingsProvider_SetPropertyValues_Error_storing_settings_to_0_, SettingsFileName); } } @@ -171,7 +171,7 @@ //Determine if the setting is marked as Roaming if ((from DictionaryEntry d in prop.Attributes select (Attribute) d.Value).OfType().Any()) { - throw new NotImplementedException(String.Format(Resources.PortableSettingsProvider_ThrowIfRoaming_Setting__0__is_roaming__This_is_not_supported, prop.Name)); + throw new NotImplementedException(String.Format(Resources.PortableSettingsProvider_ThrowIfRoaming_Setting_0_is_roaming_This_is_not_supported, prop.Name)); } } } Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs =================================================================== diff -u -r452dec4795dc02cbdaa5118158948ad0922bf7d5 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 452dec4795dc02cbdaa5118158948ad0922bf7d5) +++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -276,7 +276,7 @@ { if (!checkUseSettings || Convert.ToBoolean((object) Gui.Application.UserSettings["showStartPage"], CultureInfo.InvariantCulture)) { - log.Info(Properties.Resources.MainWindow_ShowStartPage_Adding_welcome_page____); + log.Info(Properties.Resources.MainWindow_ShowStartPage_Adding_welcome_page_); OpenStartPage(); } } @@ -835,7 +835,7 @@ catch (InvalidOperationException) { // the xml was not valid. Too bad. - log.Warn(Properties.Resources.MainWindow_OnLoadLayout_Could_not_load_the_requested_dock_layout__The_settings_are_invalid_and_will_be_reset_to_the_default_state_); + log.Warn(Properties.Resources.MainWindow_OnLoadLayout_Could_not_load_the_requested_dock_layout_The_settings_are_invalid_and_will_be_reset_to_the_default_state_); return; } @@ -865,7 +865,7 @@ } catch (Exception) { - log.Warn(Properties.Resources.MainWindow_OnLoadLayout_Could_not_restore_the_ribbon_state__The_settings_are_invalid_and_will_be_reset_to_the_default_state_); + log.Warn(Properties.Resources.MainWindow_OnLoadLayout_Could_not_restore_the_ribbon_state_The_settings_are_invalid_and_will_be_reset_to_the_default_state_); } } @@ -969,8 +969,8 @@ { resetUIButton.ToolTip = new ScreenTip { - Title = Properties.Resources.MainWindow_UpdateMainWindowRibbonElements_Reset_layout__restart_, - Text = Properties.Resources.MainWindow_UpdateMainWindowRibbonElements_When_this_option_is_turned_on__the_default_layout_will_be_used_when_restarting_Ringtoets_, + Title = Properties.Resources.MainWindow_UpdateMainWindowRibbonElements_Reset_layout_restart, + Text = Properties.Resources.MainWindow_UpdateMainWindowRibbonElements_When_this_option_is_turned_on_the_default_layout_will_be_used_when_restarting_Ringtoets, MaxWidth = 250 }; } Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowLogAppender.cs =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowLogAppender.cs (.../MessageWindowLogAppender.cs) (revision eee6c7815d1e418eac38c1c552fb279c0887ef55) +++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowLogAppender.cs (.../MessageWindowLogAppender.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -96,7 +96,7 @@ if (loggingEvent.ExceptionObject != null) { message += loggingEvent.ExceptionObject.Message + "\n"; - message += Resources.MessageWindowLogAppender_AppendToMessageWindow__Check_log_file_for_more_information__Home__Show_Log__; + message += Resources.MessageWindowLogAppender_AppendToMessageWindow_Check_log_file_for_more_information_Home_Show_Log; } MessageWindow.AddMessage(loggingEvent.Level, loggingEvent.TimeStamp, message); Index: Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.cs =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.cs (.../GeneralOptionsControl.cs) (revision eee6c7815d1e418eac38c1c552fb279c0887ef55) +++ Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.cs (.../GeneralOptionsControl.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -134,7 +134,7 @@ } else { - throw new Exception(Resources.GeneralOptionsControl_GetRealNumberFormatFromControls_None_of_the_radiobuttons_is_selected__impossible); + throw new Exception(Resources.GeneralOptionsControl_GetRealNumberFormatFromControls_None_of_the_radiobuttons_is_selected_impossible); } return format + numDecimals; @@ -191,7 +191,7 @@ private void RadioButtonCompactNotationCheckedChanged(object sender, EventArgs e) { - lblDecimalsOrSignificants.Text = radioButtonCompactNotation.Checked ? Resources.GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_Significant_digits_ : Resources.GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_____Decimal_places_; + lblDecimalsOrSignificants.Text = radioButtonCompactNotation.Checked ? Resources.GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_Significant_digits: Resources.GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_Decimal_places; UpdateRealNumberFormattingSample(); } Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ProgressDialog.cs =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ProgressDialog.cs (.../ProgressDialog.cs) (revision eee6c7815d1e418eac38c1c552fb279c0887ef55) +++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ProgressDialog.cs (.../ProgressDialog.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -89,7 +89,7 @@ { if (cancelling) { - btnCancel.Text = Resources.ProgressDialog_SetButtonState_Cancelling___; + btnCancel.Text = Resources.ProgressDialog_SetButtonState_Cancelling; btnCancel.Enabled = false; } else Index: Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs (.../RichTextView.cs) (revision eee6c7815d1e418eac38c1c552fb279c0887ef55) +++ Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs (.../RichTextView.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -26,7 +26,7 @@ } else { - log.WarnFormat(Resources.RichTextView_RichTextView_The_license_file__0__cannot_be_found_on_the_computer_, Path.GetFileName(path)); + log.WarnFormat(Resources.RichTextView_RichTextView_The_license_file_0_cannot_be_found_on_the_computer, Path.GetFileName(path)); } Name = name; Text = name; Index: Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.cs =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.cs (.../SelectItemDialog.cs) (revision eee6c7815d1e418eac38c1c552fb279c0887ef55) +++ Core/Common/src/Core.Common.Gui/Forms/SelectItemDialog.cs (.../SelectItemDialog.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -171,7 +171,7 @@ previousSelectedItemIndex = listViewItemTypes.SelectedIndices[0]; selectedItemName = SelectedItem.Text; - newItemName = Resources.SelectItemDialog_listViewItemTypes_SelectedIndexChanged_New_ + selectedItemName; + newItemName = Resources.SelectItemDialog_listViewItemTypes_SelectedIndexChanged_New + selectedItemName; } if (string.IsNullOrEmpty(newItemName)) Index: Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.cs =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.cs (.../SelectViewDialog.cs) (revision eee6c7815d1e418eac38c1c552fb279c0887ef55) +++ Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.cs (.../SelectViewDialog.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -66,7 +66,7 @@ if (itemAsString == DefaultViewName) { - string defaultIndicatorText = Resources.SelectViewDialog_listBox_DrawItem_____Default_; + string defaultIndicatorText = Resources.SelectViewDialog_listBox_DrawItem_Default; var defaultItemFont = new Font(lbFont.FontFamily, lbFont.Size, FontStyle.Bold); var itemSize = e.Graphics.MeasureString(itemAsString, defaultItemFont); Index: Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml.cs =================================================================== diff -u -r9bf385f7c9ad886edabf3e7e0a5a977fd2e18a03 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml.cs (.../SplashScreen.xaml.cs) (revision 9bf385f7c9ad886edabf3e7e0a5a977fd2e18a03) +++ Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml.cs (.../SplashScreen.xaml.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -149,7 +149,7 @@ public void Shutdown() { Focusable = false; - log.Info(Properties.Resources.SplashScreen_Shutdown_Hiding_splash_screen____); + log.Info(Properties.Resources.SplashScreen_Shutdown_Hiding_splash_screen); Close(); } Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs (.../AvalonDockDockingManager.cs) (revision eee6c7815d1e418eac38c1c552fb279c0887ef55) +++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs (.../AvalonDockDockingManager.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -122,7 +122,7 @@ { if (views.Contains(view)) { - throw new InvalidOperationException(Resources.AvalonDockDockingManager_Add_View_was_already_added__activate_it_instead_of_add); + throw new InvalidOperationException(Resources.AvalonDockDockingManager_Add_View_was_already_added_activate_it_instead_of_add); } var control = view as Control; @@ -499,7 +499,7 @@ } else { - throw new NotImplementedException(string.Format(Resources.AvalonDockDockingManager_AddToolView_View_location__0__is_not_implemented_yet, location)); + throw new NotImplementedException(string.Format(Resources.AvalonDockDockingManager_AddToolView_View_location_0_is_not_implemented_yet, location)); } if (anchorablePane == null) {} Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs =================================================================== diff -u -r9b3ad522b72ddb7f06ce04cab7a0acb508c268bb -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs (.../ViewList.cs) (revision 9b3ad522b72ddb7f06ce04cab7a0acb508c268bb) +++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs (.../ViewList.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -234,7 +234,7 @@ if (defaultLocation == null) { throw new InvalidOperationException( - Resources.ViewList_Insert_No_default_location_specified__Cannot_add_a_view_without_location_parameter_); + Resources.ViewList_Insert_No_default_location_specified_Cannot_add_a_view_without_location_parameter_); } Insert(index, view, (ViewLocation) defaultLocation); @@ -365,7 +365,7 @@ { if (ViewResolver.IsViewOpening) { - throw new InvalidOperationException(Resources.ViewList_Close_View_is_being_closed_while_it_is_being_opened_); + throw new InvalidOperationException(Resources.ViewList_Close_View_is_being_closed_while_it_is_being_opened); } if (!Contains(view)) @@ -442,7 +442,7 @@ private void DockingManagerViewBarClosing(object sender, DockTabClosingEventArgs e) { - Log.DebugFormat(Resources.ViewList_DockingManagerViewBarClosing_Closing_view___0_, e.View); + Log.DebugFormat(Resources.ViewList_DockingManagerViewBarClosing_Closing_view_0_, e.View); Close(e.View, false, true); } Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs =================================================================== diff -u -rf966263a1ac6353f155cb6304455f8050908a4b9 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs (.../ViewResolver.cs) (revision f966263a1ac6353f155cb6304455f8050908a4b9) +++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs (.../ViewResolver.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -54,7 +54,7 @@ if (viewInfoList.Count == 0) { - Log.DebugFormat(Resources.ViewResolver_OpenViewForData_No_view_registered_for____0_, data); + Log.DebugFormat(Resources.ViewResolver_OpenViewForData_No_view_registered_for_0_, data); return false; } Index: Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs =================================================================== diff -u -r04f06b5762b758295a52944dd232394a462cf72c -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs (.../GuiCommandHandler.cs) (revision 04f06b5762b758295a52944dd232394a462cf72c) +++ Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs (.../GuiCommandHandler.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -98,7 +98,7 @@ { if (gui.Application.Project != null) { - Log.Info(Resources.GuiCommandHandler_TryCloseProject_Closing_current_project_); + Log.Info(Resources.GuiCommandHandler_TryCloseProject_Closing_current_project); // DO NOT REMOVE CODE BELOW. If the views are not cleaned up here we access disposable stuff like in issue 4161. // SO VIEWS SHOULD ALWAYS BE CLOSED! @@ -148,7 +148,7 @@ } catch (Exception) { - Log.ErrorFormat(Resources.GuiCommandHandler_ImportOn_Unable_to_import_on__0__, gui.Selection); + Log.ErrorFormat(Resources.GuiCommandHandler_ImportOn_Unable_to_import_on_0_, gui.Selection); } } @@ -160,7 +160,7 @@ } catch (Exception) { - Log.ErrorFormat(Resources.GuiCommandHandler_ImportOn_Unable_to_import_on__0__, gui.Selection); + Log.ErrorFormat(Resources.GuiCommandHandler_ImportOn_Unable_to_import_on_0_, gui.Selection); } } @@ -214,7 +214,7 @@ if (!logFileOpened) { - MessageBox.Show(Resources.GuiCommandHandler_OpenLogFileExternal_Unable_to_open_log_file__opening_log_file_directory_instead_, Resources.GuiCommandHandler_OpenLogFileExternal_Unable_to_open_log_file); + MessageBox.Show(Resources.GuiCommandHandler_OpenLogFileExternal_Unable_to_open_log_file_Opening_log_file_directory_instead, Resources.GuiCommandHandler_OpenLogFileExternal_Unable_to_open_log_file); Process.Start(SettingsHelper.GetApplicationLocalUserSettingsDirectory()); } } @@ -464,7 +464,7 @@ if (project == null) { - gui.MainWindow.Title = string.Format(Resources.GuiCommandHandler_UpdateGui__no_project_opened_____0_, mainWindowTitle); + gui.MainWindow.Title = string.Format(Resources.GuiCommandHandler_UpdateGui_no_project_opened_0_, mainWindowTitle); return; } Index: Core/Common/src/Core.Common.Gui/GuiExportHandler.cs =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/GuiExportHandler.cs (.../GuiExportHandler.cs) (revision eee6c7815d1e418eac38c1c552fb279c0887ef55) +++ Core/Common/src/Core.Common.Gui/GuiExportHandler.cs (.../GuiExportHandler.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -80,8 +80,8 @@ //if there is only one available exporter use that. if (fileExporters.Count == 0) { - MessageBox.Show(Resources.GuiExportHandler_GetSupportedExporterForItemUsingDialog_No_exporter_for_this_item_available_); - log.Warn(String.Format(Resources.GuiExportHandler_GetSupportedExporterForItemUsingDialog_No_exporter_for_this_item___0___available_, sourceType)); + MessageBox.Show(Resources.GuiExportHandler_GetSupportedExporterForItemUsingDialog_No_exporter_for_this_item_available); + log.Warn(String.Format(Resources.GuiExportHandler_GetSupportedExporterForItemUsingDialog_No_exporter_for_this_item_0_available, sourceType)); return null; } Index: Core/Common/src/Core.Common.Gui/GuiImportHandler.cs =================================================================== diff -u -r8546b20b128723309b8b663858f32b7e399f75d8 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/GuiImportHandler.cs (.../GuiImportHandler.cs) (revision 8546b20b128723309b8b663858f32b7e399f75d8) +++ Core/Common/src/Core.Common.Gui/GuiImportHandler.cs (.../GuiImportHandler.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -49,8 +49,8 @@ //if there is only one available exporter use that. if (importers.Count == 0) { - MessageBox.Show(Resources.GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this_item_); - Log.ErrorFormat(Resources.GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this_item___0___, target); + MessageBox.Show(Resources.GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this_item); + Log.ErrorFormat(Resources.GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this_item_0_, target); return null; } Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r555c08c6f506516d96076f33c1d6d4c4217b2a1c -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 555c08c6f506516d96076f33c1d6d4c4217b2a1c) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -82,9 +82,9 @@ /// /// Looks up a localized string similar to Ringtoets wordt gestart.... /// - public static string App_App_Starting_Ringtoets____ { + public static string App_App_Starting_Ringtoets { get { - return ResourceManager.GetString("App_App_Starting_Ringtoets____", resourceCulture); + return ResourceManager.GetString("App_App_Starting_Ringtoets", resourceCulture); } } @@ -101,9 +101,9 @@ /// Looks up a localized string similar to ======== KRITIEKE FOUT #{0}: ======== ///{1}{2}. /// - public static string App_HandleException_ { + public static string App_HandleException_0_ { get { - return ResourceManager.GetString("App_HandleException_", resourceCulture); + return ResourceManager.GetString("App_HandleException_0_", resourceCulture); } } @@ -128,83 +128,83 @@ /// /// Looks up a localized string similar to Activiteit '{0}' is beëindigd met status {1}.. /// - public static string App_RunRingtoets_Activity___0___ended_with_status__1_ { + public static string App_RunRingtoets_Activity_0_ended_with_status_1_ { get { - return ResourceManager.GetString("App_RunRingtoets_Activity___0___ended_with_status__1_", resourceCulture); + return ResourceManager.GetString("App_RunRingtoets_Activity_0_ended_with_status_1_", resourceCulture); } } /// /// Looks up a localized string similar to Activiteit '{0}' is niet gevonden in het project! Typefout of bent u misschien vergeten om een project te laden?. /// - public static string App_RunRingtoets_Activity___0___not_found_in_project__Typo__or_did_you_forget_to_load_a_project_ { + public static string App_RunRingtoets_Activity_0_not_found_in_project_Typo_or_did_you_forget_to_load_a_project { get { - return ResourceManager.GetString("App_RunRingtoets_Activity___0___not_found_in_project__Typo__or_did_you_forget_to_" + - "load_a_project_", resourceCulture); + return ResourceManager.GetString("App_RunRingtoets_Activity_0_not_found_in_project_Typo_or_did_you_forget_to_load_a" + + "_project", resourceCulture); } } /// /// Looks up a localized string similar to Geen project gevonden. Laad het project eerst.. /// - public static string App_RunRingtoets_No_project_found__load_project_first { + public static string App_RunRingtoets_No_project_found_load_project_first { get { - return ResourceManager.GetString("App_RunRingtoets_No_project_found__load_project_first", resourceCulture); + return ResourceManager.GetString("App_RunRingtoets_No_project_found_load_project_first", resourceCulture); } } /// /// Looks up a localized string similar to Opgeslagen project '{0}'. /// - public static string App_RunRingtoets_Saved_project___0__ { + public static string App_RunRingtoets_Saved_project_0_ { get { - return ResourceManager.GetString("App_RunRingtoets_Saved_project___0__", resourceCulture); + return ResourceManager.GetString("App_RunRingtoets_Saved_project_0_", resourceCulture); } } /// /// Looks up a localized string similar to Opslaan van project '{0}'. /// - public static string App_RunRingtoets_Saving_project___0__ { + public static string App_RunRingtoets_Saving_project_0_ { get { - return ResourceManager.GetString("App_RunRingtoets_Saving_project___0__", resourceCulture); + return ResourceManager.GetString("App_RunRingtoets_Saving_project_0_", resourceCulture); } } /// /// Looks up a localized string similar to Het opgegeven project ({0}) was niet gevonden.. /// - public static string App_RunRingtoets_Specified_project___0___was_not_found_ { + public static string App_RunRingtoets_Specified_project_0_was_not_found_ { get { - return ResourceManager.GetString("App_RunRingtoets_Specified_project___0___was_not_found_", resourceCulture); + return ResourceManager.GetString("App_RunRingtoets_Specified_project_0_was_not_found_", resourceCulture); } } /// /// Looks up a localized string similar to Starten van activiteit '{0}'. /// - public static string App_RunRingtoets_Starting_activity___0__ { + public static string App_RunRingtoets_Starting_activity_0_ { get { - return ResourceManager.GetString("App_RunRingtoets_Starting_activity___0__", resourceCulture); + return ResourceManager.GetString("App_RunRingtoets_Starting_activity_0_", resourceCulture); } } /// /// Looks up a localized string similar to Ringtoets' grafische interface wordt gestart.... /// - public static string App_RunRingtoets_Starting_Ringtoets_Gui____ { + public static string App_RunRingtoets_Starting_Ringtoets_Gui { get { - return ResourceManager.GetString("App_RunRingtoets_Starting_Ringtoets_Gui____", resourceCulture); + return ResourceManager.GetString("App_RunRingtoets_Starting_Ringtoets_Gui", resourceCulture); } } /// /// Looks up a localized string similar to Kan niet meerdere instanties van Ringtoets starten. Sluit eerst de andere instantie.. /// - public static string App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Ringtoets__Please_close_the_other_instance_first_ { + public static string App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Ringtoets_Please_close_the_other_instance_first { get { - return ResourceManager.GetString("App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Ringtoets__Plea" + - "se_close_the_other_instance_first_", resourceCulture); + return ResourceManager.GetString("App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Ringtoets_Pleas" + + "e_close_the_other_instance_first", resourceCulture); } } @@ -271,18 +271,18 @@ /// /// Looks up a localized string similar to Documentvenster is al toegevoegd. Activeer de weergave in plaats van het toe te voegen.. /// - public static string AvalonDockDockingManager_Add_View_was_already_added__activate_it_instead_of_add { + public static string AvalonDockDockingManager_Add_View_was_already_added_activate_it_instead_of_add { get { - return ResourceManager.GetString("AvalonDockDockingManager_Add_View_was_already_added__activate_it_instead_of_add", resourceCulture); + return ResourceManager.GetString("AvalonDockDockingManager_Add_View_was_already_added_activate_it_instead_of_add", resourceCulture); } } /// /// Looks up a localized string similar to Locatie {0} is niet geldig voor het documentvenster.. /// - public static string AvalonDockDockingManager_AddToolView_View_location__0__is_not_implemented_yet { + public static string AvalonDockDockingManager_AddToolView_View_location_0_is_not_implemented_yet { get { - return ResourceManager.GetString("AvalonDockDockingManager_AddToolView_View_location__0__is_not_implemented_yet", resourceCulture); + return ResourceManager.GetString("AvalonDockDockingManager_AddToolView_View_location_0_is_not_implemented_yet", resourceCulture); } } @@ -964,30 +964,29 @@ /// /// Looks up a localized string similar to Geen van de keuzeopties is geselecteerd: onmogelijk. /// - public static string GeneralOptionsControl_GetRealNumberFormatFromControls_None_of_the_radiobuttons_is_selected__impossible { + public static string GeneralOptionsControl_GetRealNumberFormatFromControls_None_of_the_radiobuttons_is_selected_impossible { get { return ResourceManager.GetString("GeneralOptionsControl_GetRealNumberFormatFromControls_None_of_the_radiobuttons_is" + - "_selected__impossible", resourceCulture); + "_selected_impossible", resourceCulture); } } /// /// Looks up a localized string similar to Decimalen:. /// - public static string GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_____Decimal_places_ { + public static string GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_Decimal_places { get { - return ResourceManager.GetString("GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_____Decimal_places" + - "_", resourceCulture); + return ResourceManager.GetString("GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_Decimal_places", resourceCulture); } } /// /// Looks up a localized string similar to Significante cijfers:. /// - public static string GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_Significant_digits_ { + public static string GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_Significant_digits { get { return ResourceManager.GetString("GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_Significant_digits" + - "_", resourceCulture); + "", resourceCulture); } } @@ -1050,9 +1049,9 @@ /// /// Looks up a localized string similar to Kan niet importeren naar {0}.. /// - public static string GuiCommandHandler_ImportOn_Unable_to_import_on__0__ { + public static string GuiCommandHandler_ImportOn_Unable_to_import_on_0_ { get { - return ResourceManager.GetString("GuiCommandHandler_ImportOn_Unable_to_import_on__0__", resourceCulture); + return ResourceManager.GetString("GuiCommandHandler_ImportOn_Unable_to_import_on_0_", resourceCulture); } } @@ -1068,28 +1067,28 @@ /// /// Looks up a localized string similar to Het is niet mogelijk het logbestand te openen. In plaats hiervan wordt de folder waarin het logbestand staat geopend.. /// - public static string GuiCommandHandler_OpenLogFileExternal_Unable_to_open_log_file__opening_log_file_directory_instead_ { + public static string GuiCommandHandler_OpenLogFileExternal_Unable_to_open_log_file_Opening_log_file_directory_instead { get { - return ResourceManager.GetString("GuiCommandHandler_OpenLogFileExternal_Unable_to_open_log_file__opening_log_file_d" + - "irectory_instead_", resourceCulture); + return ResourceManager.GetString("GuiCommandHandler_OpenLogFileExternal_Unable_to_open_log_file_Opening_log_file_di" + + "rectory_instead", resourceCulture); } } /// /// Looks up a localized string similar to Sluiten van huidig project.. /// - public static string GuiCommandHandler_TryCloseProject_Closing_current_project_ { + public static string GuiCommandHandler_TryCloseProject_Closing_current_project { get { - return ResourceManager.GetString("GuiCommandHandler_TryCloseProject_Closing_current_project_", resourceCulture); + return ResourceManager.GetString("GuiCommandHandler_TryCloseProject_Closing_current_project", resourceCulture); } } /// /// Looks up a localized string similar to < geen project geopend > - {0}. /// - public static string GuiCommandHandler_UpdateGui__no_project_opened_____0_ { + public static string GuiCommandHandler_UpdateGui_no_project_opened_0_ { get { - return ResourceManager.GetString("GuiCommandHandler_UpdateGui__no_project_opened_____0_", resourceCulture); + return ResourceManager.GetString("GuiCommandHandler_UpdateGui_no_project_opened_0_", resourceCulture); } } @@ -1132,20 +1131,20 @@ /// /// Looks up a localized string similar to Ringtoets kan de huidige selectie ({0}) niet exporteren.. /// - public static string GuiExportHandler_GetSupportedExporterForItemUsingDialog_No_exporter_for_this_item___0___available_ { + public static string GuiExportHandler_GetSupportedExporterForItemUsingDialog_No_exporter_for_this_item_0_available { get { return ResourceManager.GetString("GuiExportHandler_GetSupportedExporterForItemUsingDialog_No_exporter_for_this_item" + - "___0___available_", resourceCulture); + "_0_available", resourceCulture); } } /// /// Looks up a localized string similar to Ringtoets kan de huidige selectie niet exporteren.. /// - public static string GuiExportHandler_GetSupportedExporterForItemUsingDialog_No_exporter_for_this_item_available_ { + public static string GuiExportHandler_GetSupportedExporterForItemUsingDialog_No_exporter_for_this_item_available { get { return ResourceManager.GetString("GuiExportHandler_GetSupportedExporterForItemUsingDialog_No_exporter_for_this_item" + - "_available_", resourceCulture); + "_available", resourceCulture); } } @@ -1180,20 +1179,20 @@ /// /// Looks up a localized string similar to Geen enkele "importer" is beschikbaar voor dit "item".. /// - public static string GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this_item_ { + public static string GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this_item { get { return ResourceManager.GetString("GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this" + - "_item_", resourceCulture); + "_item", resourceCulture); } } /// /// Looks up a localized string similar to Geen enkele "importer" is beschikbaar voor dit "item" ({0}).. /// - public static string GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this_item___0___ { + public static string GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this_item_0_ { get { return ResourceManager.GetString("GuiImportHandler_GetSupportedImporterForTargetType_No_importer_available_for_this" + - "_item___0___", resourceCulture); + "_item_0_", resourceCulture); } } @@ -1297,48 +1296,48 @@ /// /// Looks up a localized string similar to Kon de gevraagde "dock" opmaak niet laden. De instellingen zijn ongeldig en zullen teruggezet worden naar de standaardinstellingen.. /// - public static string MainWindow_OnLoadLayout_Could_not_load_the_requested_dock_layout__The_settings_are_invalid_and_will_be_reset_to_the_default_state_ { + public static string MainWindow_OnLoadLayout_Could_not_load_the_requested_dock_layout_The_settings_are_invalid_and_will_be_reset_to_the_default_state_ { get { - return ResourceManager.GetString("MainWindow_OnLoadLayout_Could_not_load_the_requested_dock_layout__The_settings_ar" + - "e_invalid_and_will_be_reset_to_the_default_state_", resourceCulture); + return ResourceManager.GetString("MainWindow_OnLoadLayout_Could_not_load_the_requested_dock_layout_The_settings_are" + + "_invalid_and_will_be_reset_to_the_default_state_", resourceCulture); } } /// /// Looks up a localized string similar to Ribbon kon niet worden hersteld. De instellingen zijn ongeldig en zullen worden teruggezet naar de standaardinstellingen.. /// - public static string MainWindow_OnLoadLayout_Could_not_restore_the_ribbon_state__The_settings_are_invalid_and_will_be_reset_to_the_default_state_ { + public static string MainWindow_OnLoadLayout_Could_not_restore_the_ribbon_state_The_settings_are_invalid_and_will_be_reset_to_the_default_state_ { get { - return ResourceManager.GetString("MainWindow_OnLoadLayout_Could_not_restore_the_ribbon_state__The_settings_are_inva" + - "lid_and_will_be_reset_to_the_default_state_", resourceCulture); + return ResourceManager.GetString("MainWindow_OnLoadLayout_Could_not_restore_the_ribbon_state_The_settings_are_inval" + + "id_and_will_be_reset_to_the_default_state_", resourceCulture); } } /// /// Looks up a localized string similar to Toevoegen Welkomspagina.... /// - public static string MainWindow_ShowStartPage_Adding_welcome_page____ { + public static string MainWindow_ShowStartPage_Adding_welcome_page_ { get { - return ResourceManager.GetString("MainWindow_ShowStartPage_Adding_welcome_page____", resourceCulture); + return ResourceManager.GetString("MainWindow_ShowStartPage_Adding_welcome_page_", resourceCulture); } } /// /// Looks up a localized string similar to Opmaak resetten na opnieuw opstarten. /// - public static string MainWindow_UpdateMainWindowRibbonElements_Reset_layout__restart_ { + public static string MainWindow_UpdateMainWindowRibbonElements_Reset_layout_restart { get { - return ResourceManager.GetString("MainWindow_UpdateMainWindowRibbonElements_Reset_layout__restart_", resourceCulture); + return ResourceManager.GetString("MainWindow_UpdateMainWindowRibbonElements_Reset_layout_restart", resourceCulture); } } /// /// Looks up a localized string similar to Wanneer deze optie is aangezet, zal de standaard opmaak worden gebruikt bij het opnieuw starten van Ringtoets.. /// - public static string MainWindow_UpdateMainWindowRibbonElements_When_this_option_is_turned_on__the_default_layout_will_be_used_when_restarting_Ringtoets_ { + public static string MainWindow_UpdateMainWindowRibbonElements_When_this_option_is_turned_on_the_default_layout_will_be_used_when_restarting_Ringtoets { get { - return ResourceManager.GetString("MainWindow_UpdateMainWindowRibbonElements_When_this_option_is_turned_on__the_defa" + - "ult_layout_will_be_used_when_restarting_Ringtoets_", resourceCulture); + return ResourceManager.GetString("MainWindow_UpdateMainWindowRibbonElements_When_this_option_is_turned_on_the_defau" + + "lt_layout_will_be_used_when_restarting_Ringtoets", resourceCulture); } } @@ -1382,10 +1381,10 @@ /// /// Looks up a localized string similar to Controleer logboekbestand voor meer informatie ("Home"-> "Show Log").. /// - public static string MessageWindowLogAppender_AppendToMessageWindow__Check_log_file_for_more_information__Home__Show_Log__ { + public static string MessageWindowLogAppender_AppendToMessageWindow_Check_log_file_for_more_information_Home_Show_Log { get { - return ResourceManager.GetString("MessageWindowLogAppender_AppendToMessageWindow__Check_log_file_for_more_informati" + - "on__Home__Show_Log__", resourceCulture); + return ResourceManager.GetString("MessageWindowLogAppender_AppendToMessageWindow_Check_log_file_for_more_informatio" + + "n_Home_Show_Log", resourceCulture); } } @@ -1547,19 +1546,19 @@ /// /// Looks up a localized string similar to Fout bij het opslaan van de instellingen in {0}.. /// - public static string PortableSettingsProvider_SetPropertyValues_Error_storing_settings_to__0_ { + public static string PortableSettingsProvider_SetPropertyValues_Error_storing_settings_to_0_ { get { - return ResourceManager.GetString("PortableSettingsProvider_SetPropertyValues_Error_storing_settings_to__0_", resourceCulture); + return ResourceManager.GetString("PortableSettingsProvider_SetPropertyValues_Error_storing_settings_to_0_", resourceCulture); } } /// /// Looks up a localized string similar to Instelling {0} heeft de niet-ondersteunde waarde 'roaming'.. /// - public static string PortableSettingsProvider_ThrowIfRoaming_Setting__0__is_roaming__This_is_not_supported { + public static string PortableSettingsProvider_ThrowIfRoaming_Setting_0_is_roaming_This_is_not_supported { get { - return ResourceManager.GetString("PortableSettingsProvider_ThrowIfRoaming_Setting__0__is_roaming__This_is_not_suppo" + - "rted", resourceCulture); + return ResourceManager.GetString("PortableSettingsProvider_ThrowIfRoaming_Setting_0_is_roaming_This_is_not_supporte" + + "d", resourceCulture); } } @@ -1575,9 +1574,9 @@ /// /// Looks up a localized string similar to Annuleren.... /// - public static string ProgressDialog_SetButtonState_Cancelling___ { + public static string ProgressDialog_SetButtonState_Cancelling { get { - return ResourceManager.GetString("ProgressDialog_SetButtonState_Cancelling___", resourceCulture); + return ResourceManager.GetString("ProgressDialog_SetButtonState_Cancelling", resourceCulture); } } @@ -1840,9 +1839,9 @@ /// /// Looks up a localized string similar to Het licentie bestand {0} niet kan worden gevonden op de computer.. /// - public static string RichTextView_RichTextView_The_license_file__0__cannot_be_found_on_the_computer_ { + public static string RichTextView_RichTextView_The_license_file_0_cannot_be_found_on_the_computer { get { - return ResourceManager.GetString("RichTextView_RichTextView_The_license_file__0__cannot_be_found_on_the_computer_", resourceCulture); + return ResourceManager.GetString("RichTextView_RichTextView_The_license_file_0_cannot_be_found_on_the_computer", resourceCulture); } } @@ -1877,63 +1876,63 @@ /// /// Looks up a localized string similar to Het instellen van menu's en werkbalken is klaar.. /// - public static string RingtoetsGui_InitializeMenusAndToolbars_Menus_and_toolbars_are_ready_ { + public static string RingtoetsGui_InitializeMenusAndToolbars_Menus_and_toolbars_are_ready { get { - return ResourceManager.GetString("RingtoetsGui_InitializeMenusAndToolbars_Menus_and_toolbars_are_ready_", resourceCulture); + return ResourceManager.GetString("RingtoetsGui_InitializeMenusAndToolbars_Menus_and_toolbars_are_ready", resourceCulture); } } /// /// Looks up a localized string similar to Menu's en werkbalken instellen.... /// - public static string RingtoetsGui_InitializeMenusAndToolbars_Setting_up_menus_and_toolbars____ { + public static string RingtoetsGui_InitializeMenusAndToolbars_Setting_up_menus_and_toolbars { get { - return ResourceManager.GetString("RingtoetsGui_InitializeMenusAndToolbars_Setting_up_menus_and_toolbars____", resourceCulture); + return ResourceManager.GetString("RingtoetsGui_InitializeMenusAndToolbars_Setting_up_menus_and_toolbars", resourceCulture); } } /// /// Looks up a localized string similar to Alle vensters zijn gemaakt.. /// - public static string RingtoetsGui_InitializeWindows_All_windows_are_created_ { + public static string RingtoetsGui_InitializeWindows_All_windows_are_created { get { - return ResourceManager.GetString("RingtoetsGui_InitializeWindows_All_windows_are_created_", resourceCulture); + return ResourceManager.GetString("RingtoetsGui_InitializeWindows_All_windows_are_created", resourceCulture); } } /// /// Looks up a localized string similar to Standaardschermen aan het maken.... /// - public static string RingtoetsGui_InitializeWindows_Creating_default_tool_windows____ { + public static string RingtoetsGui_InitializeWindows_Creating_default_tool_windows { get { - return ResourceManager.GetString("RingtoetsGui_InitializeWindows_Creating_default_tool_windows____", resourceCulture); + return ResourceManager.GetString("RingtoetsGui_InitializeWindows_Creating_default_tool_windows", resourceCulture); } } /// /// Looks up a localized string similar to Schermen initialiseren.... /// - public static string RingtoetsGui_InitializeWindows_Initializing_windows____ { + public static string RingtoetsGui_InitializeWindows_Initializing_windows { get { - return ResourceManager.GetString("RingtoetsGui_InitializeWindows_Initializing_windows____", resourceCulture); + return ResourceManager.GetString("RingtoetsGui_InitializeWindows_Initializing_windows", resourceCulture); } } /// /// Looks up a localized string similar to Schermmanager voor documenten aan het maken.... /// - public static string RingtoetsGui_InitToolWindows_Creating_document_window_manager____ { + public static string RingtoetsGui_InitToolWindows_Creating_document_window_manager { get { - return ResourceManager.GetString("RingtoetsGui_InitToolWindows_Creating_document_window_manager____", resourceCulture); + return ResourceManager.GetString("RingtoetsGui_InitToolWindows_Creating_document_window_manager", resourceCulture); } } /// /// Looks up a localized string similar to Schermmanager aan het maken.... /// - public static string RingtoetsGui_InitToolWindows_Creating_tool_window_manager____ { + public static string RingtoetsGui_InitToolWindows_Creating_tool_window_manager { get { - return ResourceManager.GetString("RingtoetsGui_InitToolWindows_Creating_tool_window_manager____", resourceCulture); + return ResourceManager.GetString("RingtoetsGui_InitToolWindows_Creating_tool_window_manager", resourceCulture); } } @@ -1949,47 +1948,46 @@ /// /// Looks up a localized string similar to Slechts één instantie van de Ringtoets grafische interface is toegestaan per proces. Zorg ervoor dat de vorige instantie correct opgeruimd is. "Stack trace":. /// - public static string RingtoetsGui_Only_a_single_instance_of_Ringtoets_is_allowed_at_the_same_time_per_process__make_sure_that_the_previous_instance_was_disposed_correctly__stack_trace__ { + public static string RingtoetsGui_Only_a_single_instance_of_Ringtoets_is_allowed_at_the_same_time_per_process_Make_sure_that_the_previous_instance_was_disposed_correctly_stack_trace { get { return ResourceManager.GetString("RingtoetsGui_Only_a_single_instance_of_Ringtoets_is_allowed_at_the_same_time_per_" + - "process__make_sure_that_the_previous_instance_was_disposed_correctly__stack_trac" + - "e__", resourceCulture); + "process_Make_sure_that_the_previous_instance_was_disposed_correctly_stack_trace", resourceCulture); } } /// /// Looks up a localized string similar to Grafische gebruikersinterface initialiseren.... /// - public static string RingtoetsGui_Run_Initializing_graphical_user_interface____ { + public static string RingtoetsGui_Run_Initializing_graphical_user_interface { get { - return ResourceManager.GetString("RingtoetsGui_Run_Initializing_graphical_user_interface____", resourceCulture); + return ResourceManager.GetString("RingtoetsGui_Run_Initializing_graphical_user_interface", resourceCulture); } } /// /// Looks up a localized string similar to Gestart in {0:f2} seconden.. /// - public static string RingtoetsGui_Run_Started_in__0_f2__sec { + public static string RingtoetsGui_Run_Started_in_0_f2_sec { get { - return ResourceManager.GetString("RingtoetsGui_Run_Started_in__0_f2__sec", resourceCulture); + return ResourceManager.GetString("RingtoetsGui_Run_Started_in_0_f2_sec", resourceCulture); } } /// /// Looks up a localized string similar to Starten van de toepassing.... /// - public static string RingtoetsGui_Run_Starting_application____ { + public static string RingtoetsGui_Run_Starting_application { get { - return ResourceManager.GetString("RingtoetsGui_Run_Starting_application____", resourceCulture); + return ResourceManager.GetString("RingtoetsGui_Run_Starting_application", resourceCulture); } } /// /// Looks up a localized string similar to Gebruiker heeft het opstarten onderbroken. Applicatie wordt afgesloten.... /// - public static string RingtoetsGui_ShowSplashScreen_User_has_cancelled_start__exiting____ { + public static string RingtoetsGui_ShowSplashScreen_User_has_cancelled_start_Exiting { get { - return ResourceManager.GetString("RingtoetsGui_ShowSplashScreen_User_has_cancelled_start__exiting____", resourceCulture); + return ResourceManager.GetString("RingtoetsGui_ShowSplashScreen_User_has_cancelled_start_Exiting", resourceCulture); } } @@ -2054,9 +2052,9 @@ /// /// Looks up a localized string similar to Nieuw. /// - public static string SelectItemDialog_listViewItemTypes_SelectedIndexChanged_New_ { + public static string SelectItemDialog_listViewItemTypes_SelectedIndexChanged_New { get { - return ResourceManager.GetString("SelectItemDialog_listViewItemTypes_SelectedIndexChanged_New_", resourceCulture); + return ResourceManager.GetString("SelectItemDialog_listViewItemTypes_SelectedIndexChanged_New", resourceCulture); } } @@ -2081,9 +2079,9 @@ /// /// Looks up a localized string similar to - (Standaard). /// - public static string SelectViewDialog_listBox_DrawItem_____Default_ { + public static string SelectViewDialog_listBox_DrawItem_Default { get { - return ResourceManager.GetString("SelectViewDialog_listBox_DrawItem_____Default_", resourceCulture); + return ResourceManager.GetString("SelectViewDialog_listBox_DrawItem_Default", resourceCulture); } } @@ -2136,9 +2134,9 @@ /// /// Looks up a localized string similar to Verbergen opstartscherm.... /// - public static string SplashScreen_Shutdown_Hiding_splash_screen____ { + public static string SplashScreen_Shutdown_Hiding_splash_screen { get { - return ResourceManager.GetString("SplashScreen_Shutdown_Hiding_splash_screen____", resourceCulture); + return ResourceManager.GetString("SplashScreen_Shutdown_Hiding_splash_screen", resourceCulture); } } @@ -2220,18 +2218,18 @@ /// /// Looks up a localized string similar to Documentvenster wordt gesloten tijdens het openen.. /// - public static string ViewList_Close_View_is_being_closed_while_it_is_being_opened_ { + public static string ViewList_Close_View_is_being_closed_while_it_is_being_opened { get { - return ResourceManager.GetString("ViewList_Close_View_is_being_closed_while_it_is_being_opened_", resourceCulture); + return ResourceManager.GetString("ViewList_Close_View_is_being_closed_while_it_is_being_opened", resourceCulture); } } /// /// Looks up a localized string similar to Documentvenster {0} wordt gesloten.. /// - public static string ViewList_DockingManagerViewBarClosing_Closing_view___0_ { + public static string ViewList_DockingManagerViewBarClosing_Closing_view_0_ { get { - return ResourceManager.GetString("ViewList_DockingManagerViewBarClosing_Closing_view___0_", resourceCulture); + return ResourceManager.GetString("ViewList_DockingManagerViewBarClosing_Closing_view_0_", resourceCulture); } } @@ -2247,10 +2245,10 @@ /// /// Looks up a localized string similar to Er is geen standaardlocatie opgegeven. Kan geen documentvenster toevoegen zonder de locatie parameter.. /// - public static string ViewList_Insert_No_default_location_specified__Cannot_add_a_view_without_location_parameter_ { + public static string ViewList_Insert_No_default_location_specified_Cannot_add_a_view_without_location_parameter_ { get { - return ResourceManager.GetString("ViewList_Insert_No_default_location_specified__Cannot_add_a_view_without_location" + - "_parameter_", resourceCulture); + return ResourceManager.GetString("ViewList_Insert_No_default_location_specified_Cannot_add_a_view_without_location_" + + "parameter_", resourceCulture); } } @@ -2266,9 +2264,9 @@ /// /// Looks up a localized string similar to Geen documentvenster geregistreerd voor: {0}.. /// - public static string ViewResolver_OpenViewForData_No_view_registered_for____0_ { + public static string ViewResolver_OpenViewForData_No_view_registered_for_0_ { get { - return ResourceManager.GetString("ViewResolver_OpenViewForData_No_view_registered_for____0_", resourceCulture); + return ResourceManager.GetString("ViewResolver_OpenViewForData_No_view_registered_for_0_", resourceCulture); } } Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx =================================================================== diff -u -r555c08c6f506516d96076f33c1d6d4c4217b2a1c -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 555c08c6f506516d96076f33c1d6d4c4217b2a1c) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -120,7 +120,7 @@ Eigenschappen - + Het opgegeven project ({0}) was niet gevonden. @@ -139,7 +139,7 @@ ..\Resources\cross-small-bw.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Toevoegen Welkomspagina... @@ -154,7 +154,7 @@ ../Resources/brick_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Nieuw @@ -163,7 +163,7 @@ Opties - + ======== KRITIEKE FOUT #{0}: ======== {1}{2} @@ -176,7 +176,7 @@ Nieuw - + Kan niet meerdere instanties van Ringtoets starten. Sluit eerst de andere instantie. @@ -206,19 +206,19 @@ Ringtoets project files (.rtx)|*.rtx - + Fout bij het opslaan van de instellingen in {0}. ..\Resources\FindView.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Documentvenster wordt gesloten tijdens het openen. - + Documentvenster {0} wordt gesloten. - + Geen van de keuzeopties is geselecteerd: onmogelijk @@ -242,7 +242,7 @@ Weergeven/Verbergen - + Kan niet importeren naar {0}. @@ -251,7 +251,7 @@ Algemeen - + Documentvenster is al toegevoegd. Activeer de weergave in plaats van het toe te voegen. @@ -263,22 +263,22 @@ Onverwacht gedrag van het samengestelde documentvenster. Een documentvenster binnen het samengestelde documentvenster '{0}' heeft geen waarde. - + Standaardschermen aan het maken... Kritieke fout opgetrede tijdens deactivering van de grafische interface plugin. - + Annuleren... Berichtdetails - + Starten van de toepassing... - + Activiteit '{0}' is beëindigd met status {1}. @@ -305,16 +305,16 @@ ..\Resources\DocumentHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Het is niet mogelijk het logbestand te openen. In plaats hiervan wordt de folder waarin het logbestand staat geopend. ../Resources/control_stop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Starten van activiteit '{0}' - + Instelling {0} heeft de niet-ondersteunde waarde 'roaming'. @@ -335,7 +335,7 @@ ..\Resources\saveHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Activiteit '{0}' is niet gevonden in het project! Typefout of bent u misschien vergeten om een project te laden? @@ -344,7 +344,7 @@ ..\Resources\graphhs.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Schermmanager voor documenten aan het maken... @@ -356,7 +356,7 @@ ..\Resources\Edit_RedoHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Opgeslagen project '{0}' @@ -374,10 +374,10 @@ ..\Resources\cog_active.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Geen enkele "importer" is beschikbaar voor dit "item" ({0}). - + Geen documentvenster geregistreerd voor: {0}. @@ -398,7 +398,7 @@ ..\Resources\application_form.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Het licentie bestand {0} niet kan worden gevonden op de computer. @@ -416,22 +416,22 @@ ..\Resources\binocular_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Schermen initialiseren... - + - (Standaard) Help - + Ringtoets wordt gestart... Kaart - + Ribbon kon niet worden hersteld. De instellingen zijn ongeldig en zullen worden teruggezet naar de standaardinstellingen. @@ -455,7 +455,7 @@ Nieuw project succesvol geopend. - + Significante cijfers: @@ -470,7 +470,7 @@ ..\Resources\application_view_list.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Verbergen opstartscherm... @@ -485,7 +485,7 @@ ../Resources/brick_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Geen project gevonden. Laad het project eerst. @@ -512,13 +512,13 @@ ..\Resources\script.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Gestart in {0:f2} seconden. ..\Resources\folder_input.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Schermmanager aan het maken... @@ -527,7 +527,7 @@ ..\Resources\application_import_blue.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Grafische gebruikersinterface initialiseren... @@ -542,7 +542,7 @@ Openen - + Gebruiker heeft het opstarten onderbroken. Applicatie wordt afgesloten... @@ -575,13 +575,13 @@ ..\Resources\chart_organisation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Er is geen standaardlocatie opgegeven. Kan geen documentvenster toevoegen zonder de locatie parameter. Fout - + Wanneer deze optie is aangezet, zal de standaard opmaak worden gebruikt bij het opnieuw starten van Ringtoets. @@ -590,13 +590,13 @@ ..\Resources\newspaper.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Alle vensters zijn gemaakt. Selecteer een bestand om eruit te importeren... - + Menu's en werkbalken instellen... @@ -614,10 +614,10 @@ Berekenen activiteit of model is beschikbaar in het project. - + Ringtoets' grafische interface wordt gestart... - + Kon de gevraagde "dock" opmaak niet laden. De instellingen zijn ongeldig en zullen teruggezet worden naar de standaardinstellingen. @@ -632,13 +632,13 @@ ..\Resources\cut_red.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Het instellen van menu's en werkbalken is klaar. ..\Resources\OrgChartHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + < geen project geopend > - {0} @@ -650,7 +650,7 @@ Logbestand kan niet worden geopend. - + Opslaan van project '{0}' @@ -668,7 +668,7 @@ ../Resources/cog_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Decimalen: @@ -677,10 +677,10 @@ ..\Resources\cross-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Opmaak resetten na opnieuw opstarten - + Controleer logboekbestand voor meer informatie ("Home"-> "Show Log"). @@ -695,7 +695,7 @@ ../Resources/brick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Geen enkele "importer" is beschikbaar voor dit "item". @@ -728,13 +728,13 @@ Het aantal geselecteerde gegevenstypes moet 1 zijn. - + Locatie {0} is niet geldig voor het documentvenster. ..\Resources\chart_pie.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Slechts één instantie van de Ringtoets grafische interface is toegestaan per proces. Zorg ervoor dat de vorige instantie correct opgeruimd is. "Stack trace": @@ -803,10 +803,10 @@ Exporteren gestart. - + Ringtoets kan de huidige selectie niet exporteren. - + Ringtoets kan de huidige selectie ({0}) niet exporteren. @@ -824,7 +824,7 @@ Versie - + Sluiten van huidig project. \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs =================================================================== diff -u -r4d688bb446eb4508ff3b54b06baefbb71f60237a -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) +++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -65,7 +65,7 @@ if (instance != null) { instance = null; // reset to that the consequent creations won't fail. - throw new InvalidOperationException(Resources.RingtoetsGui_Only_a_single_instance_of_Ringtoets_is_allowed_at_the_same_time_per_process__make_sure_that_the_previous_instance_was_disposed_correctly__stack_trace__ + instanceCreationStackTrace); + throw new InvalidOperationException(Resources.RingtoetsGui_Only_a_single_instance_of_Ringtoets_is_allowed_at_the_same_time_per_process_Make_sure_that_the_previous_instance_was_disposed_correctly_stack_trace+ instanceCreationStackTrace); } instance = this; @@ -240,16 +240,16 @@ } else { - log.Info(Resources.RingtoetsGui_Run_Starting_application____); + log.Info(Resources.RingtoetsGui_Run_Starting_application); application.Run(); } - log.Info(Resources.RingtoetsGui_Run_Initializing_graphical_user_interface____); + log.Info(Resources.RingtoetsGui_Run_Initializing_graphical_user_interface); Initialize(); - log.InfoFormat(Resources.RingtoetsGui_Run_Started_in__0_f2__sec, (DateTime.Now - startTime).TotalSeconds); + log.InfoFormat(Resources.RingtoetsGui_Run_Started_in_0_f2_sec, (DateTime.Now - startTime).TotalSeconds); runFinished = true; @@ -690,7 +690,7 @@ if (!runFinished) // splash screen was closed before gui started. { - log.Info(Resources.RingtoetsGui_ShowSplashScreen_User_has_cancelled_start__exiting____); + log.Info(Resources.RingtoetsGui_ShowSplashScreen_User_has_cancelled_start_Exiting); SkipDialogsOnExit = true; Environment.Exit(1); } @@ -764,16 +764,16 @@ private void InitializeWindows() { - log.Info(Resources.RingtoetsGui_InitializeWindows_Initializing_windows____); + log.Info(Resources.RingtoetsGui_InitializeWindows_Initializing_windows); InitializeMainWindow(); - log.Info(Resources.RingtoetsGui_InitializeWindows_Creating_default_tool_windows____); + log.Info(Resources.RingtoetsGui_InitializeWindows_Creating_default_tool_windows); InitToolWindows(); UpdateTitle(); - log.Info(Resources.RingtoetsGui_InitializeWindows_All_windows_are_created_); + log.Info(Resources.RingtoetsGui_InitializeWindows_All_windows_are_created); } private void UpdateTitle() @@ -811,7 +811,7 @@ // TODO: incapsulate any knowledge of the plugin XML inside plugin configurator, the rest of the system should not know about it! private void InitToolWindows() { - log.Info(Resources.RingtoetsGui_InitToolWindows_Creating_document_window_manager____); + log.Info(Resources.RingtoetsGui_InitToolWindows_Creating_document_window_manager); var allowedDocumentWindowLocations = new[] { @@ -858,7 +858,7 @@ toolWindowViews.CollectionChanged += ToolWindowViewsOnCollectionChanged; - log.Info(Resources.RingtoetsGui_InitToolWindows_Creating_tool_window_manager____); + log.Info(Resources.RingtoetsGui_InitToolWindows_Creating_tool_window_manager); mainWindow.InitializeToolWindows(); @@ -920,14 +920,14 @@ private void InitializeMenusAndToolbars() { - log.Info(Resources.RingtoetsGui_InitializeMenusAndToolbars_Setting_up_menus_and_toolbars____); + log.Info(Resources.RingtoetsGui_InitializeMenusAndToolbars_Setting_up_menus_and_toolbars); mainWindow.SuspendLayout(); // Validate once when loading is completed mainWindow.ValidateItems(); mainWindow.ResumeLayout(); - log.Info(Resources.RingtoetsGui_InitializeMenusAndToolbars_Menus_and_toolbars_are_ready_); + log.Info(Resources.RingtoetsGui_InitializeMenusAndToolbars_Menus_and_toolbars_are_ready); } private void ActivatePlugins() Index: Core/Common/src/Core.Common.Utils/ComponentModel/DynamicReadOnlyAttribute.cs =================================================================== diff -u -r84a9db62e2fb9699c289b2df788b6d622e4f637a -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Utils/ComponentModel/DynamicReadOnlyAttribute.cs (.../DynamicReadOnlyAttribute.cs) (revision 84a9db62e2fb9699c289b2df788b6d622e4f637a) +++ Core/Common/src/Core.Common.Utils/ComponentModel/DynamicReadOnlyAttribute.cs (.../DynamicReadOnlyAttribute.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -23,7 +23,7 @@ var propertyInfo = obj.GetType().GetProperty(propertyName); if (propertyInfo == null) { - throw new MissingMemberException(string.Format(Resource.Could_not_find_property__0__on_type__1_, propertyName, + throw new MissingMemberException(string.Format(Resource.Could_not_find_property_0_on_type_1_, propertyName, obj.GetType())); } @@ -38,7 +38,7 @@ if (validationMethod == null) { throw new MissingMethodException( - String.Format(Resource.DynamicReadOnlyAttribute_IsDynamicReadOnly__0__uses_DynanamicReadOnlyAttribute_but_does_not_have_method_marked_using_DynamicReadOnlyValidationMethodAttribute, obj)); + String.Format(Resource.DynamicReadOnlyAttribute_IsDynamicReadOnly_0_uses_DynanamicReadOnlyAttribute_but_does_not_have_method_marked_using_DynamicReadOnlyValidationMethodAttribute, obj)); } var shouldBeReadOnly = (bool) validationMethod.Invoke(obj, new[] @@ -61,30 +61,30 @@ if (!validationMethods.Any()) { - throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_not_found__or_not_public___class___0_, type)); + throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_not_found_or_not_public_class_0_, type)); } if (validationMethods.Count() > 1) { - throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_Only_one_DynamicReadOnlyValidationMethod_is_allowed_per_class___0_, type)); + throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_Only_one_DynamicReadOnlyValidationMethod_is_allowed_per_class_0_, type)); } var validationMethod = validationMethods.First(); // check return type and arguments if (validationMethod.ReturnType != typeof(bool)) { - throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_must_use_bool_as_a_return_type__class___0_, type)); + throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_must_use_bool_as_a_return_type_class_0_, type)); } if (validationMethod.GetParameters().Length != 1) { - throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_has_incorrect_number_of_arguments__should_be_1_of_type_string__class___0_, type)); + throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_has_incorrect_number_of_arguments_Should_be_1_of_type_string_class_0_, type)); } if (validationMethod.GetParameters()[0].ParameterType != typeof(string)) { - throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_has_incorrect_argument_type__should_be_of_type_string__class___0_, type)); + throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_has_incorrect_argument_type_Should_be_of_type_string_class_0_, type)); } return validationMethod; Index: Core/Common/src/Core.Common.Utils/ComponentModel/DynamicVisibleAttribute.cs =================================================================== diff -u -r84a9db62e2fb9699c289b2df788b6d622e4f637a -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Utils/ComponentModel/DynamicVisibleAttribute.cs (.../DynamicVisibleAttribute.cs) (revision 84a9db62e2fb9699c289b2df788b6d622e4f637a) +++ Core/Common/src/Core.Common.Utils/ComponentModel/DynamicVisibleAttribute.cs (.../DynamicVisibleAttribute.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -24,7 +24,7 @@ var propertyInfo = obj.GetType().GetProperty(propertyName); if (propertyInfo == null) { - throw new MissingMemberException(string.Format(Resource.Could_not_find_property__0__on_type__1_, propertyName, + throw new MissingMemberException(string.Format(Resource.Could_not_find_property_0_on_type_1_, propertyName, obj.GetType())); } @@ -39,7 +39,7 @@ if (validationMethod == null) { throw new MissingMethodException( - String.Format(Resource.DynamicVisibleAttribute_IsDynamicVisible__0__uses_DynamicVisibleAttribute_but_does_not_have_method_marked_using_DynamicVisibleValidationMethodAttribute, obj)); + String.Format(Resource.DynamicVisibleAttribute_IsDynamicVisible_0_uses_DynamicVisibleAttribute_but_does_not_have_method_marked_using_DynamicVisibleValidationMethodAttribute, obj)); } return (bool) validationMethod.Invoke(obj, new[] Index: Core/Common/src/Core.Common.Utils/IO/FileUtils.cs =================================================================== diff -u -r8a9a2efad299327b082088189b9a37c32c55a890 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Utils/IO/FileUtils.cs (.../FileUtils.cs) (revision 8a9a2efad299327b082088189b9a37c32c55a890) +++ Core/Common/src/Core.Common.Utils/IO/FileUtils.cs (.../FileUtils.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -80,7 +80,7 @@ } foreach (var fi in source.GetFiles()) { - Log.DebugFormat(Resource.FileUtils_CopyAll_Copying__0___1_, target.FullName, fi.Name); + Log.DebugFormat(Resource.FileUtils_CopyAll_Copying_0_1_, target.FullName, fi.Name); if (!target.Exists) { Index: Core/Common/src/Core.Common.Utils/Properties/Resource.Designer.cs =================================================================== diff -u -r555c08c6f506516d96076f33c1d6d4c4217b2a1c -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Utils/Properties/Resource.Designer.cs (.../Resource.Designer.cs) (revision 555c08c6f506516d96076f33c1d6d4c4217b2a1c) +++ Core/Common/src/Core.Common.Utils/Properties/Resource.Designer.cs (.../Resource.Designer.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -63,90 +63,90 @@ /// /// Looks up a localized string similar to Kon 'Assembly' informatie niet lezen voor {0} : {1}. /// - internal static string AssemblyUtils_LoadAllAssembliesFromDirectory_Could_not_read_assembly_information_for__0_____1_ { + internal static string AssemblyUtils_LoadAllAssembliesFromDirectory_Could_not_read_assembly_information_for_0_1_ { get { return ResourceManager.GetString("AssemblyUtils_LoadAllAssembliesFromDirectory_Could_not_read_assembly_information_" + - "for__0_____1_", resourceCulture); + "for_0_1_", resourceCulture); } } /// /// Looks up a localized string similar to Kon eigenschap {0} van type {1} niet vinden.. /// - internal static string Could_not_find_property__0__on_type__1_ { + internal static string Could_not_find_property_0_on_type_1_ { get { - return ResourceManager.GetString("Could_not_find_property__0__on_type__1_", resourceCulture); + return ResourceManager.GetString("Could_not_find_property_0_on_type_1_", resourceCulture); } } /// /// Looks up a localized string similar to Argument van DynamicReadOnlyValidationMethod moet van het type 'string' zijn. Klasse: {0}. /// - internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_has_incorrect_argument_type__should_be_of_type_string__class___0_ { + internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_has_incorrect_argument_type_Should_be_of_type_string_class_0_ { get { return ResourceManager.GetString("DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValida" + - "tionMethod_has_incorrect_argument_type__should_be_of_type_string__class___0_", resourceCulture); + "tionMethod_has_incorrect_argument_type_Should_be_of_type_string_class_0_", resourceCulture); } } /// /// Looks up a localized string similar to DynamicReadOnlyValidationMethod heeft een incorrecte aantal argumenten. Zou er één moeten zijn. Klasse: {0}. /// - internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_has_incorrect_number_of_arguments__should_be_1_of_type_string__class___0_ { + internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_has_incorrect_number_of_arguments_Should_be_1_of_type_string_class_0_ { get { return ResourceManager.GetString("DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValida" + - "tionMethod_has_incorrect_number_of_arguments__should_be_1_of_type_string__class_" + - "__0_", resourceCulture); + "tionMethod_has_incorrect_number_of_arguments_Should_be_1_of_type_string_class_0_" + + "", resourceCulture); } } /// /// Looks up a localized string similar to DynamicReadOnlyValidationMethod moet 'bool' als 'return type' hebben. Klasse: {0}. /// - internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_must_use_bool_as_a_return_type__class___0_ { + internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_must_use_bool_as_a_return_type_class_0_ { get { return ResourceManager.GetString("DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValida" + - "tionMethod_must_use_bool_as_a_return_type__class___0_", resourceCulture); + "tionMethod_must_use_bool_as_a_return_type_class_0_", resourceCulture); } } /// /// Looks up a localized string similar to DynamicReadOnlyValidationMethod niet gevonden (of geen 'public' toegankelijkheid). Klasse: {0}. /// - internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_not_found__or_not_public___class___0_ { + internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_not_found_or_not_public_class_0_ { get { return ResourceManager.GetString("DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValida" + - "tionMethod_not_found__or_not_public___class___0_", resourceCulture); + "tionMethod_not_found_or_not_public_class_0_", resourceCulture); } } /// /// Looks up a localized string similar to Slechts één DynamicReadOnlyValidationMethod toegestaan per klasse: {0}.. /// - internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_Only_one_DynamicReadOnlyValidationMethod_is_allowed_per_class___0_ { + internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_Only_one_DynamicReadOnlyValidationMethod_is_allowed_per_class_0_ { get { return ResourceManager.GetString("DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_Only_one_DynamicReadO" + - "nlyValidationMethod_is_allowed_per_class___0_", resourceCulture); + "nlyValidationMethod_is_allowed_per_class_0_", resourceCulture); } } /// /// Looks up a localized string similar to {0} gebruikt DynanamicReadOnlyAttribute, maar heeft geen methode gemarkeerd met DynamicReadOnlyValidationMethodAttribute.. /// - internal static string DynamicReadOnlyAttribute_IsDynamicReadOnly__0__uses_DynanamicReadOnlyAttribute_but_does_not_have_method_marked_using_DynamicReadOnlyValidationMethodAttribute { + internal static string DynamicReadOnlyAttribute_IsDynamicReadOnly_0_uses_DynanamicReadOnlyAttribute_but_does_not_have_method_marked_using_DynamicReadOnlyValidationMethodAttribute { get { - return ResourceManager.GetString("DynamicReadOnlyAttribute_IsDynamicReadOnly__0__uses_DynanamicReadOnlyAttribute_bu" + - "t_does_not_have_method_marked_using_DynamicReadOnlyValidationMethodAttribute", resourceCulture); + return ResourceManager.GetString("DynamicReadOnlyAttribute_IsDynamicReadOnly_0_uses_DynanamicReadOnlyAttribute_but_" + + "does_not_have_method_marked_using_DynamicReadOnlyValidationMethodAttribute", resourceCulture); } } /// /// Looks up a localized string similar to {0} gebruikt DynamicVisibleAttribute, maar heeft geen methode gemarkeerd met DynamicVisibleValidationMethodAttribute.. /// - internal static string DynamicVisibleAttribute_IsDynamicVisible__0__uses_DynamicVisibleAttribute_but_does_not_have_method_marked_using_DynamicVisibleValidationMethodAttribute { + internal static string DynamicVisibleAttribute_IsDynamicVisible_0_uses_DynamicVisibleAttribute_but_does_not_have_method_marked_using_DynamicVisibleValidationMethodAttribute { get { - return ResourceManager.GetString("DynamicVisibleAttribute_IsDynamicVisible__0__uses_DynamicVisibleAttribute_but_doe" + - "s_not_have_method_marked_using_DynamicVisibleValidationMethodAttribute", resourceCulture); + return ResourceManager.GetString("DynamicVisibleAttribute_IsDynamicVisible_0_uses_DynamicVisibleAttribute_but_does_" + + "not_have_method_marked_using_DynamicVisibleValidationMethodAttribute", resourceCulture); } } @@ -162,9 +162,9 @@ /// /// Looks up a localized string similar to Kopiëren van {0}\{1}. /// - internal static string FileUtils_CopyAll_Copying__0___1_ { + internal static string FileUtils_CopyAll_Copying_0_1_ { get { - return ResourceManager.GetString("FileUtils_CopyAll_Copying__0___1_", resourceCulture); + return ResourceManager.GetString("FileUtils_CopyAll_Copying_0_1_", resourceCulture); } } @@ -218,9 +218,9 @@ /// /// Looks up a localized string similar to Kan methode {0}.TryParse(string, out {0}) niet vinden.. /// - internal static string ParseHelper_ParseHelper_Cannot_find_method__0__TryParse_string__out__0__ { + internal static string ParseHelper_ParseHelper_Cannot_find_method_0_TryParse_string_out_0_ { get { - return ResourceManager.GetString("ParseHelper_ParseHelper_Cannot_find_method__0__TryParse_string__out__0__", resourceCulture); + return ResourceManager.GetString("ParseHelper_ParseHelper_Cannot_find_method_0_TryParse_string_out_0_", resourceCulture); } } @@ -245,38 +245,37 @@ /// /// Looks up a localized string similar to Geen 'default constructor' gevonden voor type {0}.. /// - internal static string TypeUtils_CreateInstance_No_default_constructor_available_for_type__0_ { + internal static string TypeUtils_CreateInstance_No_default_constructor_available_for_type_0_ { get { - return ResourceManager.GetString("TypeUtils_CreateInstance_No_default_constructor_available_for_type__0_", resourceCulture); + return ResourceManager.GetString("TypeUtils_CreateInstance_No_default_constructor_available_for_type_0_", resourceCulture); } } /// /// Looks up a localized string similar to '{0}' is geen geldige expressie voor deze methode.. /// - internal static string TypeUtils_GetMemberName___0____is_not_a_valid_expression_for_this_method { + internal static string TypeUtils_GetMemberName_0_is_not_a_valid_expression_for_this_method { get { - return ResourceManager.GetString("TypeUtils_GetMemberName___0____is_not_a_valid_expression_for_this_method", resourceCulture); + return ResourceManager.GetString("TypeUtils_GetMemberName_0_is_not_a_valid_expression_for_this_method", resourceCulture); } } /// /// Looks up a localized string similar to Parameter 'member' is geen geldige expressie voor deze methode.. /// - internal static string TypeUtils_GetMemberNameFromMemberExpression__member__not_a_valid_expression_for_this_method { + internal static string TypeUtils_GetMemberNameFromMemberExpression_member_not_a_valid_expression_for_this_method { get { - return ResourceManager.GetString("TypeUtils_GetMemberNameFromMemberExpression__member__not_a_valid_expression_for_t" + - "his_method", resourceCulture); + return ResourceManager.GetString("TypeUtils_GetMemberNameFromMemberExpression_member_not_a_valid_expression_for_thi" + + "s_method", resourceCulture); } } /// /// Looks up a localized string similar to {0}, ernst: {1} ({2} fout(en), {3} waarschuwing(en), {4} info).. /// - internal static string ValidationReport_ToString__0___severity___1____2__error_s____3__warning_s____4__info_ { + internal static string ValidationReport_ToString_0_severity_1_2_error_s_3_warnings_4_info { get { - return ResourceManager.GetString("ValidationReport_ToString__0___severity___1____2__error_s____3__warning_s____4__i" + - "nfo_", resourceCulture); + return ResourceManager.GetString("ValidationReport_ToString_0_severity_1_2_error_s_3_warnings_4_info", resourceCulture); } } Index: Core/Common/src/Core.Common.Utils/Properties/Resource.resx =================================================================== diff -u -r555c08c6f506516d96076f33c1d6d4c4217b2a1c -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Utils/Properties/Resource.resx (.../Resource.resx) (revision 555c08c6f506516d96076f33c1d6d4c4217b2a1c) +++ Core/Common/src/Core.Common.Utils/Properties/Resource.resx (.../Resource.resx) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -132,48 +132,48 @@ Thread synchronisatiefout (aanroep {1}): {0} - + {0} gebruikt DynanamicReadOnlyAttribute, maar heeft geen methode gemarkeerd met DynamicReadOnlyValidationMethodAttribute. - + DynamicReadOnlyValidationMethod niet gevonden (of geen 'public' toegankelijkheid). Klasse: {0} - + Slechts één DynamicReadOnlyValidationMethod toegestaan per klasse: {0}. - + DynamicReadOnlyValidationMethod moet 'bool' als 'return type' hebben. Klasse: {0} - + DynamicReadOnlyValidationMethod heeft een incorrecte aantal argumenten. Zou er één moeten zijn. Klasse: {0} - + Argument van DynamicReadOnlyValidationMethod moet van het type 'string' zijn. Klasse: {0} - + Kon eigenschap {0} van type {1} niet vinden. - + {0} gebruikt DynamicVisibleAttribute, maar heeft geen methode gemarkeerd met DynamicVisibleValidationMethodAttribute. Kon {0} niet vinden, dan wel laden. Fout: {1} - {2} Bestand: {3}\{0} - + Geen 'default constructor' gevonden voor type {0}. Kritieke fout opgetreden. - + Parameter 'member' is geen geldige expressie voor deze methode. - + Kan methode {0}.TryParse(string, out {0}) niet vinden. - + {0}, ernst: {1} ({2} fout(en), {3} waarschuwing(en), {4} info). @@ -182,13 +182,13 @@ afgebroken - + Kopiëren van {0}\{1} - + Kon 'Assembly' informatie niet lezen voor {0} : {1} - + '{0}' is geen geldige expressie voor deze methode. \ No newline at end of file Index: Core/Common/src/Core.Common.Utils/Reflection/AssemblyUtils.cs =================================================================== diff -u -r3fb4f975b19a14ad62c3ac2e5816ae6e08f957cc -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Utils/Reflection/AssemblyUtils.cs (.../AssemblyUtils.cs) (revision 3fb4f975b19a14ad62c3ac2e5816ae6e08f957cc) +++ Core/Common/src/Core.Common.Utils/Reflection/AssemblyUtils.cs (.../AssemblyUtils.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -275,7 +275,7 @@ } catch (Exception exception) { - log.ErrorFormat(Resource.AssemblyUtils_LoadAllAssembliesFromDirectory_Could_not_read_assembly_information_for__0_____1_, assemblyName, exception.Message); + log.ErrorFormat(Resource.AssemblyUtils_LoadAllAssembliesFromDirectory_Could_not_read_assembly_information_for_0_1_, assemblyName, exception.Message); continue; } Index: Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs =================================================================== diff -u -rde151db2652b6fb6e3da1536053c24eb34f962a8 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision de151db2652b6fb6e3da1536053c24eb34f962a8) +++ Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -270,7 +270,7 @@ return GetMemberNameFromMemberExpression(unary.Operand as MemberExpression); } - var message = string.Format(Resource.TypeUtils_GetMemberName___0____is_not_a_valid_expression_for_this_method, e); + var message = string.Format(Resource.TypeUtils_GetMemberName_0_is_not_a_valid_expression_for_this_method, e); throw new ArgumentException(message); } @@ -480,7 +480,7 @@ if (defaultConstructor == null) { - throw new NotImplementedException(string.Format(Resource.TypeUtils_CreateInstance_No_default_constructor_available_for_type__0_, type)); + throw new NotImplementedException(string.Format(Resource.TypeUtils_CreateInstance_No_default_constructor_available_for_type_0_, type)); } return (T) Activator.CreateInstance(type, true); @@ -562,7 +562,7 @@ { return member.Member.Name; } - throw new ArgumentException(Resource.TypeUtils_GetMemberNameFromMemberExpression__member__not_a_valid_expression_for_this_method); + throw new ArgumentException(Resource.TypeUtils_GetMemberNameFromMemberExpression_member_not_a_valid_expression_for_this_method); } private static FieldInfo GetFieldInfo(Type type, string fieldName) Index: Core/Common/src/Core.Common.Utils/StringExtensions.cs =================================================================== diff -u -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Utils/StringExtensions.cs (.../StringExtensions.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) +++ Core/Common/src/Core.Common.Utils/StringExtensions.cs (.../StringExtensions.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -119,7 +119,7 @@ if (tryParseMethod == null) { - throw new InvalidOperationException(String.Format(Resource.ParseHelper_ParseHelper_Cannot_find_method__0__TryParse_string__out__0__, type.FullName)); + throw new InvalidOperationException(String.Format(Resource.ParseHelper_ParseHelper_Cannot_find_method_0_TryParse_string_out_0_, type.FullName)); } _parser = Expression.Lambda>( Expression.Condition( @@ -156,7 +156,7 @@ if (tryParseMethod == null) { - throw new InvalidOperationException(String.Format(Resource.ParseHelper_ParseHelper_Cannot_find_method__0__TryParse_string__out__0__, typeof(TBase).FullName)); + throw new InvalidOperationException(String.Format(Resource.ParseHelper_ParseHelper_Cannot_find_method_0_TryParse_string_out_0_, typeof(TBase).FullName)); } ParameterExpression target = Expression.Parameter(typeof(string), "target"); ParameterExpression defaultValue = Expression.Parameter(typeof(TBase?), "defaultValue"); Index: Core/Common/src/Core.Common.Utils/Validation/ValidationReport.cs =================================================================== diff -u -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Common/src/Core.Common.Utils/Validation/ValidationReport.cs (.../ValidationReport.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) +++ Core/Common/src/Core.Common.Utils/Validation/ValidationReport.cs (.../ValidationReport.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -161,7 +161,7 @@ public override string ToString() { - return string.Format(Resource.ValidationReport_ToString__0___severity___1____2__error_s____3__warning_s____4__info_, + return string.Format(Resource.ValidationReport_ToString_0_severity_1_2_error_s_3_warnings_4_info, Category, Severity, ErrorCount, WarningCount, InfoCount); } Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r84a9db62e2fb9699c289b2df788b6d622e4f637a -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 84a9db62e2fb9699c289b2df788b6d622e4f637a) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -537,18 +537,18 @@ /// /// Looks up a localized string similar to Lettertype kan niet leeg zijn.. /// - public static string ChartProperties_FontValid_Font_can_not_be_empty_ { + public static string ChartProperties_FontValid_Font_can_not_be_empty { get { - return ResourceManager.GetString("ChartProperties_FontValid_Font_can_not_be_empty_", resourceCulture); + return ResourceManager.GetString("ChartProperties_FontValid_Font_can_not_be_empty", resourceCulture); } } /// /// Looks up a localized string similar to Lettertype grootte valt niet binnen grenzen (3-200). /// - public static string ChartProperties_FontValid_Font_size_is_not_within_limits__3___200_ { + public static string ChartProperties_FontValid_Font_size_is_not_within_limits_3_200 { get { - return ResourceManager.GetString("ChartProperties_FontValid_Font_size_is_not_within_limits__3___200_", resourceCulture); + return ResourceManager.GetString("ChartProperties_FontValid_Font_size_is_not_within_limits_3_200", resourceCulture); } } Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx =================================================================== diff -u -r84a9db62e2fb9699c289b2df788b6d622e4f637a -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx (.../Resources.resx) (revision 84a9db62e2fb9699c289b2df788b6d622e4f637a) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx (.../Resources.resx) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -607,10 +607,10 @@ Grafiek - + Lettertype kan niet leeg zijn. - + Lettertype grootte valt niet binnen grenzen (3-200) Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Property/Charting/ChartProperties.cs =================================================================== diff -u -r84a9db62e2fb9699c289b2df788b6d622e4f637a -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Property/Charting/ChartProperties.cs (.../ChartProperties.cs) (revision 84a9db62e2fb9699c289b2df788b6d622e4f637a) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Property/Charting/ChartProperties.cs (.../ChartProperties.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -174,13 +174,13 @@ { if (font == null) { - Log.Error(Resources.ChartProperties_FontValid_Font_can_not_be_empty_); + Log.Error(Resources.ChartProperties_FontValid_Font_can_not_be_empty); return false; } if (font.Size < 3 || font.Size > 200) { - Log.Error(Resources.ChartProperties_FontValid_Font_size_is_not_within_limits__3___200_); + Log.Error(Resources.ChartProperties_FontValid_Font_size_is_not_within_limits_3_200); return false; } Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj =================================================================== diff -u -rbc5c669eb6bf927e997d5b88b5c9eddd1ba87f00 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj (.../Core.Plugins.ProjectExplorer.csproj) (revision bc5c669eb6bf927e997d5b88b5c9eddd1ba87f00) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj (.../Core.Plugins.ProjectExplorer.csproj) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -226,6 +226,7 @@ ProjectExplorer.cs + Designer Designer Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.Designer.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.Designer.cs (.../ProjectExplorer.Designer.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.Designer.cs (.../ProjectExplorer.Designer.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -37,11 +37,7 @@ // // toolStrip1 // - this.toolStrip1.AccessibleDescription = null; - this.toolStrip1.AccessibleName = null; resources.ApplyResources(this.toolStrip1, "toolStrip1"); - this.toolStrip1.BackgroundImage = null; - this.toolStrip1.Font = null; this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.buttonScrollToItemInActiveView}); @@ -50,34 +46,23 @@ // // buttonScrollToItemInActiveView // - this.buttonScrollToItemInActiveView.AccessibleDescription = null; - this.buttonScrollToItemInActiveView.AccessibleName = null; resources.ApplyResources(this.buttonScrollToItemInActiveView, "buttonScrollToItemInActiveView"); - this.buttonScrollToItemInActiveView.BackgroundImage = null; this.buttonScrollToItemInActiveView.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.buttonScrollToItemInActiveView.Name = "buttonScrollToItemInActiveView"; this.buttonScrollToItemInActiveView.Tag = "LocateActiveViewItem"; this.buttonScrollToItemInActiveView.Click += new System.EventHandler(this.ButtonScrollToItemInActiveViewClick); // // treeViewPanel // - this.treeViewPanel.AccessibleDescription = null; - this.treeViewPanel.AccessibleName = null; resources.ApplyResources(this.treeViewPanel, "treeViewPanel"); - this.treeViewPanel.BackgroundImage = null; - this.treeViewPanel.Font = null; this.treeViewPanel.Name = "treeViewPanel"; // // ProjectExplorer // - this.AccessibleDescription = null; - this.AccessibleName = null; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackgroundImage = null; this.Controls.Add(this.treeViewPanel); this.Controls.Add(this.toolStrip1); - this.Font = null; this.Name = "ProjectExplorer"; this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs =================================================================== diff -u -rad6a41fea29f9f2160834d59d9511b8fb5d6c838 -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs (.../ProjectExplorer.cs) (revision ad6a41fea29f9f2160834d59d9511b8fb5d6c838) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs (.../ProjectExplorer.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -84,7 +84,7 @@ if (nodeToSelect == null) { - log.DebugFormat(Resources.ProjectExplorer_ScrollTo_Can_t_find_tree_node_for_item___0_, o); + log.DebugFormat(Resources.ProjectExplorer_ScrollTo_Can_t_find_tree_node_for_item_0_, o); return; } @@ -118,7 +118,7 @@ return; } - log.WarnFormat(Resources.ProjectExplorer_ButtonScrollToItemInActiveViewClick_Can_t_find_project_item_for_view_data___0_, gui.DocumentViews.ActiveView.Data); + log.WarnFormat(Resources.ProjectExplorer_ButtonScrollToItemInActiveViewClick_Can_t_find_project_item_for_view_data_0_, gui.DocumentViews.ActiveView.Data); } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.resx =================================================================== diff -u -r84a9db62e2fb9699c289b2df788b6d622e4f637a -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.resx (.../ProjectExplorer.resx) (revision 84a9db62e2fb9699c289b2df788b6d622e4f637a) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.resx (.../ProjectExplorer.resx) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -117,115 +117,112 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - - 375, 25 + + 6, 13 - - 375, 352 + + Zoek - - - 5 + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Zoek scherm behorende bij het actieve item in de projectverkenner. + + + None - - 23, 22 + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill + + 375, 327 ProjectExplorer - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsAAAA7AAWrWiQkAAAHySURBVDhPxdLfS1phGAdw/5EggthNl0EQ/QtdSK7cWsdt - WdS0H+YU1HBESIOYDDFj0UaWKSdPUZJtls1BP6gVi7mlZq4u0soWRT+u/MG3874nDMpdtF3sge/FuXg+ - 7/M+5xX9c4nbWcWb8dilwRWD3snHEYVuOALt0CY0H35C/T6IjoENtL/7hjbbGpTWVehti5ekjwImLpK1 - +A5x37x4G8hSgJz8N2ns/QIK6B3biGIT2zQhxBDGDrbAuCXwRz/h6CKJdDaN21XfMy8AupGtHBDJ/kD3 - soECD+2V8IW8SJ4f5gWemmavAX5hBCBR+ZrBsBIEjmZR76iFN+hB8owHMncBpuujAJBtk2bNnBIvZxQw - +rWoHaqCwiWHd8ODg9MDpDKp67abemL0CgD5Vc85KVTTzbCtm2FZ64V5pQcNdhkmVjnsnyTyTvC40yMA - 6sHvdIJGVga5sw4yuxTlxlLUDdTAvcQifhzPC0j1kwLQ1r+e24GkrxIVr8qwy3+VtDwAtziGxHECqfTd - K0g0nAC0Wr/mgHAmCKb/EQWKG4rgDIwi/nsv7wRV6jEBUFpWcgB5B78QoUAhUwCHf+SPgLiDFQCxysU2 - mRfoy5K//oxnpjnIun38lqfpoqSGKdToJlCtHefHdvMnsxCrSFwsBf5ziURXMOptncLGWiUAAAAASUVO - RK5CYII= - + + $this - - toolStrip1 - Magenta - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4 1 - - 0, 0 + + 375, 25 - - System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fill - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 23, 22 - - None + + treeViewPanel - - Zoek + + 0 - - 6, 13 + + Zoek scherm behorende bij het actieve item in de projectverkenner. - - 4 + + toolStrip1 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - False - toolStrip1 - - buttonScrollToItemInActiveView + + False - - 375, 327 + + 0, 0 - - 0 + + 5 - - $this + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAAHySURBVDhPxdLfS1phGAdw/5EggthNl0EQ/QtdSK7cWsdt + WdS0H+YU1HBESIOYDDFj0UaWKSdPUZJtls1BP6gVi7mlZq4u0soWRT+u/MG3874nDMpdtF3sge/FuXg+ + 7/M+5xX9c4nbWcWb8dilwRWD3snHEYVuOALt0CY0H35C/T6IjoENtL/7hjbbGpTWVehti5ekjwImLpK1 + +A5x37x4G8hSgJz8N2ns/QIK6B3biGIT2zQhxBDGDrbAuCXwRz/h6CKJdDaN21XfMy8AupGtHBDJ/kD3 + soECD+2V8IW8SJ4f5gWemmavAX5hBCBR+ZrBsBIEjmZR76iFN+hB8owHMncBpuujAJBtk2bNnBIvZxQw + +rWoHaqCwiWHd8ODg9MDpDKp67abemL0CgD5Vc85KVTTzbCtm2FZ64V5pQcNdhkmVjnsnyTyTvC40yMA + 6sHvdIJGVga5sw4yuxTlxlLUDdTAvcQifhzPC0j1kwLQ1r+e24GkrxIVr8qwy3+VtDwAtziGxHECqfTd + K0g0nAC0Wr/mgHAmCKb/EQWKG4rgDIwi/nsv7wRV6jEBUFpWcgB5B78QoUAhUwCHf+SPgLiDFQCxysU2 + mRfoy5K//oxnpjnIun38lqfpoqSGKdToJlCtHefHdvMnsxCrSFwsBf5ziURXMOptncLGWiUAAAAASUVO + RK5CYII= + - - treeViewPanel + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 0, 25 - - $this + + buttonScrollToItemInActiveView - - 0, 0 + + 375, 352 - + True - - - ru-RU - + + + 0, 0 + \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs =================================================================== diff -u -r84a9db62e2fb9699c289b2df788b6d622e4f637a -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 84a9db62e2fb9699c289b2df788b6d622e4f637a) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -863,19 +863,19 @@ /// /// Looks up a localized string similar to Kan geen projectitem vinden voor de data van dit scherm: {0}. /// - public static string ProjectExplorer_ButtonScrollToItemInActiveViewClick_Can_t_find_project_item_for_view_data___0_ { + public static string ProjectExplorer_ButtonScrollToItemInActiveViewClick_Can_t_find_project_item_for_view_data_0_ { get { return ResourceManager.GetString("ProjectExplorer_ButtonScrollToItemInActiveViewClick_Can_t_find_project_item_for_v" + - "iew_data___0_", resourceCulture); + "iew_data_0_", resourceCulture); } } /// /// Looks up a localized string similar to Kan geen bijbehorende knoop vinden in de projectverkenner voor item: {0}. /// - public static string ProjectExplorer_ScrollTo_Can_t_find_tree_node_for_item___0_ { + public static string ProjectExplorer_ScrollTo_Can_t_find_tree_node_for_item_0_ { get { - return ResourceManager.GetString("ProjectExplorer_ScrollTo_Can_t_find_tree_node_for_item___0_", resourceCulture); + return ResourceManager.GetString("ProjectExplorer_ScrollTo_Can_t_find_tree_node_for_item_0_", resourceCulture); } } Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx =================================================================== diff -u -r84a9db62e2fb9699c289b2df788b6d622e4f637a -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx (.../Resources.resx) (revision 84a9db62e2fb9699c289b2df788b6d622e4f637a) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx (.../Resources.resx) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -379,10 +379,10 @@ Het MainWindow moet zichtbaar zijn wanneer WaitUntilAllEventsAreProcessed wordt aangeroepen. - + Kan geen projectitem vinden voor de data van dit scherm: {0} - + Kan geen bijbehorende knoop vinden in de projectverkenner voor item: {0} Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs =================================================================== diff -u -r6562ca56583ecdfadc430b33c3dd4d676f7703ef -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs (.../MapAddLayerCommand.cs) (revision 6562ca56583ecdfadc430b33c3dd4d676f7703ef) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs (.../MapAddLayerCommand.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -91,7 +91,7 @@ } catch (Exception e) { - var message = string.Format(Resources.MapAddLayerCommand_TryAddLayerFromFile_Cannot_create_layer_s__from_file__0____1_, file, e.Message); + var message = string.Format(Resources.MapAddLayerCommand_TryAddLayerFromFile_Cannot_create_layer_s__from_file_0_1_, file, e.Message); log.Error(message); MessageBox.Show(message, Resources.MapAddLayerCommand_TryAddLayerFromFile_Layer_creation_failed, MessageBoxButtons.OK); Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs =================================================================== diff -u -r6562ca56583ecdfadc430b33c3dd4d676f7703ef -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs (.../MapChangeCoordinateSystemCommand.cs) (revision 6562ca56583ecdfadc430b33c3dd4d676f7703ef) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs (.../MapChangeCoordinateSystemCommand.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -35,7 +35,7 @@ } catch (CoordinateTransformException e) { - var message = string.Format(Resources.MapChangeCoordinateSystemCommand_OnExecute_Cannot_convert_map_to_selected_coordinate_system___0_,e.Message); + var message = string.Format(Resources.MapChangeCoordinateSystemCommand_OnExecute_Cannot_convert_map_to_selected_coordinate_system_0_,e.Message); MessageBox.Show(message, Resources.MapChangeCoordinateSystemCommand_OnExecute_Map_coordinate_system, MessageBoxButtons.OK, MessageBoxIcon.Error); base.OnExecute(arguments); Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/MapProperties.cs =================================================================== diff -u -r6562ca56583ecdfadc430b33c3dd4d676f7703ef -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/MapProperties.cs (.../MapProperties.cs) (revision 6562ca56583ecdfadc430b33c3dd4d676f7703ef) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/MapProperties.cs (.../MapProperties.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -53,7 +53,7 @@ } catch (CoordinateTransformException e) { - var message = string.Format(Resources.MapProperties_CoordinateSystem_Cannot_convert_map_to_coordinate_system___0_, e.Message); + var message = string.Format(Resources.MapProperties_CoordinateSystem_Cannot_convert_map_to_coordinate_system_0_, e.Message); MessageBox.Show(message, Resources.MapProperties_CoordinateSystem_Coordinate_transformation_error, MessageBoxButtons.OK, MessageBoxIcon.Error); } @@ -73,7 +73,7 @@ { if (data.CoordinateSystem == null) { - Log.DebugFormat(Resources.MapProperties_ShowGrid_Showing_latitude___longitude_grid_is_supported_only_when_map_coordinate_system_is_non_empty); + Log.DebugFormat(Resources.MapProperties_ShowGrid_Showing_latitude_longitude_grid_is_supported_only_when_map_coordinate_system_is_non_empty); return; } Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerPolygonProperties.cs =================================================================== diff -u -r51c6912af6825ed5a1f2ca1054f079ec3bc87d8e -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerPolygonProperties.cs (.../VectorLayerPolygonProperties.cs) (revision 51c6912af6825ed5a1f2ca1054f079ec3bc87d8e) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/VectorLayerPolygonProperties.cs (.../VectorLayerPolygonProperties.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -67,7 +67,7 @@ } catch (CoordinateTransformException e) { - var message = string.Format(Resources.VectorLayerPolygonProperties_CoordinateSystem_Cannot_convert_map_to_coordinate_system___0_, e.Message); + var message = string.Format(Resources.VectorLayerPolygonProperties_CoordinateSystem_Cannot_convert_map_to_coordinate_system_0_, e.Message); MessageBox.Show(message, Resources.MapProperties_CoordinateSystem_Coordinate_transformation_error, MessageBoxButtons.OK, MessageBoxIcon.Error); } Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.Designer.cs =================================================================== diff -u -r6562ca56583ecdfadc430b33c3dd4d676f7703ef -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.Designer.cs (.../MapLegendView.Designer.cs) (revision 6562ca56583ecdfadc430b33c3dd4d676f7703ef) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.Designer.cs (.../MapLegendView.Designer.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -128,7 +128,7 @@ // // contextMenuLayerOpenAttributeTable // - this.contextMenuLayerOpenAttributeTable.Image = global::Core.Plugins.SharpMapGis.Gui.Properties.Resources.table; + this.contextMenuLayerOpenAttributeTable.Image = global::Core.Plugins.SharpMapGis.Gui.Properties.Resources.Table; this.contextMenuLayerOpenAttributeTable.Name = "contextMenuLayerOpenAttributeTable"; resources.ApplyResources(this.contextMenuLayerOpenAttributeTable, "contextMenuLayerOpenAttributeTable"); this.contextMenuLayerOpenAttributeTable.Click += new System.EventHandler(this.ContextMenuOpenLayerAttributeTableClick); @@ -164,20 +164,20 @@ this.toolStripSeparator6, this.bringForwardToolStripMenuItem, this.sendBackwardToolStripMenuItem}); - this.orderToolStripMenuItem.Image = global::Core.Plugins.SharpMapGis.Gui.Properties.Resources.layers_stack; + this.orderToolStripMenuItem.Image = global::Core.Plugins.SharpMapGis.Gui.Properties.Resources.LayersStack; this.orderToolStripMenuItem.Name = "orderToolStripMenuItem"; resources.ApplyResources(this.orderToolStripMenuItem, "orderToolStripMenuItem"); // // bringToFrontToolStripMenuItem // - this.bringToFrontToolStripMenuItem.Image = global::Core.Plugins.SharpMapGis.Gui.Properties.Resources.layers_stack_arrange; + this.bringToFrontToolStripMenuItem.Image = global::Core.Plugins.SharpMapGis.Gui.Properties.Resources.LayersStackArrange; this.bringToFrontToolStripMenuItem.Name = "bringToFrontToolStripMenuItem"; resources.ApplyResources(this.bringToFrontToolStripMenuItem, "bringToFrontToolStripMenuItem"); this.bringToFrontToolStripMenuItem.Click += new System.EventHandler(this.BringToFrontToolStripMenuItemClick); // // sendToBackToolStripMenuItem // - this.sendToBackToolStripMenuItem.Image = global::Core.Plugins.SharpMapGis.Gui.Properties.Resources.layers_stack_arrange_back; + this.sendToBackToolStripMenuItem.Image = global::Core.Plugins.SharpMapGis.Gui.Properties.Resources.LayersStackArrangeBack; this.sendToBackToolStripMenuItem.Name = "sendToBackToolStripMenuItem"; resources.ApplyResources(this.sendToBackToolStripMenuItem, "sendToBackToolStripMenuItem"); this.sendToBackToolStripMenuItem.Click += new System.EventHandler(this.SendToBackToolStripMenuItemClick); @@ -208,7 +208,7 @@ // // zoomToMapExtentsToolStripMenuItem1 // - this.zoomToMapExtentsToolStripMenuItem1.Image = global::Core.Plugins.SharpMapGis.Gui.Properties.Resources.layers_ungroup; + this.zoomToMapExtentsToolStripMenuItem1.Image = global::Core.Plugins.SharpMapGis.Gui.Properties.Resources.LayersUngroup; this.zoomToMapExtentsToolStripMenuItem1.Name = "zoomToMapExtentsToolStripMenuItem1"; resources.ApplyResources(this.zoomToMapExtentsToolStripMenuItem1, "zoomToMapExtentsToolStripMenuItem1"); // @@ -306,7 +306,7 @@ // // changeCoordinateSystemToolStripMenuItem // - this.changeCoordinateSystemToolStripMenuItem.Image = global::Core.Plugins.SharpMapGis.Gui.Properties.Resources.globe__pencil; + this.changeCoordinateSystemToolStripMenuItem.Image = global::Core.Plugins.SharpMapGis.Gui.Properties.Resources.GlobePencil; this.changeCoordinateSystemToolStripMenuItem.Name = "changeCoordinateSystemToolStripMenuItem"; resources.ApplyResources(this.changeCoordinateSystemToolStripMenuItem, "changeCoordinateSystemToolStripMenuItem"); this.changeCoordinateSystemToolStripMenuItem.Click += new System.EventHandler(this.ChangeCoordinateSystemToolStripMenuItem_Click); Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs =================================================================== diff -u -r6562ca56583ecdfadc430b33c3dd4d676f7703ef -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs (.../VectorLayerAttributeTableView.cs) (revision 6562ca56583ecdfadc430b33c3dd4d676f7703ef) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs (.../VectorLayerAttributeTableView.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -380,7 +380,7 @@ string addAttributeCaption = Resources.VectorLayerAttributeTableView_InitializeDynamicAttributeContextMenu_Add_Attribute; string deleteAttributeCaption = Resources.VectorLayerAttributeTableView_InitializeDynamicAttributeContextMenu_Delete_Attribute; string zoomToItemCaption = Resources.VectorLayerAttributeTableView_InitializeDynamicAttributeContextMenu_Zoom_to_item; - string openViewCaption = Resources.VectorLayerAttributeTableView_InitializeDynamicAttributeContextMenu_Open_view___; + string openViewCaption = Resources.VectorLayerAttributeTableView_InitializeDynamicAttributeContextMenu_Open_view; if (CanAddDeleteAttributes) { @@ -390,7 +390,7 @@ { Name = addAttributeItemName, Text = addAttributeCaption, - Image = Resources.table_add + Image = Resources.TableAdd }; btnAddAttribute.Click += AddAttributeItemClick; btnAddAttribute.Tag = TableView; @@ -413,7 +413,7 @@ { Name = zoomItemName, Text = zoomToItemCaption, - Image = Resources.magnifier__arrow + Image = Resources.MagnifierArrow }; btnzoomToMenuItem.Click += BtnZoomToClick; btnzoomToMenuItem.Tag = TableView; @@ -440,7 +440,7 @@ { var addAttributeItem = new TableViewColumnMenuItem(addAttributeCaption) { - Image = Resources.table_add + Image = Resources.TableAdd }; addAttributeItem.Click += AddAttributeItemClick; TableView.ColumnMenuItems.Add(addAttributeItem); @@ -449,7 +449,7 @@ { var deleteAttributeItem = new TableViewColumnMenuItem(deleteAttributeCaption) { - Image = Resources.table_delete + Image = Resources.TableDelete }; deleteAttributeItem.Showing += DeleteAttributeItemShowing; deleteAttributeItem.Click += DeleteAttributeItemClick; @@ -466,7 +466,7 @@ { var zoomToMenuItem = new TableViewColumnMenuItem(zoomToItemCaption) { - Image = Resources.magnifier__arrow + Image = Resources.MagnifierArrow }; zoomToMenuItem.Click += BtnZoomToClick; TableView.ColumnMenuItems.Add(zoomToMenuItem); Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r555c08c6f506516d96076f33c1d6d4c4217b2a1c -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 555c08c6f506516d96076f33c1d6d4c4217b2a1c) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -63,9 +63,9 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap arrow_circle_double { + public static System.Drawing.Bitmap ArrowCircleDouble { get { - object obj = ResourceManager.GetObject("arrow_circle_double", resourceCulture); + object obj = ResourceManager.GetObject("ArrowCircleDouble", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -119,9 +119,9 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap contrast_low { + public static System.Drawing.Bitmap ContrastLow { get { - object obj = ResourceManager.GetObject("contrast_low", resourceCulture); + object obj = ResourceManager.GetObject("ContrastLow", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -139,9 +139,9 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap crop { + public static System.Drawing.Bitmap Crop { get { - object obj = ResourceManager.GetObject("crop", resourceCulture); + object obj = ResourceManager.GetObject("Crop", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -169,9 +169,9 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap cut { + public static System.Drawing.Bitmap Cut { get { - object obj = ResourceManager.GetObject("cut", resourceCulture); + object obj = ResourceManager.GetObject("Cut", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -189,79 +189,79 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap disabled_operation { + public static System.Drawing.Bitmap DisabledOperation { get { - object obj = ResourceManager.GetObject("disabled_operation", resourceCulture); + object obj = ResourceManager.GetObject("DisabledOperation", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap discretization { + public static System.Drawing.Bitmap Discretization { get { - object obj = ResourceManager.GetObject("discretization", resourceCulture); + object obj = ResourceManager.GetObject("Discretization", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap discretization_empty { + public static System.Drawing.Bitmap Discretization_empty { get { - object obj = ResourceManager.GetObject("discretization_empty", resourceCulture); + object obj = ResourceManager.GetObject("Discretization_empty", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap document_Export1 { + public static System.Drawing.Bitmap DocumentExport { get { - object obj = ResourceManager.GetObject("document_Export1", resourceCulture); + object obj = ResourceManager.GetObject("DocumentExport", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap document_Import1 { + public static System.Drawing.Bitmap DocumentImport { get { - object obj = ResourceManager.GetObject("document_Import1", resourceCulture); + object obj = ResourceManager.GetObject("DocumentImport", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap down { + public static System.Drawing.Bitmap Down { get { - object obj = ResourceManager.GetObject("down", resourceCulture); + object obj = ResourceManager.GetObject("Down", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap eraser { + public static System.Drawing.Bitmap Eraser { get { - object obj = ResourceManager.GetObject("eraser", resourceCulture); + object obj = ResourceManager.GetObject("Eraser", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap exclamation { + public static System.Drawing.Bitmap Exclamation { get { - object obj = ResourceManager.GetObject("exclamation", resourceCulture); + object obj = ResourceManager.GetObject("Exclamation", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -296,9 +296,9 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap folder__plus { + public static System.Drawing.Bitmap FolderPlus { get { - object obj = ResourceManager.GetObject("folder--plus", resourceCulture); + object obj = ResourceManager.GetObject("FolderPlus", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -316,49 +316,49 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap geometries { + public static System.Drawing.Bitmap Geometries { get { - object obj = ResourceManager.GetObject("geometries", resourceCulture); + object obj = ResourceManager.GetObject("Geometries", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap globe__pencil { + public static System.Drawing.Bitmap GlobePencil { get { - object obj = ResourceManager.GetObject("globe__pencil", resourceCulture); + object obj = ResourceManager.GetObject("GlobePencil", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap gradient { + public static System.Drawing.Bitmap Gradient { get { - object obj = ResourceManager.GetObject("gradient", resourceCulture); + object obj = ResourceManager.GetObject("Gradient", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap grid_2d { + public static System.Drawing.Bitmap Grid2d { get { - object obj = ResourceManager.GetObject("grid_2d", resourceCulture); + object obj = ResourceManager.GetObject("Grid2d", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap grid_2d_Invalid { + public static System.Drawing.Bitmap Grid2dInvalid { get { - object obj = ResourceManager.GetObject("grid_2d_Invalid", resourceCulture); + object obj = ResourceManager.GetObject("Grid2dInvalid", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -402,24 +402,14 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap lassoselect { + public static System.Drawing.Bitmap LassoSelect { get { - object obj = ResourceManager.GetObject("lassoselect", resourceCulture); + object obj = ResourceManager.GetObject("LassoSelect", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap layer_select_point { - get { - object obj = ResourceManager.GetObject("layer_select_point", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// /// Looks up a localized string similar to Laag. /// public static string LayerProperties_DisplayName { @@ -449,46 +439,56 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap layers_stack { + public static System.Drawing.Bitmap layerSelectPoint { get { - object obj = ResourceManager.GetObject("layers-stack", resourceCulture); + object obj = ResourceManager.GetObject("layerSelectPoint", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap layers_stack_arrange { + public static System.Drawing.Bitmap LayersStack { get { - object obj = ResourceManager.GetObject("layers-stack-arrange", resourceCulture); + object obj = ResourceManager.GetObject("LayersStack", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap layers_stack_arrange_back { + public static System.Drawing.Bitmap LayersStackArrange { get { - object obj = ResourceManager.GetObject("layers-stack-arrange-back", resourceCulture); + object obj = ResourceManager.GetObject("LayersStackArrange", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap layers_ungroup { + public static System.Drawing.Bitmap LayersStackArrangeBack { get { - object obj = ResourceManager.GetObject("layers_ungroup", resourceCulture); + object obj = ResourceManager.GetObject("LayersStackArrangeBack", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// + public static System.Drawing.Bitmap LayersUngroup { + get { + object obj = ResourceManager.GetObject("LayersUngroup", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// public static System.Drawing.Bitmap LegendIconImage { get { object obj = ResourceManager.GetObject("LegendIconImage", resourceCulture); @@ -607,9 +607,9 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap linetool { + public static System.Drawing.Bitmap LineTool { get { - object obj = ResourceManager.GetObject("linetool", resourceCulture); + object obj = ResourceManager.GetObject("LineTool", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -657,19 +657,19 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap magnifier__arrow { + public static System.Drawing.Bitmap MagnifierArrow { get { - object obj = ResourceManager.GetObject("magnifier__arrow", resourceCulture); + object obj = ResourceManager.GetObject("MagnifierArrow", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap magnifier_history { + public static System.Drawing.Bitmap MagnifierHistory { get { - object obj = ResourceManager.GetObject("magnifier_history", resourceCulture); + object obj = ResourceManager.GetObject("MagnifierHistory", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -685,21 +685,11 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap map__pencil { - get { - object obj = ResourceManager.GetObject("map__pencil", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// /// Looks up a localized string similar to Kan met dit bestand ({0}) geen lagen aanmaken: {1}. /// - public static string MapAddLayerCommand_TryAddLayerFromFile_Cannot_create_layer_s__from_file__0____1_ { + public static string MapAddLayerCommand_TryAddLayerFromFile_Cannot_create_layer_s_from_file_0_1_ { get { - return ResourceManager.GetString("MapAddLayerCommand_TryAddLayerFromFile_Cannot_create_layer_s__from_file__0____1_", resourceCulture); + return ResourceManager.GetString("MapAddLayerCommand_TryAddLayerFromFile_Cannot_create_layer_s_from_file_0_1_", resourceCulture); } } @@ -715,10 +705,10 @@ /// /// Looks up a localized string similar to Kan kaart niet converteren naar geselecteerde coördinatenstelsel: {0}. /// - public static string MapChangeCoordinateSystemCommand_OnExecute_Cannot_convert_map_to_selected_coordinate_system___0_ { + public static string MapChangeCoordinateSystemCommand_OnExecute_Cannot_convert_map_to_selected_coordinate_system_0_ { get { return ResourceManager.GetString("MapChangeCoordinateSystemCommand_OnExecute_Cannot_convert_map_to_selected_coordin" + - "ate_system___0_", resourceCulture); + "ate_system_0_", resourceCulture); } } @@ -742,11 +732,21 @@ } /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap MapPencil { + get { + object obj = ResourceManager.GetObject("MapPencil", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// /// Looks up a localized string similar to Kan de kaart niet converteren naar het coördinatenstelsel: {0}. /// - public static string MapProperties_CoordinateSystem_Cannot_convert_map_to_coordinate_system___0_ { + public static string MapProperties_CoordinateSystem_Cannot_convert_map_to_coordinate_system_0_ { get { - return ResourceManager.GetString("MapProperties_CoordinateSystem_Cannot_convert_map_to_coordinate_system___0_", resourceCulture); + return ResourceManager.GetString("MapProperties_CoordinateSystem_Cannot_convert_map_to_coordinate_system_0_", resourceCulture); } } @@ -816,10 +816,10 @@ /// /// Looks up a localized string similar to Weergegeven breedtegraad-/lengtegraadraster wordt alleen ondersteund als coördinatenstelsel van de kaart niet leeg is. /// - public static string MapProperties_ShowGrid_Showing_latitude___longitude_grid_is_supported_only_when_map_coordinate_system_is_non_empty { + public static string MapProperties_ShowGrid_Showing_latitude_longitude_grid_is_supported_only_when_map_coordinate_system_is_non_empty { get { - return ResourceManager.GetString("MapProperties_ShowGrid_Showing_latitude___longitude_grid_is_supported_only_when_m" + - "ap_coordinate_system_is_non_empty", resourceCulture); + return ResourceManager.GetString("MapProperties_ShowGrid_Showing_latitude_longitude_grid_is_supported_only_when_map" + + "_coordinate_system_is_non_empty", resourceCulture); } } @@ -886,9 +886,9 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap marker { + public static System.Drawing.Bitmap Marker { get { - object obj = ResourceManager.GetObject("marker", resourceCulture); + object obj = ResourceManager.GetObject("Marker", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -936,59 +936,59 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap operation_large { + public static System.Drawing.Bitmap OperationLarge { get { - object obj = ResourceManager.GetObject("operation_large", resourceCulture); + object obj = ResourceManager.GetObject("OperationLarge", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap paintcan { + public static System.Drawing.Bitmap PaintCan { get { - object obj = ResourceManager.GetObject("paintcan", resourceCulture); + object obj = ResourceManager.GetObject("PaintCan", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap pencil_large { + public static System.Drawing.Bitmap PencilLarge { get { - object obj = ResourceManager.GetObject("pencil_large", resourceCulture); + object obj = ResourceManager.GetObject("PencilLarge", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap pencil_ruler { + public static System.Drawing.Bitmap PencilRuler { get { - object obj = ResourceManager.GetObject("pencil_ruler", resourceCulture); + object obj = ResourceManager.GetObject("PencilRuler", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap pipette { + public static System.Drawing.Bitmap Pipette { get { - object obj = ResourceManager.GetObject("pipette", resourceCulture); + object obj = ResourceManager.GetObject("Pipette", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap points { + public static System.Drawing.Bitmap Points { get { - object obj = ResourceManager.GetObject("points", resourceCulture); + object obj = ResourceManager.GetObject("Points", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1149,19 +1149,19 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap polygon { + public static System.Drawing.Bitmap Polygon { get { - object obj = ResourceManager.GetObject("polygon", resourceCulture); + object obj = ResourceManager.GetObject("Polygon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap polygonsetvalue { + public static System.Drawing.Bitmap PolygonSetValue { get { - object obj = ResourceManager.GetObject("polygonsetvalue", resourceCulture); + object obj = ResourceManager.GetObject("PolygonSetValue", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1497,19 +1497,19 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap select { + public static System.Drawing.Bitmap Select { get { - object obj = ResourceManager.GetObject("select", resourceCulture); + object obj = ResourceManager.GetObject("Select", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap selection_select { + public static System.Drawing.Bitmap SelectionSelect { get { - object obj = ResourceManager.GetObject("selection_select", resourceCulture); + object obj = ResourceManager.GetObject("SelectionSelect", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1536,89 +1536,89 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap spatial_operation_output { + public static System.Drawing.Bitmap SpatialOperationOutput { get { - object obj = ResourceManager.GetObject("spatial_operation_output", resourceCulture); + object obj = ResourceManager.GetObject("SpatialOperationOutput", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap spatial_operation_parameter { + public static System.Drawing.Bitmap SpatialOperationParameter { get { - object obj = ResourceManager.GetObject("spatial_operation_parameter", resourceCulture); + object obj = ResourceManager.GetObject("SpatialOperationParameter", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap table { + public static System.Drawing.Bitmap Table { get { - object obj = ResourceManager.GetObject("table", resourceCulture); + object obj = ResourceManager.GetObject("Table", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap table_add { + public static System.Drawing.Bitmap TableAdd { get { - object obj = ResourceManager.GetObject("table_add", resourceCulture); + object obj = ResourceManager.GetObject("TableAdd", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap table_delete { + public static System.Drawing.Bitmap TableDelete { get { - object obj = ResourceManager.GetObject("table_delete", resourceCulture); + object obj = ResourceManager.GetObject("TableDelete", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap tag_export { + public static System.Drawing.Bitmap TagExport { get { - object obj = ResourceManager.GetObject("tag_export", resourceCulture); + object obj = ResourceManager.GetObject("TagExport", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap tag_import { + public static System.Drawing.Bitmap TagImport { get { - object obj = ResourceManager.GetObject("tag_import", resourceCulture); + object obj = ResourceManager.GetObject("TagImport", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap tag_minus { + public static System.Drawing.Bitmap TagMinus { get { - object obj = ResourceManager.GetObject("tag_minus", resourceCulture); + object obj = ResourceManager.GetObject("TagMinus", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap theme { + public static System.Drawing.Bitmap Theme { get { - object obj = ResourceManager.GetObject("theme", resourceCulture); + object obj = ResourceManager.GetObject("Theme", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1653,29 +1653,29 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap unstruc { + public static System.Drawing.Bitmap Unstruc { get { - object obj = ResourceManager.GetObject("unstruc", resourceCulture); + object obj = ResourceManager.GetObject("Unstruc", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap unstrucWater { + public static System.Drawing.Bitmap UnstrucWater { get { - object obj = ResourceManager.GetObject("unstrucWater", resourceCulture); + object obj = ResourceManager.GetObject("UnstrucWater", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap up { + public static System.Drawing.Bitmap Up { get { - object obj = ResourceManager.GetObject("up", resourceCulture); + object obj = ResourceManager.GetObject("Up", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1703,9 +1703,9 @@ /// /// Looks up a localized string similar to Weergave openen.... /// - public static string VectorLayerAttributeTableView_InitializeDynamicAttributeContextMenu_Open_view___ { + public static string VectorLayerAttributeTableView_InitializeDynamicAttributeContextMenu_Open_view { get { - return ResourceManager.GetString("VectorLayerAttributeTableView_InitializeDynamicAttributeContextMenu_Open_view___", resourceCulture); + return ResourceManager.GetString("VectorLayerAttributeTableView_InitializeDynamicAttributeContextMenu_Open_view", resourceCulture); } } @@ -1739,10 +1739,10 @@ /// /// Looks up a localized string similar to Kan de kaart niet converteren naar het coördinatenstelsel: {0}. /// - public static string VectorLayerPolygonProperties_CoordinateSystem_Cannot_convert_map_to_coordinate_system___0_ { + public static string VectorLayerPolygonProperties_CoordinateSystem_Cannot_convert_map_to_coordinate_system_0_ { get { return ResourceManager.GetString("VectorLayerPolygonProperties_CoordinateSystem_Cannot_convert_map_to_coordinate_sy" + - "stem___0_", resourceCulture); + "stem_0_", resourceCulture); } } @@ -1902,9 +1902,9 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap zoom { + public static System.Drawing.Bitmap Zoom { get { - object obj = ResourceManager.GetObject("zoom", resourceCulture); + object obj = ResourceManager.GetObject("Zoom", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.resx =================================================================== diff -u -r555c08c6f506516d96076f33c1d6d4c4217b2a1c -r622c20f6fc0b693b67a3e57b2ece939823002c62 --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.resx (.../Resources.resx) (revision 555c08c6f506516d96076f33c1d6d4c4217b2a1c) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.resx (.../Resources.resx) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62) @@ -124,13 +124,13 @@ ..\Resources\feature_coverage_with_time_empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\polygon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\resources\layers-ungroup.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\layers-stack-arrange-back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -142,22 +142,22 @@ Vectorlaag (punt) - + ..\Resources\down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\grid_2d.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\CurvePointSmallRemove.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\pencil_large.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\pencil-ruler.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\map--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -166,10 +166,10 @@ Vectorstijl - + ..\resources\cut.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\layers-stack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,7 +178,7 @@ Lijnstijl voor de omtrek van de vector. - + ..\resources\table_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -199,13 +199,13 @@ Bepaal of u wel of niet de omtrek van het punt wilt laten zien. - + ..\Resources\operation_large.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Omtrekbreedte - + ..\Resources\selection-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -214,7 +214,7 @@ ..\resources\deletehs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -232,7 +232,7 @@ Vorm voor de symbolen van het punt. - + ..\Resources\globe--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -247,16 +247,16 @@ ..\Resources\MapPanZoomImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\gradient.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\MapZoomToExtentsImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\resources\grid_2d_invalid.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -268,13 +268,13 @@ Onderdeelgegevens - + ..\Resources\polygonsetvalue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Groep-laag - + ..\Resources\linetool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -283,7 +283,7 @@ Vector laag (polygoon) - + ..\Resources\paintcan.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -316,7 +316,7 @@ Omtrekstijl - + ..\Resources\crop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -340,7 +340,7 @@ /xsPLTn6+8bszy+7S8B3Lndj3JC7T6FQKH4BrluPod3v93kAAAAASUVORK5CYII= - + ..\Resources\theme.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -352,10 +352,10 @@ ..\Resources\scaleBarIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\resources\tag-export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\resources\tag--minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -373,7 +373,7 @@ Aantal lagen - + ..\Resources\discretization_empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -382,7 +382,7 @@ Kleur van de omtrek van het punt. - + ..\Resources\magnifier--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -394,7 +394,7 @@ Symboolschaal - + ..\Resources\arrow-circle-double.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -403,7 +403,7 @@ Grootte van aanwijs symbolen. - + ..\Resources\geometries.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -412,7 +412,7 @@ De beschikbare gegevens van de feature. - + ..\Resources\zoom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -427,7 +427,7 @@ Naam van de groepslaag. - + ..\Resources\discretization.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -436,7 +436,7 @@ Omtrekkleur - + ..\Resources\points.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -480,7 +480,7 @@ Kleur van de omtrek van de lijn. - + ..\resources\tag-import.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -498,7 +498,7 @@ Tekst van label wordt getoond aan de gebruiker. - + ..\Resources\contrast_low.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -516,7 +516,7 @@ ..\Resources\CurvePointSmall.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\lassoselect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -531,7 +531,7 @@ Puntvorm - + ..\resources\table_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -566,67 +566,67 @@ Lettertype dat gebruikt wordt in de kaartlegenda. - + ..\Resources\up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\layers-stack-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\folder--plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\magnifier-history.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\disabled_operation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\pipette.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\document_Export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\document_Import.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\unstrucWater.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\arrow-turn-270-left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\block--plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\marker.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\unstruc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\resources\layer_select_point.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Kan met dit bestand ({0}) geen lagen aanmaken: {1} Laag aanmaken is mislukt - + Kan kaart niet converteren naar geselecteerde coördinatenstelsel: {0} Coördinatenstelsel van de kaart - + Kan de kaart niet converteren naar het coördinatenstelsel: {0} @@ -647,10 +647,10 @@ Raster weergeven - + Weergegeven breedtegraad-/lengtegraadraster wordt alleen ondersteund als coördinatenstelsel van de kaart niet leeg is - + Kan de kaart niet converteren naar het coördinatenstelsel: {0} @@ -662,7 +662,7 @@ Zoom naar item - + Weergave openen...