From 909db1202c39b871945ce9f3d96ffee3c9d0ba85 Mon Sep 17 00:00:00 2001 From: Maxim Ganetsky Date: Wed, 6 Sep 2023 19:31:12 +0300 Subject: [PATCH] JCF2: iproved i18n of "Comments" settings page, regenerated translations and updated Russian translation (cherry picked from commit d51e605fddff20e207c08874c15e639ee5577072) --- .../jcf2/IdePlugin/lazarus/jcfuiconsts.pas | 3 +++ .../lazarus/languages/jcfuiconsts.cs.po | 14 ++++++++++++++ .../lazarus/languages/jcfuiconsts.de.po | 15 +++++++++++++++ .../lazarus/languages/jcfuiconsts.es.po | 14 ++++++++++++++ .../lazarus/languages/jcfuiconsts.fr.po | 15 +++++++++++++++ .../lazarus/languages/jcfuiconsts.hu.po | 15 +++++++++++++++ .../lazarus/languages/jcfuiconsts.it.po | 15 +++++++++++++++ .../lazarus/languages/jcfuiconsts.ja.po | 15 +++++++++++++++ .../lazarus/languages/jcfuiconsts.lt.po | 15 +++++++++++++++ .../lazarus/languages/jcfuiconsts.pl.po | 15 +++++++++++++++ .../IdePlugin/lazarus/languages/jcfuiconsts.pot | 14 ++++++++++++++ .../lazarus/languages/jcfuiconsts.pt_BR.po | 15 +++++++++++++++ .../lazarus/languages/jcfuiconsts.ru.po | 16 +++++++++++++++- .../lazarus/languages/jcfuiconsts.uk.po | 15 +++++++++++++++ .../lazarus/languages/jcfuiconsts.zh_CN.po | 15 +++++++++++++++ components/jcf2/Ui/Settings/frComments.pas | 11 +++++++++++ 16 files changed, 221 insertions(+), 1 deletion(-) diff --git a/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas b/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas index 1dde9dd41f..a54e451c68 100644 --- a/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas +++ b/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas @@ -326,6 +326,9 @@ resourcestring lisJEDICodeFormatOfAreYouSureThatYouWantToFormatAllFi = 'JEDI Code Format of' +' %sAre you sure that you want to format all %s files in the project?'; lisJEDICodeFormatAllOpenWindow = 'JEDI Code Format of all open windows?'; + lisImbalancedCommentAct = 'Imbalanced comment action'; + lisErrorAct = 'Error'; + lisWarnAct = 'Warn'; implementation diff --git a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.cs.po b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.cs.po index 515fb3d5f8..4b9ff5418d 100644 --- a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.cs.po +++ b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.cs.po @@ -405,6 +405,7 @@ msgid "%sAt line %s col %s" msgstr "" #: jcfuiconsts.lisederror +msgctxt "jcfuiconsts.lisederror" msgid "Error" msgstr "" @@ -432,6 +433,11 @@ msgstr "" msgid "Type: %s%s" msgstr "" +#: jcfuiconsts.liserroract +msgctxt "jcfuiconsts.liserroract" +msgid "Error" +msgstr "" + #: jcfuiconsts.lisfindreplaceenablefindandreplace msgid "Enable find and replace" msgstr "" @@ -486,6 +492,10 @@ msgstr "" msgid "Version that wrote this file: %s" msgstr "" +#: jcfuiconsts.lisimbalancedcommentact +msgid "Imbalanced comment action" +msgstr "" + #: jcfuiconsts.lisindentblockindentationspaces msgid "Block indentation spaces" msgstr "" @@ -929,6 +939,10 @@ msgstr "" msgid "Uses" msgstr "" +#: jcfuiconsts.liswarnact +msgid "Warn" +msgstr "" + #: jcfuiconsts.liswarningsignoreunusedparametersnamed msgid "&Ignore unused parameters named:" msgstr "" diff --git a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.de.po b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.de.po index f8a6e742bd..e3cf90f227 100644 --- a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.de.po +++ b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.de.po @@ -405,6 +405,7 @@ msgid "%sAt line %s col %s" msgstr "%s in Zeile %s Spalte %s" #: jcfuiconsts.lisederror +msgctxt "jcfuiconsts.lisederror" msgid "Error" msgstr "Fehler" @@ -432,6 +433,12 @@ msgstr "%s in der Nähe von %s" msgid "Type: %s%s" msgstr "" +#: jcfuiconsts.liserroract +#, fuzzy +msgctxt "jcfuiconsts.liserroract" +msgid "Error" +msgstr "Fehler" + #: jcfuiconsts.lisfindreplaceenablefindandreplace msgid "Enable find and replace" msgstr "Suchen und Ersetzen zulassen" @@ -486,6 +493,10 @@ msgstr "" msgid "Version that wrote this file: %s" msgstr "Version, die die Datei geschrieben hat:" +#: jcfuiconsts.lisimbalancedcommentact +msgid "Imbalanced comment action" +msgstr "" + #: jcfuiconsts.lisindentblockindentationspaces msgid "Block indentation spaces" msgstr "Leerzeichen für Blockeinrücking" @@ -935,6 +946,10 @@ msgstr "Ersetzen" msgid "Uses" msgstr "Uses" +#: jcfuiconsts.liswarnact +msgid "Warn" +msgstr "" + #: jcfuiconsts.liswarningsignoreunusedparametersnamed msgid "&Ignore unused parameters named:" msgstr "Ungenutzte Parameter übergehen:" diff --git a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.es.po b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.es.po index 08924076aa..a7a68db305 100644 --- a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.es.po +++ b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.es.po @@ -404,6 +404,7 @@ msgid "%sAt line %s col %s" msgstr "" #: jcfuiconsts.lisederror +msgctxt "jcfuiconsts.lisederror" msgid "Error" msgstr "" @@ -431,6 +432,11 @@ msgstr "" msgid "Type: %s%s" msgstr "" +#: jcfuiconsts.liserroract +msgctxt "jcfuiconsts.liserroract" +msgid "Error" +msgstr "" + #: jcfuiconsts.lisfindreplaceenablefindandreplace msgid "Enable find and replace" msgstr "" @@ -485,6 +491,10 @@ msgstr "" msgid "Version that wrote this file: %s" msgstr "" +#: jcfuiconsts.lisimbalancedcommentact +msgid "Imbalanced comment action" +msgstr "" + #: jcfuiconsts.lisindentblockindentationspaces msgid "Block indentation spaces" msgstr "" @@ -927,6 +937,10 @@ msgstr "" msgid "Uses" msgstr "" +#: jcfuiconsts.liswarnact +msgid "Warn" +msgstr "" + #: jcfuiconsts.liswarningsignoreunusedparametersnamed msgid "&Ignore unused parameters named:" msgstr "" diff --git a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.fr.po b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.fr.po index e0d282731a..738712f073 100644 --- a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.fr.po +++ b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.fr.po @@ -406,6 +406,7 @@ msgid "%sAt line %s col %s" msgstr "%sÀ la ligne %s colonne %s" #: jcfuiconsts.lisederror +msgctxt "jcfuiconsts.lisederror" msgid "Error" msgstr "Erreur" @@ -433,6 +434,12 @@ msgstr "%s près de %s" msgid "Type: %s%s" msgstr "Type : %s%s" +#: jcfuiconsts.liserroract +#, fuzzy +msgctxt "jcfuiconsts.liserroract" +msgid "Error" +msgstr "Erreur" + #: jcfuiconsts.lisfindreplaceenablefindandreplace msgid "Enable find and replace" msgstr "Autoriser la recherche et le remplacement" @@ -487,6 +494,10 @@ msgstr "Le fichier de paramètres est :" msgid "Version that wrote this file: %s" msgstr "Version d'écriture de ce fichier : %s" +#: jcfuiconsts.lisimbalancedcommentact +msgid "Imbalanced comment action" +msgstr "" + #: jcfuiconsts.lisindentblockindentationspaces msgid "Block indentation spaces" msgstr "Espaces de retrait de bloc" @@ -932,6 +943,10 @@ msgstr "Remplacer" msgid "Uses" msgstr "Uses" +#: jcfuiconsts.liswarnact +msgid "Warn" +msgstr "" + #: jcfuiconsts.liswarningsignoreunusedparametersnamed msgid "&Ignore unused parameters named:" msgstr "&Ignorer les paramètres non utilisés nommés :" diff --git a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.hu.po b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.hu.po index 82078b99d6..10667528b2 100644 --- a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.hu.po +++ b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.hu.po @@ -406,6 +406,7 @@ msgid "%sAt line %s col %s" msgstr "%s itt: %s. sor, %s. oszlop" #: jcfuiconsts.lisederror +msgctxt "jcfuiconsts.lisederror" msgid "Error" msgstr "Hiba" @@ -433,6 +434,12 @@ msgstr "%s a következőnél: %s" msgid "Type: %s%s" msgstr "Típus: %s%s" +#: jcfuiconsts.liserroract +#, fuzzy +msgctxt "jcfuiconsts.liserroract" +msgid "Error" +msgstr "Hiba" + #: jcfuiconsts.lisfindreplaceenablefindandreplace msgid "Enable find and replace" msgstr "Keresés és csere engedélyezése" @@ -488,6 +495,10 @@ msgstr "A beállítási fájl:" msgid "Version that wrote this file: %s" msgstr "A fájlt író változat: %s" +#: jcfuiconsts.lisimbalancedcommentact +msgid "Imbalanced comment action" +msgstr "" + #: jcfuiconsts.lisindentblockindentationspaces msgid "Block indentation spaces" msgstr "Blokkbehúzás szóközeinek száma" @@ -933,6 +944,10 @@ msgstr "Csere" msgid "Uses" msgstr "Uses" +#: jcfuiconsts.liswarnact +msgid "Warn" +msgstr "" + #: jcfuiconsts.liswarningsignoreunusedparametersnamed msgid "&Ignore unused parameters named:" msgstr "Figyelmen kívül hagyandó nem használt paraméterek nevei:" diff --git a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.it.po b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.it.po index f53922be43..2fbd5ba100 100644 --- a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.it.po +++ b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.it.po @@ -407,6 +407,7 @@ msgid "%sAt line %s col %s" msgstr "%sAlla riga %s colonna %s" #: jcfuiconsts.lisederror +msgctxt "jcfuiconsts.lisederror" msgid "Error" msgstr "Errore" @@ -434,6 +435,12 @@ msgstr "%s vicino a %s" msgid "Type: %s%s" msgstr "Tipo: %s%s" +#: jcfuiconsts.liserroract +#, fuzzy +msgctxt "jcfuiconsts.liserroract" +msgid "Error" +msgstr "Errore" + #: jcfuiconsts.lisfindreplaceenablefindandreplace msgid "Enable find and replace" msgstr "Abilita trova e sostituisci" @@ -488,6 +495,10 @@ msgstr "" msgid "Version that wrote this file: %s" msgstr "File creato dalla versione %s di questo programma" +#: jcfuiconsts.lisimbalancedcommentact +msgid "Imbalanced comment action" +msgstr "" + #: jcfuiconsts.lisindentblockindentationspaces msgid "Block indentation spaces" msgstr "Spazi di indentazione dei blocchi" @@ -933,6 +944,10 @@ msgstr "Sostituisci" msgid "Uses" msgstr "Usa" +#: jcfuiconsts.liswarnact +msgid "Warn" +msgstr "" + #: jcfuiconsts.liswarningsignoreunusedparametersnamed msgid "&Ignore unused parameters named:" msgstr "&Ignora parametri inutilizzati dal nome:" diff --git a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.ja.po b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.ja.po index ff6ba65dc6..1881ff1a9e 100644 --- a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.ja.po +++ b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.ja.po @@ -406,6 +406,7 @@ msgid "%sAt line %s col %s" msgstr "%s（行 %s、列 %s）" #: jcfuiconsts.lisederror +msgctxt "jcfuiconsts.lisederror" msgid "Error" msgstr "エラー" @@ -433,6 +434,12 @@ msgstr "%s（%s の近辺）" msgid "Type: %s%s" msgstr "型名：%s%s" +#: jcfuiconsts.liserroract +#, fuzzy +msgctxt "jcfuiconsts.liserroract" +msgid "Error" +msgstr "エラー" + #: jcfuiconsts.lisfindreplaceenablefindandreplace msgid "Enable find and replace" msgstr "検索と置換を有効にする" @@ -487,6 +494,10 @@ msgstr "" msgid "Version that wrote this file: %s" msgstr "このファイルが書かれたバージョン：%s" +#: jcfuiconsts.lisimbalancedcommentact +msgid "Imbalanced comment action" +msgstr "" + #: jcfuiconsts.lisindentblockindentationspaces msgid "Block indentation spaces" msgstr "ブロックインデントの空白数" @@ -932,6 +943,10 @@ msgstr "置換" msgid "Uses" msgstr "uses 節" +#: jcfuiconsts.liswarnact +msgid "Warn" +msgstr "" + #: jcfuiconsts.liswarningsignoreunusedparametersnamed msgid "&Ignore unused parameters named:" msgstr "無視する未使用パラメータ名(&I)：" diff --git a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.lt.po b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.lt.po index ab4fdeedf3..75b9d9bae3 100644 --- a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.lt.po +++ b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.lt.po @@ -406,6 +406,7 @@ msgid "%sAt line %s col %s" msgstr "%sTies eilutę %s, bei stulpeliu %s" #: jcfuiconsts.lisederror +msgctxt "jcfuiconsts.lisederror" msgid "Error" msgstr "Klaida" @@ -433,6 +434,12 @@ msgstr "%s greta %s" msgid "Type: %s%s" msgstr "Tipas: %s%s" +#: jcfuiconsts.liserroract +#, fuzzy +msgctxt "jcfuiconsts.liserroract" +msgid "Error" +msgstr "Klaida" + #: jcfuiconsts.lisfindreplaceenablefindandreplace msgid "Enable find and replace" msgstr "Įgalinti rask-keisk" @@ -487,6 +494,10 @@ msgstr "" msgid "Version that wrote this file: %s" msgstr "Versija, kuria įrašutas šis failas: %s" +#: jcfuiconsts.lisimbalancedcommentact +msgid "Imbalanced comment action" +msgstr "" + #: jcfuiconsts.lisindentblockindentationspaces msgid "Block indentation spaces" msgstr "Tarpai bloko įtraukoje" @@ -932,6 +943,10 @@ msgstr "Pakeisti" msgid "Uses" msgstr "Naudojami moduliai" +#: jcfuiconsts.liswarnact +msgid "Warn" +msgstr "" + #: jcfuiconsts.liswarningsignoreunusedparametersnamed msgid "&Ignore unused parameters named:" msgstr "&Nepaisyti nenaudojamų parametrų, kurių pavadinimai:" diff --git a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pl.po b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pl.po index cde476051c..e898927f1b 100644 --- a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pl.po +++ b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pl.po @@ -407,6 +407,7 @@ msgid "%sAt line %s col %s" msgstr "" #: jcfuiconsts.lisederror +msgctxt "jcfuiconsts.lisederror" msgid "Error" msgstr "Błąd" @@ -434,6 +435,12 @@ msgstr "" msgid "Type: %s%s" msgstr "" +#: jcfuiconsts.liserroract +#, fuzzy +msgctxt "jcfuiconsts.liserroract" +msgid "Error" +msgstr "Błąd" + #: jcfuiconsts.lisfindreplaceenablefindandreplace msgid "Enable find and replace" msgstr "" @@ -488,6 +495,10 @@ msgstr "" msgid "Version that wrote this file: %s" msgstr "" +#: jcfuiconsts.lisimbalancedcommentact +msgid "Imbalanced comment action" +msgstr "" + #: jcfuiconsts.lisindentblockindentationspaces msgid "Block indentation spaces" msgstr "" @@ -931,6 +942,10 @@ msgstr "Zastąp" msgid "Uses" msgstr "" +#: jcfuiconsts.liswarnact +msgid "Warn" +msgstr "" + #: jcfuiconsts.liswarningsignoreunusedparametersnamed msgid "&Ignore unused parameters named:" msgstr "" diff --git a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pot b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pot index 9e7ed3e259..2ccbd6ab66 100644 --- a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pot +++ b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pot @@ -392,6 +392,7 @@ msgid "%sAt line %s col %s" msgstr "" #: jcfuiconsts.lisederror +msgctxt "jcfuiconsts.lisederror" msgid "Error" msgstr "" @@ -419,6 +420,11 @@ msgstr "" msgid "Type: %s%s" msgstr "" +#: jcfuiconsts.liserroract +msgctxt "jcfuiconsts.liserroract" +msgid "Error" +msgstr "" + #: jcfuiconsts.lisfindreplaceenablefindandreplace msgid "Enable find and replace" msgstr "" @@ -473,6 +479,10 @@ msgstr "" msgid "Version that wrote this file: %s" msgstr "" +#: jcfuiconsts.lisimbalancedcommentact +msgid "Imbalanced comment action" +msgstr "" + #: jcfuiconsts.lisindentblockindentationspaces msgid "Block indentation spaces" msgstr "" @@ -916,6 +926,10 @@ msgstr "" msgid "Uses" msgstr "" +#: jcfuiconsts.liswarnact +msgid "Warn" +msgstr "" + #: jcfuiconsts.liswarningsignoreunusedparametersnamed msgid "&Ignore unused parameters named:" msgstr "" diff --git a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pt_BR.po b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pt_BR.po index 0af57b4fba..1e03b007b9 100644 --- a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pt_BR.po +++ b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pt_BR.po @@ -406,6 +406,7 @@ msgid "%sAt line %s col %s" msgstr "%sNa linha %s coluna %s" #: jcfuiconsts.lisederror +msgctxt "jcfuiconsts.lisederror" msgid "Error" msgstr "Erro" @@ -433,6 +434,12 @@ msgstr "%s perto %s" msgid "Type: %s%s" msgstr "Tipo: %s%s" +#: jcfuiconsts.liserroract +#, fuzzy +msgctxt "jcfuiconsts.liserroract" +msgid "Error" +msgstr "Erro" + #: jcfuiconsts.lisfindreplaceenablefindandreplace msgid "Enable find and replace" msgstr "Ativar localizar e substituir" @@ -487,6 +494,10 @@ msgstr "Arquivo de configurações é:" msgid "Version that wrote this file: %s" msgstr "Versão que gravou este arquivo: %s" +#: jcfuiconsts.lisimbalancedcommentact +msgid "Imbalanced comment action" +msgstr "" + #: jcfuiconsts.lisindentblockindentationspaces msgid "Block indentation spaces" msgstr "Espaços identação blocos" @@ -932,6 +943,10 @@ msgstr "Substituir" msgid "Uses" msgstr "\"Uses\"" +#: jcfuiconsts.liswarnact +msgid "Warn" +msgstr "" + #: jcfuiconsts.liswarningsignoreunusedparametersnamed msgid "&Ignore unused parameters named:" msgstr "&Ignorar parâmetros não usados chamados:" diff --git a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.ru.po b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.ru.po index 5138f6e593..911fe1b47d 100644 --- a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.ru.po +++ b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.ru.po @@ -9,7 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" -"X-Generator: Poedit 2.4.3\n" +"X-Generator: Poedit 2.2.4\n" #: jcfuiconsts.format_about_menu msgid "&About" @@ -406,6 +406,7 @@ msgid "%sAt line %s col %s" msgstr "%sСтрока %s, столбец %s" #: jcfuiconsts.lisederror +msgctxt "jcfuiconsts.lisederror" msgid "Error" msgstr "Ошибка" @@ -433,6 +434,11 @@ msgstr "%s в окрестности %s" msgid "Type: %s%s" msgstr "Тип: %s%s" +#: jcfuiconsts.liserroract +msgctxt "jcfuiconsts.liserroract" +msgid "Error" +msgstr "Ошибка" + #: jcfuiconsts.lisfindreplaceenablefindandreplace msgid "Enable find and replace" msgstr "Включить поиск и замену" @@ -487,6 +493,10 @@ msgstr "Файл параметров:" msgid "Version that wrote this file: %s" msgstr "Файл записан версией: %s" +#: jcfuiconsts.lisimbalancedcommentact +msgid "Imbalanced comment action" +msgstr "Действие с несбалансированным комментарием" + #: jcfuiconsts.lisindentblockindentationspaces msgid "Block indentation spaces" msgstr "Отступ блока в пробелах" @@ -930,6 +940,10 @@ msgstr "Заменять" msgid "Uses" msgstr "Выражение Uses" +#: jcfuiconsts.liswarnact +msgid "Warn" +msgstr "Предупреждение" + #: jcfuiconsts.liswarningsignoreunusedparametersnamed msgid "&Ignore unused parameters named:" msgstr "&Игнорировать неиспользуемые параметры с именами:" diff --git a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.uk.po b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.uk.po index a1b94b8fb1..3d6c6b65c5 100644 --- a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.uk.po +++ b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.uk.po @@ -409,6 +409,7 @@ msgid "%sAt line %s col %s" msgstr "%sВ рядку %s стовп. %s" #: jcfuiconsts.lisederror +msgctxt "jcfuiconsts.lisederror" msgid "Error" msgstr "Помилка" @@ -436,6 +437,12 @@ msgstr "%s близько %s" msgid "Type: %s%s" msgstr "Тип: %s%s" +#: jcfuiconsts.liserroract +#, fuzzy +msgctxt "jcfuiconsts.liserroract" +msgid "Error" +msgstr "Помилка" + #: jcfuiconsts.lisfindreplaceenablefindandreplace msgid "Enable find and replace" msgstr "Ввімкнути пошук та заміну" @@ -490,6 +497,10 @@ msgstr "Файл налаштувань є:" msgid "Version that wrote this file: %s" msgstr "Файл записаний версією: %s" +#: jcfuiconsts.lisimbalancedcommentact +msgid "Imbalanced comment action" +msgstr "" + #: jcfuiconsts.lisindentblockindentationspaces msgid "Block indentation spaces" msgstr "Пробіли відступу в блоках" @@ -933,6 +944,10 @@ msgstr "Замінити" msgid "Uses" msgstr "Uses" +#: jcfuiconsts.liswarnact +msgid "Warn" +msgstr "" + #: jcfuiconsts.liswarningsignoreunusedparametersnamed msgid "&Ignore unused parameters named:" msgstr "&Ігнорувати невикористовувані параметри з іменами:" diff --git a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.zh_CN.po b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.zh_CN.po index 4b9a746f54..35fdd774eb 100644 --- a/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.zh_CN.po +++ b/components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.zh_CN.po @@ -407,6 +407,7 @@ msgid "%sAt line %s col %s" msgstr "" #: jcfuiconsts.lisederror +msgctxt "jcfuiconsts.lisederror" msgid "Error" msgstr "错误" @@ -434,6 +435,12 @@ msgstr "%s靠近%s" msgid "Type: %s%s" msgstr "类型: %s%s" +#: jcfuiconsts.liserroract +#, fuzzy +msgctxt "jcfuiconsts.liserroract" +msgid "Error" +msgstr "错误" + #: jcfuiconsts.lisfindreplaceenablefindandreplace msgid "Enable find and replace" msgstr "不能查找和替换" @@ -488,6 +495,10 @@ msgstr "" msgid "Version that wrote this file: %s" msgstr "写入这个文件的版本: %s" +#: jcfuiconsts.lisimbalancedcommentact +msgid "Imbalanced comment action" +msgstr "" + #: jcfuiconsts.lisindentblockindentationspaces msgid "Block indentation spaces" msgstr "语句块缩进空格" @@ -931,6 +942,10 @@ msgstr "替换" msgid "Uses" msgstr "Uses" +#: jcfuiconsts.liswarnact +msgid "Warn" +msgstr "" + #: jcfuiconsts.liswarningsignoreunusedparametersnamed msgid "&Ignore unused parameters named:" msgstr "忽略未使用的参数命名:(&I)" diff --git a/components/jcf2/Ui/Settings/frComments.pas b/components/jcf2/Ui/Settings/frComments.pas index e187e479f1..1a5eb36a34 100644 --- a/components/jcf2/Ui/Settings/frComments.pas +++ b/components/jcf2/Ui/Settings/frComments.pas @@ -69,10 +69,21 @@ begin end; procedure TfComments.Setup(ADialog: TAbstractOptionsEditorDialog); +var + i: Integer; begin cbRemoveEmptyDoubleSlashComments.Caption := lisCommentsRemoveEmptySlashComments; cbRemoveEmptyCurlyBraceComments.Caption := lisCommentsRemoveEmptyCurlyBracesComments; FormattingSettings.Comments.GetImbalancedCommentActions(rgImbalancedCommentAction.Items); + rgImbalancedCommentAction.Caption := lisImbalancedCommentAct; + for i := 0 to rgImbalancedCommentAction.Items.Count - 1 do + begin + if rgImbalancedCommentAction.Items[i] = 'Error' then + rgImbalancedCommentAction.Items[i] := lisErrorAct + else + if rgImbalancedCommentAction.Items[i] = 'Warn' then + rgImbalancedCommentAction.Items[i] := lisWarnAct; + end; end; procedure TfComments.ReadSettings(AOptions: TAbstractIDEOptions);