Skip to content

Commit dd0668f

Browse files
sweiland-openrailssweiland-openrails
committed
Variable name "Catalog" back to the original name "catalog", to mend automatic merge problems
1 parent 8a57b69 commit dd0668f

File tree

1 file changed

+38
-38
lines changed

1 file changed

+38
-38
lines changed

‎Source/Menu/MainForm.cs‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ internal string RunActivityProgram
107107
public string SelectedSaveFile { get; set; }
108108
public UserAction SelectedAction { get; set; }
109109

110-
GettextResourceManager Catalog = new GettextResourceManager("Menu");
110+
GettextResourceManager catalog = new GettextResourceManager("Menu");
111111

112112
public bool DoWithTask = true;
113113

@@ -144,30 +144,30 @@ void MainForm_Shown(object sender, EventArgs e)
144144
if (!Initialized)
145145
{
146146
var Seasons = new[] {
147-
new KeyedComboBoxItem(0, Catalog.GetString("Spring")),
148-
new KeyedComboBoxItem(1, Catalog.GetString("Summer")),
149-
new KeyedComboBoxItem(2, Catalog.GetString("Autumn")),
150-
new KeyedComboBoxItem(3, Catalog.GetString("Winter")),
147+
new KeyedComboBoxItem(0, catalog.GetString("Spring")),
148+
new KeyedComboBoxItem(1, catalog.GetString("Summer")),
149+
new KeyedComboBoxItem(2, catalog.GetString("Autumn")),
150+
new KeyedComboBoxItem(3, catalog.GetString("Winter")),
151151
};
152152
var Weathers = new[] {
153-
new KeyedComboBoxItem(0, Catalog.GetString("Clear")),
154-
new KeyedComboBoxItem(1, Catalog.GetString("Snow")),
155-
new KeyedComboBoxItem(2, Catalog.GetString("Rain")),
153+
new KeyedComboBoxItem(0, catalog.GetString("Clear")),
154+
new KeyedComboBoxItem(1, catalog.GetString("Snow")),
155+
new KeyedComboBoxItem(2, catalog.GetString("Rain")),
156156
};
157157
var Difficulties = new[] {
158-
Catalog.GetString("Easy"),
159-
Catalog.GetString("Medium"),
160-
Catalog.GetString("Hard"),
158+
catalog.GetString("Easy"),
159+
catalog.GetString("Medium"),
160+
catalog.GetString("Hard"),
161161
"",
162162
};
163163
var Days = new[] {
164-
new KeyedComboBoxItem(0, Catalog.GetString("Monday")),
165-
new KeyedComboBoxItem(1, Catalog.GetString("Tuesday")),
166-
new KeyedComboBoxItem(2, Catalog.GetString("Wednesday")),
167-
new KeyedComboBoxItem(3, Catalog.GetString("Thursday")),
168-
new KeyedComboBoxItem(4, Catalog.GetString("Friday")),
169-
new KeyedComboBoxItem(5, Catalog.GetString("Saturday")),
170-
new KeyedComboBoxItem(6, Catalog.GetString("Sunday")),
164+
new KeyedComboBoxItem(0, catalog.GetString("Monday")),
165+
new KeyedComboBoxItem(1, catalog.GetString("Tuesday")),
166+
new KeyedComboBoxItem(2, catalog.GetString("Wednesday")),
167+
new KeyedComboBoxItem(3, catalog.GetString("Thursday")),
168+
new KeyedComboBoxItem(4, catalog.GetString("Friday")),
169+
new KeyedComboBoxItem(5, catalog.GetString("Saturday")),
170+
new KeyedComboBoxItem(6, catalog.GetString("Sunday")),
171171
};
172172

173173
comboBoxStartSeason.Items.AddRange(Seasons);
@@ -198,7 +198,7 @@ void MainForm_Shown(object sender, EventArgs e)
198198
continue;
199199

200200
// Remove the product name from the tool's name and localise.
201-
var toolName = Catalog.GetString(toolInfo.FileDescription.Replace(Application.ProductName, "").Trim());
201+
var toolName = catalog.GetString(toolInfo.FileDescription.Replace(Application.ProductName, "").Trim());
202202

203203
// Create menu item to execute tool.
204204
tools.Add(new ToolStripMenuItem(toolName, null, (Object sender2, EventArgs e2) =>
@@ -320,9 +320,9 @@ void CheckForUpdate()
320320
}, _ =>
321321
{
322322
if (UpdateManager.LastCheckError != null)
323-
linkLabelUpdate.Text = Catalog.GetString("Update check failed");
323+
linkLabelUpdate.Text = catalog.GetString("Update check failed");
324324
else if (UpdateManager.LastUpdate != null && UpdateManager.LastUpdate.Version != VersionInfo.Version)
325-
linkLabelUpdate.Text = Catalog.GetStringFmt("Update to {0}", UpdateManager.LastUpdate.Version);
325+
linkLabelUpdate.Text = catalog.GetStringFmt("Update to {0}", UpdateManager.LastUpdate.Version);
326326
else
327327
linkLabelUpdate.Text = "";
328328
linkLabelUpdate.Enabled = true;
@@ -350,7 +350,7 @@ void LoadLanguage()
350350
catch { }
351351
}
352352

353-
Localizer.Localize(this, Catalog);
353+
Localizer.Localize(this, catalog);
354354
}
355355

356356
void RestartMenu()
@@ -508,7 +508,7 @@ bool CheckUserName(string text)
508508
string tmp = text;
509509
if (tmp.Length < 4 || tmp.Length > 10 || tmp.Contains("\"") || tmp.Contains("\'") || tmp.Contains(" ") || tmp.Contains("-") || Char.IsDigit(tmp, 0))
510510
{
511-
MessageBox.Show(Catalog.GetString("User name must be 4-10 characters long, cannot contain space, ', \" or - and must not start with a digit."), Application.ProductName);
511+
MessageBox.Show(catalog.GetString("User name must be 4-10 characters long, cannot contain space, ', \" or - and must not start with a digit."), Application.ProductName);
512512
return false;
513513
}
514514
return true;
@@ -521,15 +521,15 @@ void linkLabelUpdate_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
521521
{
522522
if (UpdateManager.LastCheckError != null)
523523
{
524-
MessageBox.Show(Catalog.GetStringFmt("The update check failed due to an error:\n\n{0}", UpdateManager.LastCheckError), Application.ProductName);
524+
MessageBox.Show(catalog.GetStringFmt("The update check failed due to an error:\n\n{0}", UpdateManager.LastCheckError), Application.ProductName);
525525
return;
526526
}
527527

528528
UpdateManager.Update();
529529

530530
if (UpdateManager.LastUpdateError != null)
531531
{
532-
MessageBox.Show(Catalog.GetStringFmt("The update failed due to an error:\n\n{0}", UpdateManager.LastUpdateError), Application.ProductName);
532+
MessageBox.Show(catalog.GetStringFmt("The update failed due to an error:\n\n{0}", UpdateManager.LastUpdateError), Application.ProductName);
533533
return;
534534
}
535535
}
@@ -1175,48 +1175,48 @@ void ShowDetails()
11751175
Win32.LockWindowUpdate(Handle);
11761176
ClearDetails();
11771177
if (SelectedRoute != null && SelectedRoute.Description != null)
1178-
ShowDetail(Catalog.GetStringFmt("Route: {0}", SelectedRoute.Name), SelectedRoute.Description.Split('\n'));
1178+
ShowDetail(catalog.GetStringFmt("Route: {0}", SelectedRoute.Name), SelectedRoute.Description.Split('\n'));
11791179

11801180
if (radioButtonModeActivity.Checked)
11811181
{
11821182
if (SelectedConsist != null && SelectedConsist.Locomotive != null && SelectedConsist.Locomotive.Description != null)
11831183
{
1184-
ShowDetail(Catalog.GetStringFmt("Locomotive: {0}", SelectedConsist.Locomotive.Name), SelectedConsist.Locomotive.Description.Split('\n'));
1184+
ShowDetail(catalog.GetStringFmt("Locomotive: {0}", SelectedConsist.Locomotive.Name), SelectedConsist.Locomotive.Description.Split('\n'));
11851185
}
11861186
if (SelectedActivity != null && SelectedActivity.Description != null)
11871187
{
1188-
ShowDetail(Catalog.GetStringFmt("Activity: {0}", SelectedActivity.Name), SelectedActivity.Description.Split('\n'));
1189-
ShowDetail(Catalog.GetString("Activity Briefing"), SelectedActivity.Briefing.Split('\n'));
1188+
ShowDetail(catalog.GetStringFmt("Activity: {0}", SelectedActivity.Name), SelectedActivity.Description.Split('\n'));
1189+
ShowDetail(catalog.GetString("Activity Briefing"), SelectedActivity.Briefing.Split('\n'));
11901190
}
11911191
else if (SelectedPath != null)
11921192
{
1193-
ShowDetail(Catalog.GetStringFmt("Path: {0}", SelectedPath.Name), new[] {
1194-
Catalog.GetStringFmt("Starting at: {0}", SelectedPath.Start),
1195-
Catalog.GetStringFmt("Heading to: {0}", SelectedPath.End)
1193+
ShowDetail(catalog.GetStringFmt("Path: {0}", SelectedPath.Name), new[] {
1194+
catalog.GetStringFmt("Starting at: {0}", SelectedPath.Start),
1195+
catalog.GetStringFmt("Heading to: {0}", SelectedPath.End)
11961196
});
11971197
}
11981198
}
11991199
if (radioButtonModeTimetable.Checked)
12001200
{
12011201
if (SelectedTimetableSet != null)
1202-
ShowDetail(Catalog.GetStringFmt("Timetable set: {0}", SelectedTimetableSet), new string[0]);
1202+
ShowDetail(catalog.GetStringFmt("Timetable set: {0}", SelectedTimetableSet), new string[0]);
12031203
// Description not shown as no description is available for a timetable set.
12041204

12051205
if (SelectedTimetable != null)
1206-
ShowDetail(Catalog.GetStringFmt("Timetable: {0}", SelectedTimetable), SelectedTimetable.Briefing.Split('\n'));
1206+
ShowDetail(catalog.GetStringFmt("Timetable: {0}", SelectedTimetable), SelectedTimetable.Briefing.Split('\n'));
12071207

12081208
if (SelectedTimetableTrain != null)
12091209
{
1210-
ShowDetail(Catalog.GetStringFmt("Train: {0}", SelectedTimetableTrain), HideStartParameters(SelectedTimetableTrain.ToInfo()));
1210+
ShowDetail(catalog.GetStringFmt("Train: {0}", SelectedTimetableTrain), HideStartParameters(SelectedTimetableTrain.ToInfo()));
12111211

12121212
if (SelectedTimetableConsist != null)
12131213
{
1214-
ShowDetail(Catalog.GetStringFmt("Consist: {0}", SelectedTimetableConsist.Name), new string[0]);
1214+
ShowDetail(catalog.GetStringFmt("Consist: {0}", SelectedTimetableConsist.Name), new string[0]);
12151215
if (SelectedTimetableConsist.Locomotive != null && SelectedTimetableConsist.Locomotive.Description != null)
1216-
ShowDetail(Catalog.GetStringFmt("Locomotive: {0}", SelectedTimetableConsist.Locomotive.Name), SelectedTimetableConsist.Locomotive.Description.Split('\n'));
1216+
ShowDetail(catalog.GetStringFmt("Locomotive: {0}", SelectedTimetableConsist.Locomotive.Name), SelectedTimetableConsist.Locomotive.Description.Split('\n'));
12171217
}
12181218
if (SelectedTimetablePath != null)
1219-
ShowDetail(Catalog.GetStringFmt("Path: {0}", SelectedTimetablePath.Name), SelectedTimetablePath.ToInfo());
1219+
ShowDetail(catalog.GetStringFmt("Path: {0}", SelectedTimetablePath.Name), SelectedTimetablePath.ToInfo());
12201220
}
12211221
}
12221222

0 commit comments

Comments
 (0)