From 3efdef2224e8f45558464c390f529ec51d8a9552 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sun, 8 Jan 2012 01:05:13 +0000 Subject: [PATCH] Tweak a few strings to make them easier to translate Originally committed to SVN as r6211. --- aegisub/src/command/grid.cpp | 8 ++++---- aegisub/src/ffmpegsource_common.cpp | 11 ++++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/aegisub/src/command/grid.cpp b/aegisub/src/command/grid.cpp index dc813574c..7b2bdd969 100644 --- a/aegisub/src/command/grid.cpp +++ b/aegisub/src/command/grid.cpp @@ -93,10 +93,10 @@ struct grid_tag_cycle_hiding : public Command { tagMode = (tagMode+1)%3; // Show on status bar - wxString message = _("ASS Override Tag mode set to "); - if (tagMode == 0) message += _("show full tags."); - if (tagMode == 1) message += _("simplify tags."); - if (tagMode == 2) message += _("hide tags."); + wxString message; + if (tagMode == 0) message = _("ASS Override Tag mode set to show full tags."); + if (tagMode == 1) message = _("ASS Override Tag mode set to simplify tags."); + if (tagMode == 2) message = _("ASS Override Tag mode set to hide tags."); wxGetApp().frame->StatusTimeout(message,10000); // Set option diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp index 8e8ad7506..f611dd46b 100644 --- a/aegisub/src/ffmpegsource_common.cpp +++ b/aegisub/src/ffmpegsource_common.cpp @@ -141,19 +141,16 @@ std::map FFmpegSourceProvider::GetTracksOfType(FFMS_Indexer *Index int FFmpegSourceProvider::AskForTrackSelection(const std::map &TrackList, FFMS_TrackType Type) { std::vector TrackNumbers; wxArrayString Choices; - wxString TypeName = ""; - if (Type == FFMS_TYPE_VIDEO) - TypeName = _("video"); - else if (Type == FFMS_TYPE_AUDIO) - TypeName = _("audio"); for (std::map::const_iterator i = TrackList.begin(); i != TrackList.end(); i++) { Choices.Add(wxString::Format(_("Track %02d: %s"), i->first, i->second)); TrackNumbers.push_back(i->first); } - int Choice = wxGetSingleChoiceIndex(wxString::Format(_("Multiple %s tracks detected, please choose the one you wish to load:"), TypeName), - wxString::Format(_("Choose %s track"), TypeName), Choices); + int Choice = wxGetSingleChoiceIndex( + Type == FFMS_TYPE_VIDEO ? _("Multiple video tracks detected, please choose the one you wish to load:") : _("Multiple audio tracks detected, please choose the one you wish to load:"), + Type == FFMS_TYPE_VIDEO ? _("Choose video track") : _("Choose audio track"), + Choices); if (Choice < 0) return Choice;