Browse Source

Merge branch 'maint'

Conflicts:
	lisp/ox.el
Nicolas Goaziou 10 years ago
parent
commit
a2f8a48ab5
1 changed files with 17 additions and 1 deletions
  1. 17 1
      lisp/ox.el

+ 17 - 1
lisp/ox.el

@@ -5222,6 +5222,7 @@ them."
      ("nb" :default "Forfatter")
      ("nn" :default "Forfattar")
      ("pl" :default "Autor")
+     ("pt_BR" :default "Autor")
      ("ru" :html "Автор" :utf-8 "Автор")
      ("sv" :html "Författare")
      ("uk" :html "Автор" :utf-8 "Автор")
@@ -5265,6 +5266,7 @@ them."
      ("nb" :default "Dato")
      ("nn" :default "Dato")
      ("pl" :default "Data")
+     ("pt_BR" :default "Data")
      ("ru" :html "Дата" :utf-8 "Дата")
      ("sv" :default "Datum")
      ("uk" :html "Дата" :utf-8 "Дата")
@@ -5280,6 +5282,7 @@ them."
      ("no" :default "Ligning")
      ("nb" :default "Ligning")
      ("nn" :default "Likning")
+     ("pt_BR" :html "Equação" :default "Equação" :ascii "Equacao")
      ("ru" :html "Уравнение"
       :utf-8 "Уравнение")
      ("sv" :default "Ekvation")
@@ -5293,6 +5296,7 @@ them."
      ("no" :default "Illustrasjon")
      ("nb" :default "Illustrasjon")
      ("nn" :default "Illustrasjon")
+     ("pt_BR" :default "Figura")
      ("ru" :html "Рисунок" :utf-8 "Рисунок")
      ("sv" :default "Illustration")
      ("zh-CN" :html "图" :utf-8 "图"))
@@ -5306,6 +5310,7 @@ them."
      ("no" :default "Illustrasjon %d")
      ("nb" :default "Illustrasjon %d")
      ("nn" :default "Illustrasjon %d")
+     ("pt_BR" :default "Figura %d:")
      ("ru" :html "Рис. %d.:" :utf-8 "Рис. %d.:")
      ("sv" :default "Illustration %d")
      ("zh-CN" :html "图%d " :utf-8 "图%d "))
@@ -5328,6 +5333,7 @@ them."
      ("nb" :default "Fotnoter")
      ("nn" :default "Fotnotar")
      ("pl" :default "Przypis")
+     ("pt_BR" :html "Notas de Rodapé" :default "Notas de Rodapé" :ascii "Notas de Rodape")
      ("ru" :html "Сноски" :utf-8 "Сноски")
      ("sv" :default "Fotnoter")
      ("uk" :html "Примітки"
@@ -5356,6 +5362,7 @@ them."
      ("no" :default "Tabeller")
      ("nb" :default "Tabeller")
      ("nn" :default "Tabeller")
+     ("pt_BR" :default "Índice de Tabelas" :ascii "Indice de Tabelas")
      ("ru" :html "Список таблиц"
       :utf-8 "Список таблиц")
      ("sv" :default "Tabeller")
@@ -5369,6 +5376,7 @@ them."
      ("ja" :default "ソースコード%d:")
      ("no" :default "Dataprogram %d")
      ("nb" :default "Dataprogram %d")
+     ("pt_BR" :default "Listagem %d")
      ("ru" :html "Распечатка %d.:"
       :utf-8 "Распечатка %d.:")
      ("zh-CN" :html "代码%d " :utf-8 "代码%d "))
@@ -5382,6 +5390,8 @@ them."
      ("et" :html "Vaata peatükki %s" :utf-8 "Vaata peatükki %s")
      ("fr" :default "cf. section %s")
      ("ja" :default "セクション %s を参照")
+     ("pt_BR" :html "Veja a seção %s" :default "Veja a seção %s"
+      :ascii "Veja a secao %s")
      ("ru" :html "См. раздел %s"
       :utf-8 "См. раздел %s")
      ("zh-CN" :html "参见第%s节" :utf-8 "参见第%s节"))
@@ -5391,7 +5401,9 @@ them."
      ("et" :default "Tabel")
      ("fr" :default "Tableau")
      ("ja" :default "表" :html "表")
-     ("ru" :html "Таблица" :utf-8 "Таблица")
+     ("pt_BR" :default "Tabela")
+     ("ru" :html "Таблица"
+      :utf-8 "Таблица")
      ("zh-CN" :html "表" :utf-8 "表"))
     ("Table %d:"
      ("da" :default "Tabel %d")
@@ -5403,6 +5415,7 @@ them."
      ("no" :default "Tabell %d")
      ("nb" :default "Tabell %d")
      ("nn" :default "Tabell %d")
+     ("pt_BR" :default "Tabela %d")
      ("ru" :html "Таблица %d.:"
       :utf-8 "Таблица %d.:")
      ("sv" :default "Tabell %d")
@@ -5426,6 +5439,7 @@ them."
      ("nb" :default "Innhold")
      ("nn" :default "Innhald")
      ("pl" :html "Spis treści")
+     ("pt_BR" :html "Índice" :utf8 "Índice" :ascii "Indice")
      ("ru" :html "Содержание"
       :utf-8 "Содержание")
      ("sv" :html "Innehåll")
@@ -5439,6 +5453,8 @@ them."
      ("et" :default "Tundmatu viide")
      ("fr" :ascii "Destination inconnue" :default "Référence inconnue")
      ("ja" :default "不明な参照先")
+     ("pt_BR" :default "Referência desconhecida"
+      :ascii "Referencia desconhecida")
      ("ru" :html "Неизвестная ссылка"
       :utf-8 "Неизвестная ссылка")
      ("zh-CN" :html "未知引用" :utf-8 "未知引用")))