diff options
| author | Daniel Hartwig <mandyke@gmail.com> | 2012-01-18 16:56:39 +0800 |
|---|---|---|
| committer | Daniel Hartwig <mandyke@gmail.com> | 2012-01-18 16:56:39 +0800 |
| commit | 54374fd2dd93f9344e732ac4718f30e2ffda05f0 (patch) | |
| tree | b92acea304fced9845ba4906bf675699fc92181a /src | |
| parent | 28ebd48c51a17760b16f82276c66a6e4938ea527 (diff) | |
| download | aptitude-54374fd2dd93f9344e732ac4718f30e2ffda05f0.tar.gz | |
Fix prompt strings.
Closes: #652419
Diffstat (limited to 'src')
| -rw-r--r-- | src/apt_config_treeitems.cc | 2 | ||||
| -rw-r--r-- | src/cmdline/cmdline_prompt.cc | 2 | ||||
| -rw-r--r-- | src/cmdline/cmdline_resolver.cc | 2 | ||||
| -rw-r--r-- | src/menu_text_layout.cc | 4 | ||||
| -rw-r--r-- | src/ui.cc | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/apt_config_treeitems.cc b/src/apt_config_treeitems.cc index c168ec94..d8838782 100644 --- a/src/apt_config_treeitems.cc +++ b/src/apt_config_treeitems.cc @@ -277,7 +277,7 @@ namespace aptitude void edit() { - prompt_string(ssprintf(_("Editing \"%ls\""), description.c_str()), + prompt_string(ssprintf(_("Editing \"%ls\": "), description.c_str()), aptcfg->Find(item, dflt.c_str()), cw::util::arg(sigc::mem_fun(this, &string_config_treeitem::set_text)), NULL, diff --git a/src/cmdline/cmdline_prompt.cc b/src/cmdline/cmdline_prompt.cc index eb94fac9..f650ba4e 100644 --- a/src/cmdline/cmdline_prompt.cc +++ b/src/cmdline/cmdline_prompt.cc @@ -792,7 +792,7 @@ static void cmdline_parse_changelog(string response, const shared_ptr<terminal_m else do_cmdline_changelog(packages, term_metrics); - prompt_string(_("Press Return to continue")); + prompt_string(_("Press Return to continue.")); } static void cmdline_parse_why(string response, diff --git a/src/cmdline/cmdline_resolver.cc b/src/cmdline/cmdline_resolver.cc index 94c0cd03..cf3a3902 100644 --- a/src/cmdline/cmdline_resolver.cc +++ b/src/cmdline/cmdline_resolver.cc @@ -1048,7 +1048,7 @@ cmdline_resolve_deps(pkgset &to_install, string response; // FIXME: translate Y, N if(!assume_yes) - response = prompt_string(_("No solution found within the allotted time. Try harder? [Y/n]")); + response = prompt_string(_("No solution found within the allotted time. Try harder? [Y/n] ")); string::size_type loc=0; while(loc<response.size() && isspace(response[loc])) diff --git a/src/menu_text_layout.cc b/src/menu_text_layout.cc index f3cbb1a6..9b8b34c5 100644 --- a/src/menu_text_layout.cc +++ b/src/menu_text_layout.cc @@ -72,8 +72,8 @@ bool menu_text_layout::find_search_back_enabled() bool menu_text_layout::find_search_back() { - prompt_string(_("Search backwards for: "), - cw::util::transcode(last_search), + prompt_string(W_("Search backwards for: "), + last_search, cw::util::arg(sigc::mem_fun(this, &menu_text_layout::do_find_search_back)), NULL, NULL, @@ -256,7 +256,7 @@ static cw::fragment *apt_error_fragment() // Handles "search" dialogs for pagers static void pager_search(cw::pager &p) { - prompt_string(W_("Search for:"), + prompt_string(W_("Search for: "), p.get_last_search(), cw::util::arg(sigc::mem_fun(p, &cw::pager::search_for)), NULL, @@ -2232,7 +2232,7 @@ static void do_dump_resolver() static cw::editline::history_list history; if(resman != NULL && resman->resolver_exists()) - prompt_string(_("File to which the resolver state should be dumped:"), + prompt_string(_("File to which the resolver state should be dumped: "), "", cw::util::arg(sigc::ptr_fun(handle_dump_resolver_response)), NULL, |