Hopefully fix some i18n bugs (#3565).
git-svn-id: svn://localhost/ardour2/branches/3.0@10833 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
1a36890779
commit
23964284a4
|
@ -226,7 +226,7 @@ ARDOUR_UI::install_actions ()
|
|||
act = ActionManager::register_toggle_action (common_actions, X_("KeepTearoffs"), _("Toolbars when Maximised"), mem_fun (*this, &ARDOUR_UI::toggle_keep_tearoffs));
|
||||
ActionManager::session_sensitive_actions.push_back (act);
|
||||
|
||||
ActionManager::register_toggle_action (common_actions, X_("toggle-mixer"), _("Mixer"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_mixer_window));
|
||||
ActionManager::register_toggle_action (common_actions, X_("toggle-mixer"), S_("Window|Mixer"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_mixer_window));
|
||||
ActionManager::register_toggle_action (common_actions, X_("toggle-mixer-on-top"), _("Mixer on Top"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_mixer_on_top));
|
||||
ActionManager::register_toggle_action (common_actions, X_("ToggleRCOptionsEditor"), _("Preferences"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_rc_options_window));
|
||||
ActionManager::register_toggle_action (common_actions, X_("ToggleSessionOptionsEditor"), _("Properties"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_session_options_window));
|
||||
|
|
|
@ -3172,9 +3172,9 @@ Editor::history_changed ()
|
|||
|
||||
if (undo_action && _session) {
|
||||
if (_session->undo_depth() == 0) {
|
||||
label = _("Undo");
|
||||
label = S_("Command|Undo");
|
||||
} else {
|
||||
label = string_compose(_("Undo (%1)"), _session->next_undo());
|
||||
label = string_compose(S_("Command|Undo (%1)"), _session->next_undo());
|
||||
}
|
||||
undo_action->property_label() = label;
|
||||
}
|
||||
|
|
|
@ -282,7 +282,7 @@ Editor::register_actions ()
|
|||
|
||||
reg_sens (editor_actions, "duplicate-range", _("Duplicate Range"), sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_dialog), false));
|
||||
|
||||
undo_action = reg_sens (editor_actions, "undo", _("Undo"), sigc::bind (sigc::mem_fun(*this, &Editor::undo), 1U));
|
||||
undo_action = reg_sens (editor_actions, "undo", S_("Command|Undo"), sigc::bind (sigc::mem_fun(*this, &Editor::undo), 1U));
|
||||
redo_action = reg_sens (editor_actions, "redo", _("Redo"), sigc::bind (sigc::mem_fun(*this, &Editor::redo), 1U));
|
||||
|
||||
reg_sens (editor_actions, "export-audio", _("Export Audio"), sigc::mem_fun(*this, &Editor::export_audio));
|
||||
|
|
|
@ -34,6 +34,6 @@
|
|||
/** Use this to translate strings that have different meanings in different places.
|
||||
* Text should be of the form Context|Message.
|
||||
*/
|
||||
#define S_(Text) sgettext (PACKAGE, Text)
|
||||
#define S_(Text) PBD::sgettext (PACKAGE, Text)
|
||||
|
||||
#endif // __i18n_h__
|
||||
|
|
|
@ -1800,13 +1800,13 @@ Mixer_UI::update_title ()
|
|||
}
|
||||
|
||||
WindowTitle title (n);
|
||||
title += _("Mixer");
|
||||
title += S_("Window|Mixer");
|
||||
title += Glib::get_application_name ();
|
||||
set_title (title.get_string());
|
||||
|
||||
} else {
|
||||
|
||||
WindowTitle title (X_("Mixer"));
|
||||
WindowTitle title (S_("Window|Mixer"));
|
||||
title += Glib::get_application_name ();
|
||||
set_title (title.get_string());
|
||||
}
|
||||
|
|
|
@ -261,7 +261,7 @@ static const struct {
|
|||
/* Command = Meta
|
||||
Option/Alt = Mod1
|
||||
*/
|
||||
{ "Shift", GDK_SHIFT_MASK },
|
||||
{ "Key|Shift", GDK_SHIFT_MASK },
|
||||
{ "Command", GDK_META_MASK },
|
||||
{ "Control", GDK_CONTROL_MASK },
|
||||
{ "Option", GDK_MOD1_MASK },
|
||||
|
@ -271,7 +271,7 @@ static const struct {
|
|||
{ "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_META_MASK },
|
||||
|
||||
#else
|
||||
{ "Shift", GDK_SHIFT_MASK },
|
||||
{ "Key|Shift", GDK_SHIFT_MASK },
|
||||
{ "Control", GDK_CONTROL_MASK },
|
||||
{ "Alt (Mod1)", GDK_MOD1_MASK },
|
||||
{ "Control-Shift", GDK_CONTROL_MASK|GDK_SHIFT_MASK },
|
||||
|
@ -310,7 +310,7 @@ public:
|
|||
|
||||
for (int x = 0; modifiers[x].name; ++x) {
|
||||
if (modifiers[x].modifier == Keyboard::edit_modifier ()) {
|
||||
_edit_modifier_combo.set_active_text (_(modifiers[x].name));
|
||||
_edit_modifier_combo.set_active_text (S_(modifiers[x].name));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -880,7 +880,7 @@ RCOptionEditor::RCOptionEditor ()
|
|||
add_option (_("Misc"), procs);
|
||||
}
|
||||
|
||||
add_option (_("Misc"), new OptionEditorHeading (_("Undo")));
|
||||
add_option (_("Misc"), new OptionEditorHeading (S_("Options|Undo")));
|
||||
|
||||
add_option (_("Misc"), new UndoOptions (_rc_config));
|
||||
|
||||
|
|
|
@ -608,7 +608,7 @@ SessionMetadataDialog<DataSet>::init_people_data ()
|
|||
ptr = MetadataPtr (new TextMetadataField (&ARDOUR::SessionMetadata::dj_mixer, &ARDOUR::SessionMetadata::set_dj_mixer, _("DJ Mixer")));
|
||||
data_set->add_data_field (ptr);
|
||||
|
||||
ptr = MetadataPtr (new TextMetadataField (&ARDOUR::SessionMetadata::mixer, &ARDOUR::SessionMetadata::set_mixer, _("Mixer")));
|
||||
ptr = MetadataPtr (new TextMetadataField (&ARDOUR::SessionMetadata::mixer, &ARDOUR::SessionMetadata::set_mixer, S_("Metadata|Mixer")));
|
||||
data_set->add_data_field (ptr);
|
||||
}
|
||||
|
||||
|
|
|
@ -129,7 +129,7 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
|
|||
|
||||
table->attach (preserve_formants_button, 1, 3, 3, 4, Gtk::FILL, Gtk::EXPAND, 0, 0);
|
||||
|
||||
add_button (_("Shift"), Gtk::RESPONSE_ACCEPT);
|
||||
add_button (S_("Time|Shift"), Gtk::RESPONSE_ACCEPT);
|
||||
|
||||
upper_button_box.pack_start (*table, false, true);
|
||||
} else {
|
||||
|
|
|
@ -67,10 +67,10 @@ guint Keyboard::button2_modifiers = Keyboard::SecondaryModifier|Keyboard::Level4
|
|||
|
||||
const char* Keyboard::primary_modifier_name() { return _("Command"); }
|
||||
const char* Keyboard::secondary_modifier_name() { return _("Control"); }
|
||||
const char* Keyboard::tertiary_modifier_name() { return _("Shift"); }
|
||||
const char* Keyboard::tertiary_modifier_name() { return S_("Key|Shift"); }
|
||||
const char* Keyboard::level4_modifier_name() { return _("Option"); }
|
||||
const char* Keyboard::copy_modifier_name() { return _("Control"); }
|
||||
const char* Keyboard::rangeselect_modifier_name() { return _("Shift"); }
|
||||
const char* Keyboard::rangeselect_modifier_name() { return S_("Key|Shift"); }
|
||||
|
||||
#else
|
||||
|
||||
|
@ -84,10 +84,10 @@ guint Keyboard::button2_modifiers = 0; /* not used */
|
|||
|
||||
const char* Keyboard::primary_modifier_name() { return _("Control"); }
|
||||
const char* Keyboard::secondary_modifier_name() { return _("Alt"); }
|
||||
const char* Keyboard::tertiary_modifier_name() { return _("Shift"); }
|
||||
const char* Keyboard::tertiary_modifier_name() { return S_("Key|Shift"); }
|
||||
const char* Keyboard::level4_modifier_name() { return _("Meta"); }
|
||||
const char* Keyboard::copy_modifier_name() { return _("Control"); }
|
||||
const char* Keyboard::rangeselect_modifier_name() { return _("Shift"); }
|
||||
const char* Keyboard::rangeselect_modifier_name() { return S_("Key|Shift"); }
|
||||
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user