Menu
▾
▴
[Docutils-checkins] SF.net SVN: docutils:[9417] trunk/docutils
|
From: <mi...@us...> - 2023-06-27 20:04:57
|
Revision: 9417
http://sourceforge.net/p/docutils/code/9417
Author: milde
Date: 2023-06-27 20:04:54 +0000 (Tue, 27 Jun 2023)
Log Message:
-----------
Mark/Fix mistranslated localizations of the "admonition" directive name.
In Docutils, "admonition" is used as a generic term for
"advice"/"advisory"/"remark", not a reprimand.
Misleading translations will be removed later.
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/en.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
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/HISTORY.txt 2023-06-27 20:04:54 UTC (rev 9417)
@@ -45,6 +45,12 @@
- Move `parsers.rst.directives.Table.process_header_option()` to
`parsers.rst.directives.CSVTable`.
+* docutils/parsers/rst/languages/
+
+ Mark/Fix mistranslated localizations of the "admonition" directive name.
+ In Docutils, "admonition" is used as a generic term for
+ "advice"/"advisory"/"remark", not a reprimand.
+
* docutils/utils/roman.py
- Update to version `1.4 <https://pypi.org/project/roman/4.1/>`__.
Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/RELEASE-NOTES.txt 2023-06-27 20:04:54 UTC (rev 9417)
@@ -131,14 +131,14 @@
__ docs/ref/transforms.html
-* docutils/parsers/rst/languages/
+* Remove mistranslated localizations of the "admonition" directive name in
+ Docutils 0.22 or later.
- Fix mistranslated localizations of the "admonition" directive name in
- Docutils 0.21 (or later). In Docutils, "admonition" is used as a
- generic term for "advice"/"caveat"/"remark", not a reprimand.
- Use the English term (or specific admonitions) instead of "aanmaning",
- "ammonizione", "Ermahnung", "exhortacion", "formaning", "upomnienie",
- or "vermaning" to avoid errors in future conversions.
+ Use the English term (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
Modified: trunk/docutils/docutils/parsers/rst/languages/af.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/af.py 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/docutils/parsers/rst/languages/af.py 2023-06-27 20:04:54 UTC (rev 9417)
@@ -26,7 +26,8 @@
'nota': 'note',
'tip': 'tip', # hint and tip both have the same translation: wenk
'waarskuwing': 'warning',
- 'vermaning': 'admonition', # sic! Not used in this sense in rST.
+ '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 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/docutils/parsers/rst/languages/da.py 2023-06-27 20:04:54 UTC (rev 9417)
@@ -29,7 +29,8 @@
'bemærk': 'note',
'tips': 'tip',
'advarsel': 'warning',
- 'formaning': 'admonition', # sic! Not used in this sense in rST.
+ '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 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/docutils/parsers/rst/languages/de.py 2023-06-27 20:04:54 UTC (rev 9417)
@@ -27,8 +27,8 @@
'notiz': 'note',
'tipp': 'tip',
'warnung': 'warning',
- 'ermahnung': 'admonition', # sic! Not used in this sense in rST.
- # TODO: Rat(schlag), Empfehlung, Warnhinweis, ...?
+ 'warnhinweis': 'admonition',
+ 'ermahnung': 'admonition', # sic! kept for backwards compatibiltity
'kasten': 'sidebar',
'seitenkasten': 'sidebar', # kept for backwards compatibiltity
'seitenleiste': 'sidebar',
Modified: trunk/docutils/docutils/parsers/rst/languages/en.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/en.py 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/docutils/parsers/rst/languages/en.py 2023-06-27 20:04:54 UTC (rev 9417)
@@ -26,7 +26,7 @@
'note': 'note',
'tip': 'tip',
'warning': 'warning',
- 'admonition': 'admonition', # advice/caveat/remark, not reprimand
+ 'admonition': 'admonition', # advice/advisory/remark, not reprimand
'sidebar': 'sidebar',
'topic': 'topic',
'line-block': 'line-block',
Modified: trunk/docutils/docutils/parsers/rst/languages/eo.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/eo.py 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/docutils/parsers/rst/languages/eo.py 2023-06-27 20:04:54 UTC (rev 9417)
@@ -28,7 +28,8 @@
'noto': 'note',
'helpeto': 'tip',
'averto': 'warning',
- 'admono': 'admonition',
+ '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 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/docutils/parsers/rst/languages/es.py 2023-06-27 20:04:54 UTC (rev 9417)
@@ -27,8 +27,9 @@
'nota': 'note',
'consejo': 'tip',
'advertencia': 'warning',
- 'exhortacion': 'admonition', # sic! Not used in this sense in rST.
- 'exhortaci\u00f3n': 'admonition',
+ '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 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/docutils/parsers/rst/languages/fi.py 2023-06-27 20:04:54 UTC (rev 9417)
@@ -27,7 +27,7 @@
'huomautus': 'note',
'neuvo': 'tip',
'varoitus': 'warning',
- 'kehotus': 'admonition',
+ '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 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/docutils/parsers/rst/languages/fr.py 2023-06-27 20:04:54 UTC (rev 9417)
@@ -25,7 +25,8 @@
'note': 'note',
'astuce': 'tip',
'avertissement': 'warning',
- 'admonition': 'admonition', # sic! Not used in this sense in rST.
+ '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 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/docutils/parsers/rst/languages/gl.py 2023-06-27 20:04:54 UTC (rev 9417)
@@ -19,7 +19,7 @@
directives = {
# language-dependent: fixed
- 'atenci\u00f3n': 'attention',
+ 'atención': 'attention',
'advertencia': 'caution',
'code (translation required)': 'code',
'perigo': 'danger',
@@ -29,46 +29,41 @@
'nota': 'note',
'consello': 'tip',
'aviso': 'warning',
- 'admonici\u00f3n': 'admonition',
+ 'admonición': 'admonition', # sic! advice/advisory/remark, not reprimand
'barra lateral': 'sidebar',
- 't\u00f3pico': 'topic',
- 'bloque-li\u00f1a': 'line-block',
+ 'tópico': 'topic',
+ 'bloque-liña': 'line-block',
'literal-analizado': 'parsed-literal',
- 'r\u00fabrica': 'rubric',
- 'ep\u00edgrafe': 'epigraph',
+ 'rúbrica': 'rubric',
+ 'epígrafe': 'epigraph',
'realzados': 'highlights',
- 'coller-citaci\u00f3n': 'pull-quote',
+ 'coller-citación': 'pull-quote',
'compor': 'compound',
'recipiente': 'container',
- # 'questions': 'questions',
- 't\u00e1boa': 'table',
- 't\u00e1boa-csv': 'csv-table',
- 't\u00e1boa-listaxe': 'list-table',
- # 'qa': 'questions',
- # 'faq': 'questions',
+ 'táboa': 'table',
+ 'táboa-csv': 'csv-table',
+ 'táboa-listaxe': 'list-table',
'meta': 'meta',
'math (translation required)': 'math',
- # 'imagemap': 'imagemap',
'imaxe': 'image',
'figura': 'figure',
- 'inclu\u00edr': 'include',
+ 'incluír': 'include',
'cru': 'raw',
- 'substitu\u00edr': 'replace',
+ 'substituír': 'replace',
'unicode': 'unicode',
'data': 'date',
'clase': 'class',
'regra': 'role',
'regra-predeterminada': 'default-role',
- 't\u00edtulo': 'title',
+ 'título': 'title',
'contido': 'contents',
'seccnum': 'sectnum',
- 'secci\u00f3n-numerar': 'sectnum',
+ 'sección-numerar': 'sectnum',
'cabeceira': 'header',
- 'p\u00e9 de p\u00e1xina': 'footer',
- # 'footnotes': 'footnotes',
- # 'citations': 'citations',
+ 'pé de páxina': 'footer',
'notas-destino': 'target-notes',
- 'texto restruturado-proba-directiva': 'restructuredtext-test-directive'}
+ 'texto restruturado-proba-directiva': 'restructuredtext-test-directive',
+ }
"""Galician name to registered (in directives/__init__.py) directive name
mapping."""
Modified: trunk/docutils/docutils/parsers/rst/languages/it.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/it.py 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/docutils/parsers/rst/languages/it.py 2023-06-27 20:04:54 UTC (rev 9417)
@@ -27,7 +27,8 @@
'nota': 'note',
'consiglio': 'tip',
'avvertenza': 'warning',
- 'ammonizione': 'admonition', # sic! Not used in this sense in rST.
+ '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 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/docutils/parsers/rst/languages/nl.py 2023-06-27 20:04:54 UTC (rev 9417)
@@ -27,7 +27,8 @@
'opmerking': 'note',
'tip': 'tip',
'waarschuwing': 'warning',
- 'aanmaning': 'admonition', # sic! Not used in this sense in rST.
+ '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 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/docutils/parsers/rst/languages/pl.py 2023-06-27 20:04:54 UTC (rev 9417)
@@ -27,8 +27,8 @@
'przypis': 'note',
'rada': 'tip',
'ostrze\u017cenie': 'warning',
- 'upomnienie': 'admonition', # sic! Not used in this sense in rST.
- # 'zauważenie': 'admonition', # remark
+ '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 2023-06-27 20:04:33 UTC (rev 9416)
+++ trunk/docutils/docutils/parsers/rst/languages/pt_br.py 2023-06-27 20:04:54 UTC (rev 9417)
@@ -17,25 +17,26 @@
directives = {
# language-dependent: fixed
- 'aten\u00E7\u00E3o': 'attention',
+ 'atenção': 'attention',
'cuidado': 'caution',
'code (translation required)': 'code',
'perigo': 'danger',
'erro': 'error',
- 'sugest\u00E3o': 'hint',
+ 'sugestão': 'hint',
'importante': 'important',
'nota': 'note',
'dica': 'tip',
'aviso': 'warning',
- 'exorta\u00E7\u00E3o': 'admonition',
+ 'advertência': 'admonition',
+ 'exortação': 'admonition', # sic! advice/advisory/remark, not reprimand
'barra-lateral': 'sidebar',
- 't\u00F3pico': 'topic',
+ 'tópico': 'topic',
'bloco-de-linhas': 'line-block',
'literal-interpretado': 'parsed-literal',
'rubrica': 'rubric',
- 'ep\u00EDgrafo': 'epigraph',
+ 'epígrafo': 'epigraph',
'destaques': 'highlights',
- 'cita\u00E7\u00E3o-destacada': 'pull-quote',
+ 'citação-destacada': 'pull-quote',
'compound (translation required)': 'compound',
'container (translation required)': 'container',
# 'perguntas': 'questions',
@@ -49,9 +50,9 @@
# 'imagemap': 'imagemap',
'imagem': 'image',
'figura': 'figure',
- 'inclus\u00E3o': 'include',
+ 'inclusão': 'include',
'cru': 'raw',
- 'substitui\u00E7\u00E3o': 'replace',
+ 'substituição': 'replace',
'unicode': 'unicode',
'data': 'date',
'classe': 'class',
@@ -58,14 +59,14 @@
'role (translation required)': 'role',
'default-role (translation required)': 'default-role',
'title (translation required)': 'title',
- '\u00EDndice': 'contents',
+ 'índice': 'contents',
'numsec': 'sectnum',
- 'numera\u00E7\u00E3o-de-se\u00E7\u00F5es': 'sectnum',
+ 'numeração-de-seções': 'sectnum',
'header (translation required)': 'header',
'footer (translation required)': 'footer',
# 'notas-de-rorap\u00E9': 'footnotes',
# 'cita\u00E7\u00F5es': 'citations',
- 'links-no-rodap\u00E9': 'target-notes',
+ 'links-no-rodapé': 'target-notes',
'restructuredtext-test-directive': 'restructuredtext-test-directive'}
"""Brazilian Portuguese name to registered (in directives/__init__.py)
directive name mapping."""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
