[Docutils-checkins] SF.net SVN: docutils:[9782] trunk/docutils

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 9782
          http://sourceforge.net/p/docutils/code/9782
Author:   milde
Date:     2024-07-29 12:37:02 +0000 (Mon, 29 Jul 2024)
Log Message:
-----------
Remove mistranslations of the "admonition" directive name.

Some localizations used the translation of "admonition (reprimand)"
(not applicable for the rST directive)
instead of "admonition (advice/advisory/remark)".

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/RELEASE-NOTES.txt
    trunk/docutils/docutils/parsers/rst/languages/af.py
    trunk/docutils/docutils/parsers/rst/languages/da.py
    trunk/docutils/docutils/parsers/rst/languages/de.py
    trunk/docutils/docutils/parsers/rst/languages/eo.py
    trunk/docutils/docutils/parsers/rst/languages/es.py
    trunk/docutils/docutils/parsers/rst/languages/fi.py
    trunk/docutils/docutils/parsers/rst/languages/fr.py
    trunk/docutils/docutils/parsers/rst/languages/gl.py
    trunk/docutils/docutils/parsers/rst/languages/it.py
    trunk/docutils/docutils/parsers/rst/languages/nl.py
    trunk/docutils/docutils/parsers/rst/languages/pl.py
    trunk/docutils/docutils/parsers/rst/languages/pt_br.py
    trunk/docutils/docutils/parsers/rst/languages/sv.py

Modified: trunk/docutils/HISTORY.txt
===================================================================

--- trunk/docutils/HISTORY.txt	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/HISTORY.txt	2024-07-29 12:37:02 UTC (rev 9782)
@@ -64,6 +64,10 @@
 
   - New parser for Docutils XML sources. Provisional.
 
