Kaydet (Commit) 6673724a authored tarafından DarkByt31's avatar DarkByt31 Kaydeden (comit) Mike Kaganski

tdf#124197 Improve "Unexpected error" user-visible error message wording

Change-Id: I11c2ac4855a5fec2d26255ec3ab14ffe50e0fbbe
Reviewed-on: https://gerrit.libreoffice.org/71066
Tested-by: Jenkins
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst cfbb223d
......@@ -338,7 +338,7 @@
#define STR_RSC_CHARSETS NC_("STR_RSC_CHARSETS", "System")
#define STR_ERROR_DURING_CREATION NC_("STR_ERROR_DURING_CREATION", "Error during creation")
#define STR_UNEXPECTED_ERROR NC_("STR_UNEXPECTED_ERROR", "An unexpected error occurred. The operation could not be performed.")
#define STR_UNEXPECTED_ERROR NC_("STR_UNEXPECTED_ERROR", "An error occurred. The operation could not be performed.")
#define STR_COULDNOTOPEN_LINKEDDOC NC_("STR_COULDNOTOPEN_LINKEDDOC", "The document \"$file$\" could not be opened.")
#define STR_MISSING_TABLES_XDROP NC_("STR_MISSING_TABLES_XDROP", "The table cannot be deleted because the database connection does not support this.")
#define STR_BUTTON_TEXT_ALL NC_("STR_BUTTON_TEXT_ALL", "~All")
......
......@@ -6489,9 +6489,9 @@ function init()
}
}
function presentationEngineStop()
function presentationEngineStop(message)
{
alert( 'We are sorry! An unexpected error occurred.\nThe presentation engine will be stopped' );
alert( message + '\nThe presentation engine will be stopped' );
document.onkeydown = null;
document.onkeypress = null;
document.onclick = null;
......@@ -6502,7 +6502,7 @@ function assert( condition, message )
{
if (!condition)
{
presentationEngineStop();
presentationEngineStop( message );
if (typeof console == 'object')
// eslint-disable-next-line no-console
console.trace();
......
......@@ -73,7 +73,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="docrecoverysavedialog|label1">Due to an unexpected error, %PRODUCTNAME crashed. All the files you were working on will now be saved. The next time %PRODUCTNAME is launched, your files will be recovered automatically.</property>
<property name="label" translatable="yes" context="docrecoverysavedialog|label1">Due to an error, %PRODUCTNAME crashed. All the files you were working on will now be saved. The next time %PRODUCTNAME is launched, your files will be recovered automatically.</property>
<property name="wrap">True</property>
<property name="width_chars">70</property>
<property name="max_width_chars">70</property>
......
......@@ -261,7 +261,7 @@ RID_AGENDAWIZARDDIALOG_START_39 = NC_("RID_AGENDAWIZARDDIALOG_START_39", "
RID_AGENDAWIZARDDIALOG_START_40 = NC_("RID_AGENDAWIZARDDIALOG_START_40", "Page design:")
RID_AGENDAWIZARDDIALOG_START_41 = NC_("RID_AGENDAWIZARDDIALOG_START_41", "myAgendaTemplate.stw")
RID_AGENDAWIZARDDIALOG_START_42 = NC_("RID_AGENDAWIZARDDIALOG_START_42", "My Agenda Template")
RID_AGENDAWIZARDDIALOG_START_43 = NC_("RID_AGENDAWIZARDDIALOG_START_43", "An unexpected error occurred while saving the agenda template.")
RID_AGENDAWIZARDDIALOG_START_43 = NC_("RID_AGENDAWIZARDDIALOG_START_43", "An error occurred while saving the agenda template.")
RID_AGENDAWIZARDDIALOG_START_44 = NC_("RID_AGENDAWIZARDDIALOG_START_44", "Name")
RID_AGENDAWIZARDDIALOG_START_45 = NC_("RID_AGENDAWIZARDDIALOG_START_45", "Date")
RID_AGENDAWIZARDDIALOG_START_46 = NC_("RID_AGENDAWIZARDDIALOG_START_46", "Time")
......@@ -273,7 +273,7 @@ RID_AGENDAWIZARDDIALOG_START_52 = NC_("RID_AGENDAWIZARDDIALOG_START_52", "
RID_AGENDAWIZARDDIALOG_START_53 = NC_("RID_AGENDAWIZARDDIALOG_START_53", "Names")
RID_AGENDAWIZARDDIALOG_START_54 = NC_("RID_AGENDAWIZARDDIALOG_START_54", "Agenda Items")
RID_AGENDAWIZARDDIALOG_START_55 = NC_("RID_AGENDAWIZARDDIALOG_START_55", "Name and Location")
RID_AGENDAWIZARDDIALOG_START_56 = NC_("RID_AGENDAWIZARDDIALOG_START_56", "An unexpected error occurred while opening the agenda template.")
RID_AGENDAWIZARDDIALOG_START_56 = NC_("RID_AGENDAWIZARDDIALOG_START_56", "An error occurred while opening the agenda template.")
RID_AGENDAWIZARDDIALOG_START_57 = NC_("RID_AGENDAWIZARDDIALOG_START_57", "Type of meeting")
RID_AGENDAWIZARDDIALOG_START_58 = NC_("RID_AGENDAWIZARDDIALOG_START_58", "Please bring")
RID_AGENDAWIZARDDIALOG_START_59 = NC_("RID_AGENDAWIZARDDIALOG_START_59", "Please read")
......
......@@ -546,7 +546,7 @@ FileExists=The '<1>' file already exists.<CR>Do you want to overwrite it?
MorePathsError3=Directories do not exist
ConvertError1=Do you really want to terminate conversion at this point?
ConvertError2=Cancel Wizard
RTErrorDesc=An unexpected error has occurred in the wizard.
RTErrorDesc=An error has occurred in the wizard.
RTErrorHeader=Error
OverwriteallFiles=Do you want to overwrite documents without being asked?
ReeditMacro=Document macro has to be revised.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment