merge master

doc/polyglossia.tex

@@ -2729,6 +2729,8 @@ \subsubsection*{Bug fixes}
 	\item Fix \texttt{lang} environment (\TXI{633}).
 	\item Fix first number of Maghrib abjad numbering for Algeria, Morocco and
 	      Tunisia (\TXI{640}).
+	\item Fix some captions strings in Bulgarian, Chinese, Esperanto, Estonian, Hindi,
+	      Latvian, and Slovak (\TXP{651})
 	\item Improve performance with multilingual documents that have a TOC (\TXI{641}).
 \end{itemize}
 
@@ -3830,7 +3832,7 @@ \section{More acknowledgements (by the current development team)}
 since we took over.
 In alphabetical order: \TA{Ignas Anikevicius}, \TA{Sina Ahmadi}, \TA{Matthew Bertucci}, \TA{Wouter Bolsterlee}, \TA{Christian Buhtz},
 \TA{Ashok Das}, \TA{Oleg Domanov}, user \TA{fakhriaunur}, \TA{Philipp Gesang}, \TA{Kevin Godby},
-\TA{Enrico Gregorio}, \TA{Khaled Hosny}, \TA{Najib Idrissi}, user \TA{julroy67}, \TA{Dohyun Kim}, \TA{Phil Kime},
+\TA{Enrico Gregorio}, \TA{Khaled Hosny}, \TA{Stephen Huan}, \TA{Najib Idrissi}, user \TA{julroy67}, \TA{Dohyun Kim}, \TA{Phil Kime},
 \TA{Mike Kroutikov}, \TA{Ivan Kokan}, \TA{Caleb Maclennan}, \TA{Gyula Magyarkuti}, \TA{José Mancera}, \TA{Miquel Ortega},
 \TA{Yevgen Pogribnyi}, \TA{Will Robertson}, \TA{Maïeul Rouquette}, \TA{Elie Roux}, \TA{Hugo Roy},  \TA{Guy Rutenberg},
 \TA{Marcin Serwin}, \TA{Arvinder Singh}, \TA{Avisek Jena}, \TA{Philipp Stephani}, \TA{Niranjan Tambe}, \TA{Takuji Tanaka},

tex/gloss-bulgarian.ldf

@@ -60,15 +60,15 @@
    \def\figurename{Фигура}%
    \def\tablename{Таблица}%
    %\def\thepart{}%
-   %\def\partname{}%
+   \def\partname{Част}%
    \def\pagename{Стр.}%
    \def\seename{вж.}%
    \def\alsoname{вж.\ също и}%
    \def\enclname{Приложения}%
    \def\ccname{копия}%
-   %\def\headtoname{}%
-   \def\proofname{Proof}%
-   \def\glossaryname{Glossary}%
+   \def\headtoname{За}%
+   \def\proofname{Доказателство}%
+   \def\glossaryname{Притурка}%
 }
 
 \def\datebulgarian{%

tex/gloss-chinese.ldf

@@ -127,7 +127,7 @@
     \def\enclname{附件}%
     \def\ccname{抄送}%
     \def\headtoname{收件人}%
-    \def\\glossaryname{詞彙表}%
+    \def\glossaryname{詞彙表}%
 }
 \def\captions@chinese@simplified{%
     \def\contentsname{目录}%
@@ -150,7 +150,7 @@
     \def\enclname{附件}%
     \def\ccname{抄送}%
     \def\headtoname{收件人}%
-    \def\\glossaryname{词汇表}%
+    \def\glossaryname{词汇表}%
 }
 
 \newcount\c@TempJNum%

tex/gloss-esperanto.ldf

@@ -28,10 +28,10 @@
    \def\figurename{Figuro}%
    \def\tablename{Tabelo}%
    %\def\thepart{}%
-   %\def\partname{}%
+   \def\partname{Parto}%
    \def\pagename{Paĝo}%
    \def\seename{vidu}%
-   \def\alsoname{Parto}%
+   \def\alsoname{vidu ankaŭ}%
    \def\enclname{Aldono(j)}%
    \def\ccname{Kopie al}%
    \def\headtoname{Al}%

tex/gloss-estonian.ldf

@@ -37,7 +37,7 @@
    \def\ccname{Koopia(d)}%
    %\def\headtoname{}%
    \def\proofname{Korrektuur}%