+* docutils/parsers/rst/languages/*.py
+
+  - Removed mistranslations of the "admonition" directive name.
+
 * docutils/parsers/recommonmark_wrapper.py
 
   - New method `Parser.finish_parse()` to clean up (before validating).

Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/RELEASE-NOTES.txt	2024-07-29 12:37:02 UTC (rev 9782)
@@ -90,7 +90,7 @@
     specification of the aspect ratio to `prevent jank when loading
     images`__ without overwriting an image size set in a CSS stylesheet
     in Docutils 0.22 (cf.  `feature-requests:102`__).
-    The current behaviour is kept for dimensions with value, so
+    The current behaviour is kept for dimensions with units, so
     users may specify, e.g. ``:width: 50px`` instead of ``:width: 50``
     to override CSS stylesheet rules.
 
@@ -171,16 +171,6 @@
 
   __ docs/ref/transforms.html
 
-* Remove mistranslated localizations of the "admonition" directive name in
-  Docutils 0.22.
-
-  Use the English term, matching translations introduced in Docutils 0.21,
-  or specific admonitions instead of "aanmaning" (nl),
-  "admonition" (fr), "ammonizione" (it), "ermahnung" (de),
-  "exhortación" (es), "formaning" (da), "sciigo" (eo),
-  "upomnienie" (pl), "vermaning" (af),
-  to avoid errors in future conversions.
-
 .. _front end tools: docs/user/tools.html
 .. _input_encoding: docs/user/config.html#input-encoding
 .. _math_output: docs/user/config.html#math-output
@@ -242,20 +232,27 @@
 
 Removed objects
   `docutils.core.Publisher.setup_option_parser()`
-     internal, obsolete
+     internal, obsolete,
   `docutils.nodes.Element.set_class()`
-     Obsolete. Append to Element['classes'] directly.
+     obsolete, append to Element['classes'] directly,
   `docutils.parsers.rst.directives.tables.CSVTable.decode_from_csv()`
-     not required with Python 3
+     not required with Python 3,
   `docutils.parsers.rst.directives.tables.CSVTable.encode_from_csv()`
-     not required with Python 3
+     not required with Python 3,
   `docutils.transforms.writer_aux.Compound`
-     not used since Dec 2010
+     not used since Dec 2010,
   `docutils.utils.error_reporting`
-     obsolete in Python 3
+     obsolete in Python 3,
   `docutils.utils.Reporter.set_conditions()`
-     Obsolete. Set attributes via configuration settings or directly.
+     obsolete, set attributes via configuration settings or directly.
 
+Removed localisations:
+  Mistranslations of the "admonition" directive name:
+     Use "advies" (af), "varsel" (da), "warnhinweis" (de), "aviso" (es),
+     "sciigo" (eo), "annonce" (fr), "avviso" (it), "advies" (nl),
+     "zauważenie" (pl) (introduced in Docutils 0.21)
+     or the English name "admonition".
+
 Removed files
   ``tools/rst2odt_prepstyles.py``
      Obsoleted by `docutils.writers.odf_odt.prepstyles`.

Modified: trunk/docutils/docutils/parsers/rst/languages/af.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/af.py	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/docutils/parsers/rst/languages/af.py	2024-07-29 12:37:02 UTC (rev 9782)
@@ -27,7 +27,6 @@
       'tip': 'tip',  # hint and tip both have the same translation: wenk
       'waarskuwing': 'warning',
       'advies': 'admonition',
-      'vermaning': 'admonition',  # sic! kept for backwards compatibiltity
       'kantstreep': 'sidebar',
       'onderwerp': 'topic',
       'lynblok': 'line-block',

Modified: trunk/docutils/docutils/parsers/rst/languages/da.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/da.py	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/docutils/parsers/rst/languages/da.py	2024-07-29 12:37:02 UTC (rev 9782)
@@ -30,7 +30,6 @@
       'tips': 'tip',
       'advarsel': 'warning',
       'varsel': 'admonition',
-      'formaning': 'admonition',  # sic! kept for backwards compatibiltity
       'sidebjælke': 'sidebar',
       'emne': 'topic',
       'linje-blok': 'line-block',

Modified: trunk/docutils/docutils/parsers/rst/languages/de.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/de.py	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/docutils/parsers/rst/languages/de.py	2024-07-29 12:37:02 UTC (rev 9782)
@@ -18,7 +18,6 @@
 
 directives = {
       'warnhinweis': 'admonition',  # or, more generally, 'anmerkung'?
-      'ermahnung': 'admonition',  # sic! kept for backwards compatibiltity
       'achtung': 'attention',
       'vorsicht': 'caution',
       'code': 'code',

Modified: trunk/docutils/docutils/parsers/rst/languages/eo.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/eo.py	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/docutils/parsers/rst/languages/eo.py	2024-07-29 12:37:02 UTC (rev 9782)
@@ -29,7 +29,6 @@
     'helpeto': 'tip',
     'averto': 'warning',
     'sciigo': 'admonition',
-    'admono': 'admonition',  # sic! kept for backwards compatibiltity
     'flankteksto': 'sidebar',
     'temo': 'topic',
     'linea-bloko': 'line-block',

Modified: trunk/docutils/docutils/parsers/rst/languages/es.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/es.py	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/docutils/parsers/rst/languages/es.py	2024-07-29 12:37:02 UTC (rev 9782)
@@ -28,8 +28,6 @@
     'consejo': 'tip',
     'advertencia': 'warning',
     'aviso': 'admonition',
-    'exhortacion': 'admonition',  # sic! kept for backwards compatibiltity
-    'exhortación': 'admonition',  # sic! kept for backwards compatibiltity
     'nota-al-margen': 'sidebar',
     'tema': 'topic',
     'bloque-de-lineas': 'line-block',

Modified: trunk/docutils/docutils/parsers/rst/languages/fi.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/fi.py	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/docutils/parsers/rst/languages/fi.py	2024-07-29 12:37:02 UTC (rev 9782)
@@ -17,6 +17,7 @@
 
 directives = {
       # language-dependent: fixed
+      'admonition (translation required)': 'admonition',
       'huomio': 'attention',
       'varo': 'caution',
       'code (translation required)': 'code',
@@ -27,7 +28,6 @@
       'huomautus': 'note',
       'neuvo': 'tip',
       'varoitus': 'warning',
-      'kehotus': 'admonition',  # sic! advice/advisory/remark, not reprimand
       'sivupalkki': 'sidebar',
       'aihe': 'topic',
       'rivi': 'line-block',

Modified: trunk/docutils/docutils/parsers/rst/languages/fr.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/fr.py	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/docutils/parsers/rst/languages/fr.py	2024-07-29 12:37:02 UTC (rev 9782)
@@ -26,7 +26,6 @@
       'astuce': 'tip',
       'avertissement': 'warning',
       'annonce': 'admonition',
-      'admonition': 'admonition',  # sic! kept for backwards compatibiltity
       # suggestions: annonce, avis, indication, remarque, renseignement
       # see also https://sourceforge.net/p/docutils/bugs/453/
       'encadré': 'sidebar',

Modified: trunk/docutils/docutils/parsers/rst/languages/gl.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/gl.py	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/docutils/parsers/rst/languages/gl.py	2024-07-29 12:37:02 UTC (rev 9782)
@@ -19,6 +19,7 @@
 
 directives = {
       # language-dependent: fixed
+      'admonition (translation required)': 'admonition',
       'atención': 'attention',
       'advertencia': 'caution',
       'code (translation required)': 'code',
@@ -29,7 +30,6 @@
       'nota': 'note',
       'consello': 'tip',
       'aviso': 'warning',
-      'admonición': 'admonition',  # sic! advice/advisory/remark, not reprimand
       'barra lateral': 'sidebar',
       'tópico': 'topic',
       'bloque-liña': 'line-block',

Modified: trunk/docutils/docutils/parsers/rst/languages/it.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/it.py	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/docutils/parsers/rst/languages/it.py	2024-07-29 12:37:02 UTC (rev 9782)
@@ -28,7 +28,6 @@
       'consiglio': 'tip',
       'avvertenza': 'warning',
       'avviso': 'admonition',
-      'ammonizione': 'admonition',  # sic! kept for backards compatibility
       'riquadro': 'sidebar',
       'argomento': 'topic',
       'blocco-di-righe': 'line-block',

Modified: trunk/docutils/docutils/parsers/rst/languages/nl.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/nl.py	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/docutils/parsers/rst/languages/nl.py	2024-07-29 12:37:02 UTC (rev 9782)
@@ -28,7 +28,6 @@
       'tip': 'tip',
       'waarschuwing': 'warning',
       'advies': 'admonition',
-      'aanmaning': 'admonition',  # sic! kept for backwards compatibiltity
       'katern': 'sidebar',
       'onderwerp': 'topic',
       'lijn-blok': 'line-block',

Modified: trunk/docutils/docutils/parsers/rst/languages/pl.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/pl.py	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/docutils/parsers/rst/languages/pl.py	2024-07-29 12:37:02 UTC (rev 9782)
@@ -28,7 +28,6 @@
     'rada': 'tip',
     'ostrzeżenie': 'warning',
     'zauważenie': 'admonition',  # remark
-    'upomnienie': 'admonition',  # sic! kept for backwards compatibiltity
     'ramka': 'sidebar',
     'temat': 'topic',
     'blok-linii': 'line-block',

Modified: trunk/docutils/docutils/parsers/rst/languages/pt_br.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/pt_br.py	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/docutils/parsers/rst/languages/pt_br.py	2024-07-29 12:37:02 UTC (rev 9782)
@@ -28,7 +28,6 @@
       'dica': 'tip',
       'aviso': 'warning',
       'advertência': 'admonition',
-      'exortação': 'admonition',  # sic! advice/advisory/remark, not reprimand
       'barra-lateral': 'sidebar',
       'tópico': 'topic',
       'bloco-de-linhas': 'line-block',

Modified: trunk/docutils/docutils/parsers/rst/languages/sv.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/sv.py	2024-07-28 10:50:23 UTC (rev 9781)
+++ trunk/docutils/docutils/parsers/rst/languages/sv.py	2024-07-29 12:37:02 UTC (rev 9782)
@@ -24,7 +24,7 @@
       'notera': 'note',
       'tips': 'tip',
       'varning': 'warning',
-      'anmärkning': 'admonition',  # literal 'tillrättavisning', 'förmaning'
+      'anmärkning': 'admonition',
       'sidorad': 'sidebar',
       'ämne': 'topic',
       'tema': 'topic',

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



