Use "overwrite" instead of "over-write"

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18695 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2007-06-07 07:50:27 +00:00
parent 3fa2f90800
commit 4573c7f2ab
3 changed files with 12 additions and 12 deletions

View File

@ -80,11 +80,11 @@ int checkOverwrite(FileName const & filename)
{
if (fs::exists(filename.toFilesystemEncoding())) {
docstring text = bformat(_("The file %1$s already exists.\n\n"
"Do you want to over-write that file?"),
"Do you want to overwrite that file?"),
makeDisplayPath(filename.absFilename()));
return Alert::prompt(_("Over-write file?"),
return Alert::prompt(_("Overwrite file?"),
text, 0, 2,
_("&Over-write"), _("Over-write &all"),
_("&Overwrite"), _("Overwrite &all"),
_("&Cancel export"));
}
return 0;

View File

@ -1073,10 +1073,10 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
if (fs::exists(filename.toFilesystemEncoding())) {
docstring text = bformat(
_("The file %1$s already exists.\n\n"
"Do you want to over-write that file?"),
"Do you want to overwrite that file?"),
makeDisplayPath(filename.absFilename()));
if (Alert::prompt(_("Over-write file?"),
text, 0, 1, _("&Over-write"), _("&Cancel")) != 0)
if (Alert::prompt(_("Overwrite file?"),
text, 0, 1, _("&Overwrite"), _("&Cancel")) != 0)
break;
}
command += lyxrc.print_to_file
@ -2057,9 +2057,9 @@ void LyXFunc::doImport(string const & argument)
docstring const file = makeDisplayPath(lyxfile.absFilename(), 30);
docstring text = bformat(_("The document %1$s already exists.\n\n"
"Do you want to over-write that document?"), file);
int const ret = Alert::prompt(_("Over-write document?"),
text, 0, 1, _("&Over-write"), _("&Cancel"));
"Do you want to overwrite that document?"), file);
int const ret = Alert::prompt(_("Overwrite document?"),
text, 0, 1, _("&Overwrite"), _("&Cancel"));
if (ret == 1) {
lyx_view_->message(_("Canceled."));

View File

@ -165,9 +165,9 @@ bool writeAs(Buffer * buffer, string const & newname)
if (fs::exists(filename.toFilesystemEncoding())) {
docstring const file = makeDisplayPath(fname, 30);
docstring text = bformat(_("The document %1$s already exists.\n\n"
"Do you want to over-write that document?"), file);
int const ret = Alert::prompt(_("Over-write document?"),
text, 0, 1, _("&Over-write"), _("&Cancel"));
"Do you want to overwrite that document?"), file);
int const ret = Alert::prompt(_("Overwrite document?"),
text, 0, 1, _("&Overwrite"), _("&Cancel"));
if (ret == 1)
return false;