From c0dbdf619673c304838e4840511e6771bcbddfa7 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Thu, 23 Apr 2020 14:55:56 +0200 Subject: [PATCH] Bugfix --- Redaction/Clean.xba | 6 +++--- Redaction/Configuration.xba | 2 +- Redaction/Translations.xba | 10 ++++++++-- Redaction/Validation.xba | 2 +- description.xml | 2 +- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Redaction/Clean.xba b/Redaction/Clean.xba index c0cb24f..2ab71c9 100644 --- a/Redaction/Clean.xba +++ b/Redaction/Clean.xba @@ -1,6 +1,6 @@ -Sub mark44 +Sub mark45 End Sub @@ -95,7 +95,7 @@ Private Sub cleanAccordingTo(dialog As Object) statusIndicator.end() saveAndreload() - MsgBox "Чистка завершена." + MsgBox getTranslation(lang,"cleaningFinished") End Sub @@ -145,7 +145,7 @@ Private Sub quietCleaning removeLibs statusIndicator.end() saveAndreload() - MsgBox "Чистка завершена." + MsgBox getTranslation(lang,"cleaningFinished") End Sub Private Sub removeFirstElementPageBreak diff --git a/Redaction/Configuration.xba b/Redaction/Configuration.xba index d1f2ce9..c079437 100644 --- a/Redaction/Configuration.xba +++ b/Redaction/Configuration.xba @@ -176,4 +176,4 @@ End Sub End If getFileURLDialog = "" End Function - + \ No newline at end of file diff --git a/Redaction/Translations.xba b/Redaction/Translations.xba index 0c54fed..215ed22 100644 --- a/Redaction/Translations.xba +++ b/Redaction/Translations.xba @@ -41,6 +41,9 @@ Function getRussian(identifier As String) As String Case "buttonNameToSelectFileWithStyles" getRussian = "Указать файл" Exit Function + Case "cleaningFinished" + getRussian = "Чистка завершена" + Exit Function Case Else getRussian = getEnglish(identifier) End Select @@ -50,10 +53,10 @@ End Function Function getEnglish(identifier As String) As String Select Case identifier Case "noFileWithStylesFound" - getEnglish = "Template with styles wasn't found. You can choose template on your computer. This stage of cleaning will be skipped if no file chosen." + getEnglish = "Template with styles wasn't found. You can choose template on your computer." & chr(10) &" This stage of cleaning will be skipped if no file chosen." Exit Function Case "startQuietCleaningDescription" - getEnglish = "Do you want to start document cleaning?" & chr(10) & "You can choose template with styles to load them in process of the cleaning." + getEnglish = "Do you want to start document cleaning?" & chr(10) & "You can choose template with styles." & chr(10) & "Styles will be loaded in process of cleaning." Exit Function Case "noStylesFileDialogTitle" getEnglish = "Template file not found" @@ -76,6 +79,9 @@ Function getEnglish(identifier As String) As String Case "buttonNameToSelectFileWithStyles" getEnglish = "Select file" Exit Function + Case "cleaningFinished" + getEnglish = "Cleaning is completed" + Exit Function Case Else getEnglish = "No translation" End Select diff --git a/Redaction/Validation.xba b/Redaction/Validation.xba index 31911ec..41ac99c 100644 --- a/Redaction/Validation.xba +++ b/Redaction/Validation.xba @@ -218,7 +218,7 @@ Private Sub printNumberingSymbols(needExtendedInfo) Exit sub Else If resultBad <> "" Then - report = "Маркером в следующих списках нумерации задан некорректный символ"& chr(10) & resultBad + report = "В качестве маркера в следующих списках нумерации задан некорректный символ"& chr(10) & resultBad EndIf If result <> "" Then report = report & "В следующих списках нумерации найдены шрифты "& chr(10)& result diff --git a/description.xml b/description.xml index 21bdb1f..c7d7a93 100644 --- a/description.xml +++ b/description.xml @@ -3,7 +3,7 @@ xmlns:dep="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> - + Cleaning and validation documents for publishing in html and epub with pagination