Author: cazfi
Date: Mon Jan 2 20:10:47 2017
New Revision: 34775
URL: http://svn.gna.org/viewcvs/freeciv?rev=34775&view=rev
Log:
Removed unused descriptions for gtk2-client options.
See patch #7624
Modified:
trunk/client/options.c
Modified: trunk/client/options.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=34775&r1=34774&r2=34775&view=diff
==============================================================================
--- trunk/client/options.c (original)
+++ trunk/client/options.c Mon Jan 2 20:10:47 2017
@@ -1917,14 +1917,9 @@
N_("The chat log file"),
N_("The name of the chat log file."),
COC_INTERFACE, GUI_STUB, GUI_DEFAULT_CHAT_LOGFILE, NULL, 0),
- /* gui_gtk2/3/4_default_theme_name and gui_sdl/2_default_theme_name are
+ /* gui_gtk3/4_default_theme_name and gui_sdl2_default_theme_name are
* different settings to avoid client crash after loading the
* style for the other gui. Keeps 5 different options! */
- GEN_STR_LIST_OPTION(gui_gtk2_default_theme_name, N_("Theme"),
- N_("By changing this option you change the "
- "active theme."),
- COC_GRAPHICS, GUI_GTK2, FC_GTK2_DEFAULT_THEME_NAME,
- get_themes_list, theme_reread_callback, 0),
GEN_STR_LIST_OPTION(gui_gtk3_default_theme_name, N_("Theme"),
N_("By changing this option you change the "
"active theme."),
@@ -2412,217 +2407,103 @@
"be appended."),
COC_MAPIMG, GUI_STUB, GUI_DEFAULT_MAPIMG_FILENAME, NULL, 0),
- /* gui-gtk-2.0 client specific options. */
- GEN_BOOL_OPTION(gui_gtk2_fullscreen, N_("Fullscreen"),
- N_("If this option is set the client will use the "
- "whole screen area for drawing."),
+ /* gui-gtk-2.0 client specific options.
+ * These are still kept just so users can migrate them to gtk3-client */
+ GEN_BOOL_OPTION(gui_gtk2_fullscreen, NULL, NULL,
COC_INTERFACE, GUI_GTK2, FALSE, NULL),
- GEN_BOOL_OPTION(gui_gtk2_map_scrollbars, N_("Show map scrollbars"),
- N_("Disable this option to hide the scrollbars on the "
- "map view."),
+ GEN_BOOL_OPTION(gui_gtk2_map_scrollbars, NULL, NULL,
COC_INTERFACE, GUI_GTK2, FALSE, NULL),
- GEN_BOOL_OPTION(gui_gtk2_dialogs_on_top, N_("Keep dialogs on top"),
- N_("If this option is set then dialog windows will always "
- "remain in front of the main Freeciv window. "
- "Disabling this has no effect in fullscreen mode."),
+ GEN_BOOL_OPTION(gui_gtk2_dialogs_on_top, NULL, NULL,
COC_INTERFACE, GUI_GTK2, TRUE, NULL),
- GEN_BOOL_OPTION(gui_gtk2_show_task_icons, N_("Show worklist task icons"),
- N_("Disabling this will turn off the unit and building "
- "icons in the worklist dialog and the production "
- "tab of the city dialog."),
+ GEN_BOOL_OPTION(gui_gtk2_show_task_icons, NULL, NULL,
COC_GRAPHICS, GUI_GTK2, TRUE, NULL),
- GEN_BOOL_OPTION(gui_gtk2_enable_tabs, N_("Enable status report tabs"),
- N_("If this option is enabled then report dialogs will "
- "be shown as separate tabs rather than in popup "
- "dialogs."),
+ GEN_BOOL_OPTION(gui_gtk2_enable_tabs, NULL, NULL,
COC_INTERFACE, GUI_GTK2, TRUE, NULL),
- GEN_BOOL_OPTION(gui_gtk2_better_fog,
- N_("Better fog-of-war drawing"),
- N_("If this is enabled then a better method is used "
- "for drawing fog-of-war. It is not any slower but "
- "will consume about twice as much memory."),
+ GEN_BOOL_OPTION(gui_gtk2_better_fog, NULL, NULL,
COC_GRAPHICS, GUI_GTK2,
TRUE, view_option_changed_callback),
- GEN_BOOL_OPTION(gui_gtk2_show_chat_message_time,
- N_("Show time for each chat message"),
- N_("If this option is enabled then all chat messages "
- "will be prefixed by a time string of the form "
- "[hour:minute:second]."),
+ GEN_BOOL_OPTION(gui_gtk2_show_chat_message_time, NULL, NULL,
COC_INTERFACE, GUI_GTK2, FALSE, NULL),
- GEN_BOOL_OPTION(gui_gtk2_new_messages_go_to_top,
- N_("New message events go to top of list"),
- N_("If this option is enabled, new events in the "
- "message window will appear at the top of the list, "
- "rather than being appended at the bottom."),
+ GEN_BOOL_OPTION(gui_gtk2_new_messages_go_to_top, NULL, NULL,
COC_INTERFACE, GUI_GTK2, FALSE, NULL),
- GEN_BOOL_OPTION(gui_gtk2_show_message_window_buttons,
- N_("Show extra message window buttons"),
- N_("If this option is enabled, there will be two "
- "buttons displayed in the message window for "
- "inspecting a city and going to a location. If this "
- "option is disabled, these buttons will not appear "
- "(you can still double-click with the left mouse "
- "button or right-click on a row to inspect or goto "
- "respectively). This option will only take effect "
- "once the message window is closed and reopened."),
+ GEN_BOOL_OPTION(gui_gtk2_show_message_window_buttons, NULL, NULL,
COC_INTERFACE, GUI_GTK2, TRUE, NULL),
- GEN_BOOL_OPTION(gui_gtk2_metaserver_tab_first,
- N_("Metaserver tab first in network page"),
- N_("If this option is enabled, the metaserver tab will "
- "be the first notebook tab in the network page. This "
- "option requires a restart in order to take effect."),
+ GEN_BOOL_OPTION(gui_gtk2_metaserver_tab_first, NULL, NULL,
COC_NETWORK, GUI_GTK2, FALSE, NULL),
- GEN_BOOL_OPTION(gui_gtk2_allied_chat_only,
- N_("Plain chat messages are sent to allies only"),
- N_("If this option is enabled, then plain messages "
- "typed into the chat entry while the game is "
- "running will only be sent to your allies. "
- "Otherwise plain messages will be sent as "
- "public chat messages. To send a public chat "
- "message with this option enabled, prefix the "
- "message with a single colon ':'. This option "
- "can also be set using a toggle button beside "
- "the chat entry (only visible in multiplayer "
- "games)."),
+ GEN_BOOL_OPTION(gui_gtk2_allied_chat_only, NULL, NULL,
COC_INTERFACE, GUI_GTK2, FALSE, NULL),
- GEN_ENUM_OPTION(gui_gtk2_message_chat_location,
- N_("Messages and Chat reports location"),
- /* TRANS: The strings used in the UI for 'Split' etc are
- * tagged 'gui_gtk2/gtk3/gtk3x_message_chat_location' */
- N_("Controls where the Messages and Chat reports "
- "appear relative to the main view containing the map.\n"
- "'Split' allows all three to be seen simultaneously, "
- "which is best for multiplayer, but requires a large "
- "window to be usable.\n"
- "'Separate' puts Messages and Chat in a notebook "
- "separate from the main view, so that one of them "
- "can always be seen alongside the main view.\n"
- "'Merged' makes the Messages and Chat reports into "
- "tabs alongside the map and other reports; this "
- "allows a larger map view on small screens.\n"
- "This option requires a restart in order to take "
- "effect."), COC_INTERFACE, GUI_GTK2,
+ GEN_ENUM_OPTION(gui_gtk2_message_chat_location, NULL, NULL,
+ COC_INTERFACE, GUI_GTK2,
GUI_GTK_MSGCHAT_MERGED /* Ignored! See options_load(). */,
gui_gtk_message_chat_location_name, NULL),
- GEN_BOOL_OPTION(gui_gtk2_small_display_layout,
- N_("Arrange widgets for small displays"),
- N_("If this option is enabled, widgets in the main "
- "window will be arranged so that they take up the "
- "least amount of total screen space. Specifically, "
- "the left panel containing the overview, player "
- "status, and the unit information box will be "
- "extended over the entire left side of the window. "
- "This option requires a restart in order to take "
- "effect."), COC_INTERFACE, GUI_GTK2, TRUE, NULL),
- GEN_BOOL_OPTION(gui_gtk2_mouse_over_map_focus,
- N_("Mouse over the map widget selects it automatically"),
- N_("If this option is enabled, then the map will be "
- "focused when the mouse hovers over it."),
+ GEN_BOOL_OPTION(gui_gtk2_small_display_layout, NULL, NULL,
+ COC_INTERFACE, GUI_GTK2, TRUE, NULL),
+ GEN_BOOL_OPTION(gui_gtk2_mouse_over_map_focus, NULL, NULL,
COC_INTERFACE, GUI_GTK2, FALSE, NULL),
- GEN_BOOL_OPTION(gui_gtk2_chatline_autocompletion,
- N_("Player or user name autocompletion"),
- N_("If this option is turned on, the tabulation key "
- "will be used in the chatline to complete the word you "
- "are typing with the name of a player or a user."),
+ GEN_BOOL_OPTION(gui_gtk2_chatline_autocompletion, NULL, NULL,
COC_INTERFACE, GUI_GTK2, TRUE, NULL),
- GEN_INT_OPTION(gui_gtk2_citydlg_xsize,
- N_("Width of the city dialog"),
- N_("This value is only used if the width of the city "
- "dialog is saved."),
+ GEN_INT_OPTION(gui_gtk2_citydlg_xsize, NULL, NULL,
COC_INTERFACE, GUI_GTK2, GUI_GTK2_CITYDLG_DEFAULT_XSIZE,
GUI_GTK2_CITYDLG_MIN_XSIZE, GUI_GTK2_CITYDLG_MAX_XSIZE,
NULL),
- GEN_INT_OPTION(gui_gtk2_citydlg_ysize,
- N_("Height of the city dialog"),
- N_("This value is only used if the height of the city "
- "dialog is saved."),
+ GEN_INT_OPTION(gui_gtk2_citydlg_ysize, NULL, NULL,
COC_INTERFACE, GUI_GTK2, GUI_GTK2_CITYDLG_DEFAULT_YSIZE,
GUI_GTK2_CITYDLG_MIN_YSIZE, GUI_GTK2_CITYDLG_MAX_YSIZE,
NULL),
- GEN_ENUM_OPTION(gui_gtk2_popup_tech_help,
- N_("Popup tech help when gained"),
- N_("Controls if tech help should be opened when "
- "new tech has been gained.\n"
- "'Ruleset' means that behavior suggested by "
- "current ruleset is used."), COC_INTERFACE, GUI_GTK2,
+ GEN_ENUM_OPTION(gui_gtk2_popup_tech_help, NULL, NULL,
+ COC_INTERFACE, GUI_GTK2,
GUI_POPUP_TECH_HELP_RULESET,
gui_popup_tech_help_name, NULL),
GEN_FONT_OPTION(gui_gtk2_font_city_label, "city_label",
- N_("City Label"),
- N_("This font is used to display the city labels on city "
- "dialogs."),
+ NULL, NULL,
COC_FONT, GUI_GTK2,
"Monospace 8", font_changed_callback),
GEN_FONT_OPTION(gui_gtk2_font_notify_label, "notify_label",
- N_("Notify Label"),
- N_("This font is used to display server reports such "
- "as the demographic report or historian publications."),
+ NULL, NULL,
COC_FONT, GUI_GTK2,
"Monospace Bold 9", font_changed_callback),
GEN_FONT_OPTION(gui_gtk2_font_spaceship_label, "spaceship_label",
- N_("Spaceship Label"),
- N_("This font is used to display the spaceship widgets."),
+ NULL, NULL,
COC_FONT, GUI_GTK2,
"Monospace 8", font_changed_callback),
GEN_FONT_OPTION(gui_gtk2_font_help_label, "help_label",
- N_("Help Label"),
- N_("This font is used to display the help headers in the "
- "help window."),
+ NULL, NULL,
COC_FONT, GUI_GTK2,
"Sans Bold 10", font_changed_callback),
GEN_FONT_OPTION(gui_gtk2_font_help_link, "help_link",
- N_("Help Link"),
- N_("This font is used to display the help links in the "
- "help window."),
+ NULL, NULL,
COC_FONT, GUI_GTK2,
"Sans 9", font_changed_callback),
GEN_FONT_OPTION(gui_gtk2_font_help_text, "help_text",
- N_("Help Text"),
- N_("This font is used to display the help body text in "
- "the help window."),
+ NULL, NULL,
COC_FONT, GUI_GTK2,
"Monospace 8", font_changed_callback),
GEN_FONT_OPTION(gui_gtk2_font_chatline, "chatline",
- N_("Chatline Area"),
- N_("This font is used to display the text in the "
- "chatline area."),
+ NULL, NULL,
COC_FONT, GUI_GTK2,
"Monospace 8", font_changed_callback),
GEN_FONT_OPTION(gui_gtk2_font_beta_label, "beta_label",
- N_("Beta Label"),
- N_("This font is used to display the beta label."),
+ NULL, NULL,
COC_FONT, GUI_GTK2,
"Sans Italic 10", font_changed_callback),
GEN_FONT_OPTION(gui_gtk2_font_small, "small_font",
- N_("Small Font"),
- N_("This font is used for any small font request. For "
- "example, it is used for display the building lists "
- "in the city dialog, the Economy report or the Units "
- "report."),
+ NULL, NULL,
COC_FONT, GUI_GTK2,
"Sans 9", NULL),
GEN_FONT_OPTION(gui_gtk2_font_comment_label, "comment_label",
- N_("Comment Label"),
- N_("This font is used to display comment labels, such as "
- "in the governor page of the city dialogs."),
+ NULL, NULL,
COC_FONT, GUI_GTK2,
"Sans Italic 9", font_changed_callback),
GEN_FONT_OPTION(gui_gtk2_font_city_names, "city_names",
- N_("City Names"),
- N_("This font is used to the display the city names "
- "on the map."),
+ NULL, NULL,
COC_FONT, GUI_GTK2,
"Sans Bold 10", NULL),
GEN_FONT_OPTION(gui_gtk2_font_city_productions, "city_productions",
- N_("City Productions"),
- N_("This font is used to the display the city production "
- "names on the map."),
+ NULL, NULL,
COC_FONT, GUI_GTK2,
"Serif 10", NULL),
GEN_FONT_OPTION(gui_gtk2_font_reqtree_text, "reqtree_text",
- N_("Requirement Tree"),
- N_("This font is used to the display the requirement tree "
- "in the Research report."),
+ NULL, NULL,
COC_FONT, GUI_GTK2,
"Serif 10", NULL),
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
