[Wesnoth-cvs-commits] wesnoth src/hotkeys.cpp src/preferences.cpp src...

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/04/16 19:35:32

Modified files:
        src            : hotkeys.cpp preferences.cpp 
        src/editor     : editor_dialogs.cpp 
        .              : MANUAL 

Log message:
        Let's standardise on "Full Screen" instead of "Fullscreen".

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/hotkeys.cpp.diff?tr1=1.71&tr2=1.72&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.151&tr2=1.152&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_dialogs.cpp.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/MANUAL.diff?tr1=1.22&tr2=1.23&r1=text&r2=text

Patches:
Index: wesnoth/MANUAL
diff -u wesnoth/MANUAL:1.22 wesnoth/MANUAL:1.23
--- wesnoth/MANUAL:1.22 Thu Nov  4 15:57:32 2004
+++ wesnoth/MANUAL      Sat Apr 16 19:35:32 2005
@@ -1,4 +1,4 @@
-/* $Id: MANUAL,v 1.22 2004/11/04 15:57:32 gakusho Exp $ */
+/* $Id: MANUAL,v 1.23 2005/04/16 19:35:32 ott Exp $ */
 
 THE BATTLE FOR WESNOTH MANUAL
 
@@ -23,7 +23,7 @@
 ctrl-v:         Show enemy moves (where the enemy can move next turn)
 space:          End unit turn and cycle to next unit that has movement left
 l:              Move to leader unit
-ctrl-f:         Toggle fullscreen/windowed mode
+ctrl-f:         Toggle full screen/windowed mode
 ctrl-r:         Recruit unit
 ctrl-shift-r:   Repeat last recruit
 alt-r:          Recall unit
Index: wesnoth/src/editor/editor_dialogs.cpp
diff -u wesnoth/src/editor/editor_dialogs.cpp:1.28 
wesnoth/src/editor/editor_dialogs.cpp:1.29
--- wesnoth/src/editor/editor_dialogs.cpp:1.28  Sat Apr 16 19:27:33 2005
+++ wesnoth/src/editor/editor_dialogs.cpp       Sat Apr 16 19:35:32 2005
@@ -279,7 +279,7 @@
        scroll_slider.set_max(100);
        scroll_slider.set_value(preferences::scroll_speed());
 
-       gui::button fullscreen_button(disp.video(),_("Toggle Fullscreen"),
+       gui::button fullscreen_button(disp.video(),_("Toggle Full Screen"),
                                      gui::button::TYPE_CHECK);
 
        fullscreen_button.set_check(preferences::fullscreen());
Index: wesnoth/src/hotkeys.cpp
diff -u wesnoth/src/hotkeys.cpp:1.71 wesnoth/src/hotkeys.cpp:1.72
--- wesnoth/src/hotkeys.cpp:1.71        Sat Apr 16 19:19:33 2005
+++ wesnoth/src/hotkeys.cpp     Sat Apr 16 19:35:31 2005
@@ -1,4 +1,4 @@
-/* $Id: hotkeys.cpp,v 1.71 2005/04/16 19:19:33 ott Exp $ */
+/* $Id: hotkeys.cpp,v 1.72 2005/04/16 19:35:31 ott Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -50,7 +50,7 @@
        { hotkey::HOTKEY_ZOOM_IN, "zoomin", N_("Zoom In"), false },
        { hotkey::HOTKEY_ZOOM_OUT, "zoomout", N_("Zoom Out"), false },
        { hotkey::HOTKEY_ZOOM_DEFAULT, "zoomdefault", N_("Default Zoom"), false 
},
-       { hotkey::HOTKEY_FULLSCREEN, "fullscreen", N_("Toggle Fullscreen"), 
false },
+       { hotkey::HOTKEY_FULLSCREEN, "fullscreen", N_("Toggle Full Screen"), 
false },
        { hotkey::HOTKEY_ACCELERATED, "accelerated", N_("Accelerated"), false },
        { hotkey::HOTKEY_UNIT_DESCRIPTION, "describeunit", N_("Unit 
Description"), false },
        { hotkey::HOTKEY_RENAME_UNIT, "renameunit", N_("Rename Unit"), false },
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.151 wesnoth/src/preferences.cpp:1.152
--- wesnoth/src/preferences.cpp:1.151   Tue Apr  5 13:37:15 2005
+++ wesnoth/src/preferences.cpp Sat Apr 16 19:35:32 2005
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.151 2005/04/05 13:37:15 ydirson Exp $ */
+/* $Id: preferences.cpp,v 1.152 2005/04/16 19:35:32 ott Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -828,7 +828,7 @@
        : gui::preview_pane(disp.video()),
          music_slider_(disp.video()), sound_slider_(disp.video()),
          scroll_slider_(disp.video()), gamma_slider_(disp.video()),
-         fullscreen_button_(disp.video(), _("Full Screen"), 
gui::button::TYPE_CHECK),
+         fullscreen_button_(disp.video(), _("Toggle Full Screen"), 
gui::button::TYPE_CHECK),
          turbo_button_(disp.video(), _("Accelerated Speed"), 
gui::button::TYPE_CHECK),
          show_ai_moves_button_(disp.video(), _("Skip AI Moves"), 
gui::button::TYPE_CHECK),
          show_grid_button_(disp.video(), _("Show Grid"), 
gui::button::TYPE_CHECK),