[Libreoffice-commits] core.git: include/sfx2

Seth Chaiklin (via logerrit) logerrit at kemper.freedesktop.org
Tue Dec 15 08:37:50 UTC 2020


 include/sfx2/strings.hrc |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit c9d5fb0bde97fb9cea60773e441f03a69eb589d4
Author:     Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Mon Dec 14 12:50:08 2020 +0100
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Tue Dec 15 09:37:16 2020 +0100

    tdf#138893  improve messages in Template Manager
    
        + add keyboard accelerators to Settings menu commands
        * repair grammatical mistake in "Overwrite" message
        * revise query about loading styles of a modified template
        * change query about category deletion to singluar and
           referring to category
    
    Change-Id: I41934b0e194f00395345a79e8f69fa4fdd0ff04d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107694
    Tested-by: Jenkins
    Reviewed-by: Seth Chaiklin <sdc.blanco at youmail.dk>
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>

diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 794d1a4b7af6..09ddd5e6c415 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -53,12 +53,12 @@
 #define STR_SHARED                              NC_("STR_SHARED", " (shared)")
 #define STR_XMLSEC_ODF12_EXPECTED               NC_("STR_XMLSEC_ODF12_EXPECTED", "The document format version is set to ODF 1.1 (OpenOffice.org 2.x) in Tools-Options-Load/Save-General. Signing documents requires ODF 1.2 (OpenOffice.org 3.x).")
 #define STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN   NC_("STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN", "The document has to be saved before it can be signed. Saving the document removes all present signatures.\nDo you want to save the document?")
-#define STR_QRYTEMPL_MESSAGE                    NC_("STR_QRYTEMPL_MESSAGE", "The template '$(ARG1)' on which this document is based, has been modified. Do you want to update style based formatting according to the modified template?")
+#define STR_QRYTEMPL_MESSAGE                    NC_("STR_QRYTEMPL_MESSAGE", "The template '$(ARG1)' on which this document is based, has been modified. Do you want to update the styles of the current document, using the modified template?")
 #define STR_QRYTEMPL_UPDATE_BTN                 NC_("STR_QRYTEMPL_UPDATE_BTN", "~Update Styles")
 #define STR_QRYTEMPL_KEEP_BTN                   NC_("STR_QRYTEMPL_KEEP_BTN", "~Keep Old Styles")
-#define STR_ACTION_REFRESH                      NC_("STR_ACTION_REFRESH", "Refresh")
-#define STR_CATEGORY_NEW                        NC_("STR_CATEGORY_NEW", "New Category")
-#define STR_CATEGORY_DELETE                     NC_("STR_CATEGORY_DELETE", "Delete Category")
+#define STR_ACTION_REFRESH                      NC_("STR_ACTION_REFRESH", "~Refresh")
+#define STR_CATEGORY_NEW                        NC_("STR_CATEGORY_NEW", "~New Category")
+#define STR_CATEGORY_DELETE                     NC_("STR_CATEGORY_DELETE", "~Delete Category")
 #define STR_CATEGORY_SELECT                     NC_("STR_CATEGORY_SELECT", "Select Category")
 #define STR_MSG_EXPORT_SUCCESS                  NC_("STR_MSG_EXPORT_SUCCESS", "$1 templates successfully exported.")
 #define STR_MSG_QUERY_COPY                      NC_("STR_MSG_QUERY_COPY", "$1 could not be moved to the category \"$2\". Do you want to copy the template instead?")
@@ -70,8 +70,8 @@
 #define STR_MSG_ERROR_IMPORT                    NC_("STR_MSG_ERROR_IMPORT", "Error importing the following templates to $1:\n$2")
 #define STR_MSG_ERROR_DELETE_TEMPLATE           NC_("STR_MSG_ERROR_DELETE_TEMPLATE", "The following templates cannot be deleted:\n$1")
 #define STR_MSG_ERROR_DELETE_FOLDER             NC_("STR_MSG_ERROR_DELETE_FOLDER", "The following folders cannot be deleted:\n$1")
-#define STR_QMSG_SEL_FOLDER_DELETE              NC_("STR_QMSG_SEL_FOLDER_DELETE", "Do you want to delete the selected folders?")
-#define STR_QMSG_TEMPLATE_OVERWRITE             NC_("STR_QMSG_TEMPLATE_OVERWRITE", "A template named $1 already exist in $2. Do you want to overwrite it?")
+#define STR_QMSG_SEL_FOLDER_DELETE              NC_("STR_QMSG_SEL_FOLDER_DELETE", "Do you want to delete the selected category?")
+#define STR_QMSG_TEMPLATE_OVERWRITE             NC_("STR_QMSG_TEMPLATE_OVERWRITE", "A template named $1 already exists in $2. Do you want to overwrite it?")
 #define STR_QMSG_SEL_TEMPLATE_DELETE            NC_("STR_QMSG_SEL_TEMPLATE_DELETE", "Do you want to delete the selected templates?")
 #define STR_QMSG_ERROR_OPENING_FILE             NC_("STR_QMSG_ERROR_OPENING_FILE", "An error occurred during opening the file. This may be caused by incorrect file contents.\n")
 #define STR_QMSG_ERROR_OPENING_FILE_DETAILS     NC_("STR_QMSG_ERROR_OPENING_FILE_DETAILS", "The error details are:\n")


More information about the Libreoffice-commits mailing list