Merge lp:~widelands-dev/widelands/fix-strings into lp:widelands

[Hans Joachim Desserud]

Various stringfixes, and tweaking a couple of strings so the same translation can be applied in multiple places.

(Just marked these while going through untranslated strings)

[SirVer (sirver)]

Looks good to me, but GunChleoc is mistress of strings imho.

review: Approve

[GunChleoc (gunchleoc)]

Yes, I think this looks fine. It would be great to have the kayboad shortcuts as a table, but that would take some programming. Let's merge it like it is for now.

=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc	2014-03-09 18:32:29 +0000
+++ src/editor/editorinteractive.cc	2014-03-11 17:59:00 +0000
@@ -250,7 +250,7 @@
 		UI::WLMessageBox mmb
 		(this,
 		 _("Unsaved Map"),
-		 _("The Map has not been saved, do you really want to quit?"),
+		 _("The map has not been saved, do you really want to quit?"),
 		 UI::WLMessageBox::YESNO);
 		if (mmb.run() == 0)
 			return;

=== modified file 'src/editor/ui_menus/editor_main_menu_save_map.cc'
--- src/editor/ui_menus/editor_main_menu_save_map.cc	2014-03-09 21:33:54 +0000
+++ src/editor/ui_menus/editor_main_menu_save_map.cc	2014-03-11 17:59:00 +0000
@@ -384,10 +384,10 @@
 	//  Check if file exists. If so, show a warning.
 	if (g_fs->FileExists(complete_filename)) {
 		std::string s =
-			(boost::format(_("A File with the name ‘%s’ already exists. Overwrite?"))
+			(boost::format(_("A file with the name ‘%s’ already exists. Overwrite?"))
 				% FileSystem::FS_Filename(filename.c_str())).str();
 		UI::WLMessageBox mbox
-			(&eia(), _("Error Saving Map!!"), s, UI::WLMessageBox::YESNO);
+			(&eia(), _("Error Saving Map!"), s, UI::WLMessageBox::YESNO);
 		if (not mbox.run())
 			return false;
 
@@ -407,7 +407,7 @@
 			 "given:\n");
 		s += e.what();
 		UI::WLMessageBox  mbox
-			(&eia(), _("Error Saving Map!!"), s, UI::WLMessageBox::OK);
+			(&eia(), _("Error Saving Map!"), s, UI::WLMessageBox::OK);
 		mbox.run();
 	}
 	die();

=== modified file 'src/ui_fsmenu/singleplayer.cc'
--- src/ui_fsmenu/singleplayer.cc	2013-07-26 20:19:36 +0000
+++ src/ui_fsmenu/singleplayer.cc	2014-03-11 17:59:00 +0000
@@ -37,7 +37,7 @@
 	title
 		(this,
 		 get_w() / 2, get_h() * 3 / 40,
-		 _("Single Player Menu"), UI::Align_HCenter),
+		 _("Single Player"), UI::Align_HCenter),
 
 // Buttons
 	new_game

=== modified file 'src/wui/game_chat_menu.cc'
--- src/wui/game_chat_menu.cc	2013-07-26 20:19:36 +0000
+++ src/wui/game_chat_menu.cc	2014-03-11 17:59:00 +0000
@@ -34,7 +34,7 @@
 	 UI::UniqueWindow::Registry & registry,
 	 ChatProvider               & chat)
 :
-UI::UniqueWindow(parent, "chat", &registry, 440, 235, _("Chat Menu")),
+UI::UniqueWindow(parent, "chat", &registry, 440, 235, _("Chat")),
 m_chat(this, 5, 5, get_inner_w() - 10, get_inner_h() - 10, chat)
 {
 	if (get_usedefaultpos())

=== modified file 'src/wui/game_main_menu_save_game.cc'
--- src/wui/game_main_menu_save_game.cc	2014-03-09 21:33:54 +0000
+++ src/wui/game_main_menu_save_game.cc	2014-03-11 17:59:00 +0000
@@ -252,7 +252,7 @@
 			 "Reason given:\n");
 		s += error;
 		UI::WLMessageBox mbox
-			(&igbase, _("Save Game Error!!"), s, UI::WLMessageBox::OK);
+			(&igbase, _("Save Game Error!"), s, UI::WLMessageBox::OK);
 		mbox.run();
 	}
 	game.save_handler().set_current_filename(complete_filename);
@@ -264,8 +264,8 @@
 		:
 		UI::WLMessageBox
 			(&parent,
-			 _("Save Game Error!!"),
-			(boost::format(_("A File with the name ‘%s’ already exists. Overwrite?"))
+			 _("Save Game Error!"),
+			(boost::format(_("A file with the name ‘%s’ already exists. Overwrite?"))
 				% FileSystem::FS_Filename(filename.c_str())).str(),
 			 YESNO),
 		m_filename(filename)

=== modified file 'src/wui/game_message_menu.cc'
--- src/wui/game_message_menu.cc	2014-03-03 20:50:30 +0000
+++ src/wui/game_message_menu.cc	2014-03-11 17:59:00 +0000
@@ -43,7 +43,7 @@
 	(Interactive_Player & plr, UI::UniqueWindow::Registry & registry)
 	:
 	UI::UniqueWindow
-		(&plr, "messages", &registry, 580, 375, _("Message Menu: Inbox")),
+		(&plr, "messages", &registry, 580, 375, _("Messages: Inbox")),
 	message_body
 		(this,
 		 5, 150, 570, 220,
@@ -363,14 +363,14 @@
 	switch (mode) {
 	case Inbox:
 		mode = Archive;
-		set_title(_("Message Menu: Archive"));
+		set_title(_("Messages: Archive"));
 		m_archivebtn->set_pic(g_gr->images().get("pics/message_restore.png"));
 		m_archivebtn->set_tooltip(_("Restore selected messages"));
 		m_togglemodebtn->set_title(_("Show Inbox"));
 		break;
 	case Archive:
 		mode = Inbox;
-		set_title(_("Message Menu: Inbox"));
+		set_title(_("Messages: Inbox"));
 		m_archivebtn->set_pic(g_gr->images().get("pics/message_archive.png"));
 		m_archivebtn->set_tooltip(_("Archive selected messages"));
 		m_togglemodebtn->set_title(_("Show Archive"));

=== modified file 'src/wui/game_objectives_menu.cc'
--- src/wui/game_objectives_menu.cc	2013-07-26 20:19:36 +0000
+++ src/wui/game_objectives_menu.cc	2014-03-11 17:59:00 +0000
@@ -41,7 +41,7 @@
 		(&plr, "objectives", &registry,
 		 340,
 		 5 + OBJECTIVE_LIST + 5 + FULL_OBJECTIVE_TEXT + 5 + BUTTON_HEIGHT + 5,
-		 _("Objectives Menu")),
+		 _("Objectives")),
 	list
 		(this,
 		 5, 5,

=== modified file 'txts/editor_readme'
--- txts/editor_readme	2014-02-24 17:11:25 +0000
+++ txts/editor_readme	2014-03-11 17:59:00 +0000
@@ -18,32 +18,32 @@
 _"Keyboard shortcuts"
 "</p>"
 "<p line-spacing=3 font-size=12><br>"
-_"SPACE    Toggles if building spaces are shown"
-"<br>"
-_"C        Toggles census on/off"
-"<br>"
-_"E        Toggles event menu"
-"<br>"
-_"F        Toggles fullscreen"
-"<br>"
-_"H        Toggles main menu"
-"<br>"
-_"M        Toggles minimap"
-"<br>"
-_"P        Toggles player menu"
-"<br>"
-_"T        Toggles tools menu"
-"<br>"
-_"I        Activates information tool"
-"<br>"
-_"CTRL+L   Load Map"
-"<br>"
-_"CTRL+S   Save Map"
+_"SPACE: toggles if building spaces are shown"
+"<br>"
+_"C: toggles census"
+"<br>"
+_"E: toggles event menu"
+"<br>"
+_"F: toggles fullscreen"
+"<br>"
+_"H: toggles main menu"
+"<br>"
+_"M: toggles minimap"
+"<br>"
+_"P: toggles player menu"
+"<br>"
+_"T: toggles tools menu"
+"<br>"
+_"I: activates information tool"
+"<br>"
+_"CTRL+L: load Map"
+"<br>"
+_"CTRL+S: save Map"
 "<br><br>"
-_"1-0      Changes tool size"
-"<br>"
-_"SHIFT    (Hold) Selects first alternative tool while pressed"
-"<br>"
-_"ALT      (Hold) Selects second alternative tool while pressed"
+_"1-0: changes tool size"
+"<br>"
+_"SHIFT (Hold): selects first alternative tool while pressed"
+"<br>"
+_"ALT (Hold): Selects second alternative tool while pressed"
 "<br>"
 "</p></rt>""