-   \def\glossaryname{Glossary}% <-- need translation
+   \def\glossaryname{Sõnastik}%
    }
 \def\dateestonian{%
    \def\today{\number\day.\space\ifcase\month\or

tex/gloss-hindi.ldf

@@ -78,6 +78,7 @@
      \def\contentsname{विषय सूची}%
      \def\enclname{}%
      \def\figurename{चित्र}% रेखाचित्र
+     \def\glossaryname{शब्दार्थ सूची}%
      \def\headpagename{पृष्ठ}%
      \def\headtoname{}%
      \def\indexname{सूची}%
@@ -89,6 +90,7 @@
      \def\pagename{पृष्ठ}%
      \def\partname{खण्ड}%
      \def\prefacename{प्रस्तावना}% प्राक्कथन
+     \def\proofname{प्रमाण}%
      \def\refname{हवाले}%
      \def\tablename{तालिका}%
      \def\seename{देखिए}%

tex/gloss-latvian.ldf

@@ -24,12 +24,12 @@
    \def\contentsname{Saturs}%
    \def\listfigurename{Attēlu saraksts}%
    \def\listtablename{Tabulu saraksts}%
-   \def\indexname{Index}%
+   \def\indexname{Priekšmetu rādītājs}%
    \def\figurename{Att.}%
    \def\tablename{Tabula}%
    \def\partname{Daļa}%
-   \def\enclname{encl}%
-   \def\ccname{cc}%
+   \def\enclname{Pielikumā}%
+   \def\ccname{Kopija(s)}%
    \def\headtoname{To}%
    \def\pagename{lpp.}%
    \def\seename{sk.}%

tex/gloss-slovak.ldf

@@ -213,7 +213,7 @@
    \def\contentsname{Obsah}%
    \def\listfigurename{Zoznam obrázkov}%
    \def\listtablename{Zoznam tabuliek}%
-   \def\indexname{Index}%
+   \def\indexname{Register}%
    \def\figurename{Obrázok}%
    \def\tablename{Tabuľka}%
    %\def\thepart{}%

tex/polyglossia.sty

@@ -1697,7 +1697,7 @@
            {
             \xpg_warning_msg:n
               {No~ hyphenation~ patterns~ for~ #1~ found \iow_newline:
-               I~ will~ use~ the~ 'null'~ language~ instead!}
+               Falling~ back~ to~ the~ default~ patterns~ (=~English)!}
                \exp_args:Nc \adddialect {l@#1} 0
            }
      }

tools/bcp47.py

@@ -2,8 +2,11 @@
 # Below are mappings of the currently supported polyglossia languages
 # (+ babelnames) to bcp47 tags and of bcp-47 tags to *.ldf file names.
 
+from __future__ import print_function
+
 import fileinput
-import logging, sys
+import logging
+import sys
 
 # Dic 1: babelname : bcp47
 babelname2bcp47 = {
@@ -32,8 +35,6 @@
     "canadien" : "fr-CA",
     "catalan" : "ca",
     "chinese" : "zh",
-    "chinese" : "zh-CN",
-    "chinese" : "zh-TW",
     "coptic" : "cop",
     "croatian" : "hr",
     "czech" : "cz",
@@ -249,8 +250,10 @@
     "nl" : "dutch",
     "nn" : "norwegian",
     "oc" : "occitan",
+    "or": "odia",
     "pl" : "polish",
     "pms" : "piedmontese",
+    "pa" : "punjabi",
     "pt" : "portuguese",
     "pt-BR" : "portuguese",
     "pt-PT" : "portuguese",
@@ -262,7 +265,6 @@
     "sa" : "sanskrit",
     "sa-Deva" : "sanskrit",
     "sa-Beng" : "sanskrit",
-    "sa-Deva" : "sanskrit",
     "sa-Gujr" : "sanskrit",
     "sa-Knda" : "sanskrit",
     "sa-Mlym" : "sanskrit",
@@ -281,6 +283,7 @@
     "th" : "thai",
     "tk" : "turkmen",
     "tr" : "turkish",
+    "ug" : "uyghur",
     "uk" : "ukrainian",
     "ur" : "urdu",
     "vi" : "vietnamese",
@@ -428,34 +431,33 @@ def generate_aliases():
         glossval = gloss + ":" + val
         if val in bcp472opts:
             addition = ("\\setlanguagealias*[%s]{%s}{%s}" % (bcp472opts[val], gloss, val))
-        for line in fileinput.FileInput(file_path,inplace=1):
-            if not glossval in aliases and not fertig and "% BCP-47 compliant aliases\n" in line:
+        for line in fileinput.FileInput(file_path,inplace=True):
+            if glossval not in aliases and not fertig and "% BCP-47 compliant aliases\n" in line:
                 line = line.replace(line, line + addition + "\n")
                 logging.debug("replace line: %s" % line)
                 fertig = True
                 aliases.append(glossval)
-            print line,
+            print(line, end="")
         if not fertig:
             addition = "% BCP-47 compliant aliases\n" + addition
-            for line in fileinput.FileInput(file_path,inplace=1):
-                if not glossval in aliases and not fertig and line == "}\n":
+            for line in fileinput.FileInput(file_path,inplace=True):
+                if glossval not in aliases and not fertig and line == "}\n":
                     line = line.replace(line, line + "\n" + addition)
                     logging.debug("replace line: %s" % line)
                     fertig = True
                     aliases.append(glossval)
-                print line,
+                print(line, end="")
 
 def generate_ids():
-    aliases = []
     for key in babelname2bcp47:
         val = babelname2bcp47[key]
         gloss = key
         addition = ("  bcp47=%s,\n" % val)
         file_path = "../tex/" + ("gloss-%s.ldf" % gloss)
-        for line in fileinput.FileInput(file_path,inplace=1):
+        for line in fileinput.FileInput(file_path,inplace=True):
             if "\\PolyglossiaSetup{" in line:
                 line = line.replace(line, line + addition)
-            print line,
+            print(line, end="")
 
 def generate_table():
     f = open("bcp47table.tex","w+")
@@ -470,13 +472,10 @@ def generate_table():
     f.write("\\textbf{BCP-47 tag} & \\textbf{Polyglossia name} & \\textbf{Polyglossia options}\\\\\n")
     f.write("\\midrule\n")
     f.write("\\endhead\n")
-    aliases = []
     for key, gloss in sorted(bcp472lang.items()):
         val = key
-        fertig = False
         col1 = val
         col2 = gloss
-        glossval = gloss + ":" + val
         col3 = ""
         if val in bcp472opts:
             col3 = bcp472opts[val]