Fix merge issues
POTFILES.in and xed-window.c required a couple of changes after the status selector PR was merged.
This commit is contained in:
parent
7ce2a750db
commit
0ec63fc00e
|
@ -22,6 +22,8 @@ xed/xed-documents-panel.c
|
|||
xed/xed-encodings-combo-box.c
|
||||
xed/xed-encodings-dialog.c
|
||||
xed/xed-file-chooser-dialog.c
|
||||
xed/xed-highlight-mode-dialog.c
|
||||
xed/xed-highlight-mode-selector.c
|
||||
xed/xed-history-entry.c
|
||||
xed/xed-io-error-info-bar.c
|
||||
xed/xed-message-bus.c
|
||||
|
@ -37,6 +39,9 @@ xed/xed-preferences-dialog.c
|
|||
xed/xed-print-job.c
|
||||
xed/xed-print-preview.c
|
||||
xed/xed-progress-info-bar.c
|
||||
[type: gettext/glade]xed/resources/ui/xed-highlight-mode-dialog.ui
|
||||
[type: gettext/glade]xed/resources/ui/xed-highlight-mode-selector.ui
|
||||
[type: gettext/glade]xed/resources/ui/xed-status-menu-button.ui
|
||||
[type: gettext/glade]xed/resources/ui/xed-encodings-dialog.ui
|
||||
[type: gettext/glade]xed/resources/ui/xed-preferences-dialog.ui
|
||||
[type: gettext/glade]xed/resources/ui/xed-print-preferences.ui
|
||||
|
@ -47,7 +52,7 @@ xed/resources/ui/xed-ui.xml
|
|||
xed/xed-searchbar.c
|
||||
xed/xed-searchbar.c
|
||||
xed/xed-settings.c
|
||||
xed/xed-status-combo-box.c
|
||||
xed/xed-status-menu-button.c
|
||||
xed/xed-statusbar.c
|
||||
xed/xed-statusbar.c
|
||||
xed/xed-tab-label.c
|
||||
|
|
|
@ -1321,11 +1321,11 @@ set_tab_spaces_label (XedWindow *window,
|
|||
{
|
||||
if (use_spaces)
|
||||
{
|
||||
xed_status_combo_box_set_label (XED_STATUS_COMBO_BOX (window->priv->tab_width_combo), _("Spaces"));
|
||||
xed_status_menu_button_set_label (XED_STATUS_MENU_BUTTON (window->priv->tab_width_button), _("Spaces"));
|
||||
}
|
||||
else
|
||||
{
|
||||
xed_status_combo_box_set_label (XED_STATUS_COMBO_BOX (window->priv->tab_width_combo), _("Tabs"));
|
||||
xed_status_menu_button_set_label (XED_STATUS_MENU_BUTTON (window->priv->tab_width_button), _("Tabs"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue