diff options
author | DarkByt31 <avihs.29@gmail.com> | 2019-04-22 15:10:05 +0530 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-24 10:30:37 +0200 |
commit | 6673724ab346f09eb8d403064c56ddca44c89090 (patch) | |
tree | 0869706bf0399a474c7e1455672c0a36b09d3d4e | |
parent | cfbb223d5666cb803539ac98918ff39b27efc6e7 (diff) |
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: Mike Kaganski <mike.kaganski@collabora.com>
-rw-r--r-- | dbaccess/inc/strings.hrc | 2 | ||||
-rw-r--r-- | filter/source/svg/presentation_engine.js | 6 | ||||
-rw-r--r-- | svx/uiconfig/ui/docrecoverysavedialog.ui | 2 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/common/strings.hrc | 4 | ||||
-rw-r--r-- | wizards/source/resources/resources_en_US.properties | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc index 1ee472919014..62d7f209c5fe 100644 --- a/dbaccess/inc/strings.hrc +++ b/dbaccess/inc/strings.hrc @@ -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") diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js index 186a278cfacd..87f4dc162b0e 100644 --- a/filter/source/svg/presentation_engine.js +++ b/filter/source/svg/presentation_engine.js @@ -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(); diff --git a/svx/uiconfig/ui/docrecoverysavedialog.ui b/svx/uiconfig/ui/docrecoverysavedialog.ui index 3025ac4ef406..6e19568a747d 100644 --- a/svx/uiconfig/ui/docrecoverysavedialog.ui +++ b/svx/uiconfig/ui/docrecoverysavedialog.ui @@ -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> diff --git a/wizards/com/sun/star/wizards/common/strings.hrc b/wizards/com/sun/star/wizards/common/strings.hrc index 9ae4c315c781..5949fae37ea1 100644 --- a/wizards/com/sun/star/wizards/common/strings.hrc +++ b/wizards/com/sun/star/wizards/common/strings.hrc @@ -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") diff --git a/wizards/source/resources/resources_en_US.properties b/wizards/source/resources/resources_en_US.properties index 53148ef4503c..b87e6aaa7d27 100644 --- a/wizards/source/resources/resources_en_US.properties +++ b/wizards/source/resources/resources_en_US.properties @@ -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. |