widelands

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

  1. fix-strings
  2. Merge into trunk
Proposed by Hans Joachim Desserud
Status: Merged
Approved by: GunChleoc
Approved revision: no longer in the source branch.
Merged at revision: 6870
Proposed branch: lp:~widelands-dev/widelands/fix-strings
Merge into: lp:widelands
Diff against target: 194 lines (+39/-39)
8 files modified
src/editor/editorinteractive.cc (+1/-1)
src/editor/ui_menus/editor_main_menu_save_map.cc (+3/-3)
src/ui_fsmenu/singleplayer.cc (+1/-1)
src/wui/game_chat_menu.cc (+1/-1)
src/wui/game_main_menu_save_game.cc (+3/-3)
src/wui/game_message_menu.cc (+3/-3)
src/wui/game_objectives_menu.cc (+1/-1)
txts/editor_readme (+26/-26)
To merge this branch: bzr merge lp:~widelands-dev/widelands/fix-strings
Reviewer Review Type Date Requested Status
SirVer Approve
GunChleoc Pending
Review via email: mp+210465@code.launchpad.net

Description of the change

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)

To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :

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

review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
250 UI::WLMessageBox mmb250 UI::WLMessageBox mmb
251 (this,251 (this,
252 _("Unsaved Map"),252 _("Unsaved Map"),
253 _("The Map has not been saved, do you really want to quit?"),253 _("The map has not been saved, do you really want to quit?"),
254 UI::WLMessageBox::YESNO);254 UI::WLMessageBox::YESNO);
255 if (mmb.run() == 0)255 if (mmb.run() == 0)
256 return;256 return;
257257
=== 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 @@
384 // Check if file exists. If so, show a warning.384 // Check if file exists. If so, show a warning.
385 if (g_fs->FileExists(complete_filename)) {385 if (g_fs->FileExists(complete_filename)) {
386 std::string s =386 std::string s =
387 (boost::format(_("A File with the name ‘%s’ already exists. Overwrite?"))387 (boost::format(_("A file with the name ‘%s’ already exists. Overwrite?"))
388 % FileSystem::FS_Filename(filename.c_str())).str();388 % FileSystem::FS_Filename(filename.c_str())).str();
389 UI::WLMessageBox mbox389 UI::WLMessageBox mbox
390 (&eia(), _("Error Saving Map!!"), s, UI::WLMessageBox::YESNO);390 (&eia(), _("Error Saving Map!"), s, UI::WLMessageBox::YESNO);
391 if (not mbox.run())391 if (not mbox.run())
392 return false;392 return false;
393393
@@ -407,7 +407,7 @@
407 "given:\n");407 "given:\n");
408 s += e.what();408 s += e.what();
409 UI::WLMessageBox mbox409 UI::WLMessageBox mbox
410 (&eia(), _("Error Saving Map!!"), s, UI::WLMessageBox::OK);410 (&eia(), _("Error Saving Map!"), s, UI::WLMessageBox::OK);
411 mbox.run();411 mbox.run();
412 }412 }
413 die();413 die();
414414
=== 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 @@
37 title37 title
38 (this,38 (this,
39 get_w() / 2, get_h() * 3 / 40,39 get_w() / 2, get_h() * 3 / 40,
40 _("Single Player Menu"), UI::Align_HCenter),40 _("Single Player"), UI::Align_HCenter),
4141
42// Buttons42// Buttons
43 new_game43 new_game
4444
=== 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 @@
34 UI::UniqueWindow::Registry & registry,34 UI::UniqueWindow::Registry & registry,
35 ChatProvider & chat)35 ChatProvider & chat)
36:36:
37UI::UniqueWindow(parent, "chat", &registry, 440, 235, _("Chat Menu")),37UI::UniqueWindow(parent, "chat", &registry, 440, 235, _("Chat")),
38m_chat(this, 5, 5, get_inner_w() - 10, get_inner_h() - 10, chat)38m_chat(this, 5, 5, get_inner_w() - 10, get_inner_h() - 10, chat)
39{39{
40 if (get_usedefaultpos())40 if (get_usedefaultpos())
4141
=== 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 @@
252 "Reason given:\n");252 "Reason given:\n");
253 s += error;253 s += error;
254 UI::WLMessageBox mbox254 UI::WLMessageBox mbox
255 (&igbase, _("Save Game Error!!"), s, UI::WLMessageBox::OK);255 (&igbase, _("Save Game Error!"), s, UI::WLMessageBox::OK);
256 mbox.run();256 mbox.run();
257 }257 }
258 game.save_handler().set_current_filename(complete_filename);258 game.save_handler().set_current_filename(complete_filename);
@@ -264,8 +264,8 @@
264 :264 :
265 UI::WLMessageBox265 UI::WLMessageBox
266 (&parent,266 (&parent,
267 _("Save Game Error!!"),267 _("Save Game Error!"),
268 (boost::format(_("A File with the name ‘%s’ already exists. Overwrite?"))268 (boost::format(_("A file with the name ‘%s’ already exists. Overwrite?"))
269 % FileSystem::FS_Filename(filename.c_str())).str(),269 % FileSystem::FS_Filename(filename.c_str())).str(),
270 YESNO),270 YESNO),
271 m_filename(filename)271 m_filename(filename)
272272
=== 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 @@
43 (Interactive_Player & plr, UI::UniqueWindow::Registry & registry)43 (Interactive_Player & plr, UI::UniqueWindow::Registry & registry)
44 :44 :
45 UI::UniqueWindow45 UI::UniqueWindow
46 (&plr, "messages", &registry, 580, 375, _("Message Menu: Inbox")),46 (&plr, "messages", &registry, 580, 375, _("Messages: Inbox")),
47 message_body47 message_body
48 (this,48 (this,
49 5, 150, 570, 220,49 5, 150, 570, 220,
@@ -363,14 +363,14 @@
363 switch (mode) {363 switch (mode) {
364 case Inbox:364 case Inbox:
365 mode = Archive;365 mode = Archive;
366 set_title(_("Message Menu: Archive"));366 set_title(_("Messages: Archive"));
367 m_archivebtn->set_pic(g_gr->images().get("pics/message_restore.png"));367 m_archivebtn->set_pic(g_gr->images().get("pics/message_restore.png"));
368 m_archivebtn->set_tooltip(_("Restore selected messages"));368 m_archivebtn->set_tooltip(_("Restore selected messages"));
369 m_togglemodebtn->set_title(_("Show Inbox"));369 m_togglemodebtn->set_title(_("Show Inbox"));
370 break;370 break;
371 case Archive:371 case Archive:
372 mode = Inbox;372 mode = Inbox;
373 set_title(_("Message Menu: Inbox"));373 set_title(_("Messages: Inbox"));
374 m_archivebtn->set_pic(g_gr->images().get("pics/message_archive.png"));374 m_archivebtn->set_pic(g_gr->images().get("pics/message_archive.png"));
375 m_archivebtn->set_tooltip(_("Archive selected messages"));375 m_archivebtn->set_tooltip(_("Archive selected messages"));
376 m_togglemodebtn->set_title(_("Show Archive"));376 m_togglemodebtn->set_title(_("Show Archive"));
377377
=== 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 @@
41 (&plr, "objectives", &registry,41 (&plr, "objectives", &registry,
42 340,42 340,
43 5 + OBJECTIVE_LIST + 5 + FULL_OBJECTIVE_TEXT + 5 + BUTTON_HEIGHT + 5,43 5 + OBJECTIVE_LIST + 5 + FULL_OBJECTIVE_TEXT + 5 + BUTTON_HEIGHT + 5,
44 _("Objectives Menu")),44 _("Objectives")),
45 list45 list
46 (this,46 (this,
47 5, 5,47 5, 5,
4848
=== 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 @@
18_"Keyboard shortcuts"18_"Keyboard shortcuts"
19"</p>"19"</p>"
20"<p line-spacing=3 font-size=12><br>"20"<p line-spacing=3 font-size=12><br>"
21_"SPACE Toggles if building spaces are shown"21_"SPACE: toggles if building spaces are shown"
22"<br>"22"<br>"
23_"C Toggles census on/off"23_"C: toggles census"
24"<br>"24"<br>"
25_"E Toggles event menu"25_"E: toggles event menu"
26"<br>"26"<br>"
27_"F Toggles fullscreen"27_"F: toggles fullscreen"
28"<br>"28"<br>"
29_"H Toggles main menu"29_"H: toggles main menu"
30"<br>"30"<br>"
31_"M Toggles minimap"31_"M: toggles minimap"
32"<br>"32"<br>"
33_"P Toggles player menu"33_"P: toggles player menu"
34"<br>"34"<br>"
35_"T Toggles tools menu"35_"T: toggles tools menu"
36"<br>"36"<br>"
37_"I Activates information tool"37_"I: activates information tool"
38"<br>"38"<br>"
39_"CTRL+L Load Map"39_"CTRL+L: load Map"
40"<br>"40"<br>"
41_"CTRL+S Save Map"41_"CTRL+S: save Map"
42"<br><br>"42"<br><br>"
43_"1-0 Changes tool size"43_"1-0: changes tool size"
44"<br>"44"<br>"
45_"SHIFT (Hold) Selects first alternative tool while pressed"45_"SHIFT (Hold): selects first alternative tool while pressed"
46"<br>"46"<br>"
47_"ALT (Hold) Selects second alternative tool while pressed"47_"ALT (Hold): Selects second alternative tool while pressed"
48"<br>"48"<br>"
49"</p></rt>""49"</p></rt>""

Subscribers

People subscribed via source and target branches

to status/vote changes: