merge with stable

hgext/histedit.py

@@ -163,6 +163,7 b' command = cmdutil.command(cmdtable)'
 
 testedwith = 'internal'
 
+# i18n: command names and abbreviations must remain untranslated
 editcomment = _("""# Edit history between %s and %s
 #
 # Commands:

i18n/pt_BR.po

@@ -3890,14 +3890,14 b' msgid ""'
 " #  m, mess = edit message without changing commit content\n"
 " #"
 msgstr ""
-" # Edit history between 633536316234 and 7c2fd3b9020c\n"
+" # Editar o histórico entre 633536316234 e 7c2fd3b9020c\n"
 " #\n"
-" # Commands:\n"
-" #  p, pick = use commit\n"
-" #  e, edit = use commit, but stop for amending\n"
-" #  f, fold = use commit, but fold into previous commit\n"
-" #  d, drop = remove commit from history\n"
-" #  m, mess = edit message without changing commit content\n"
+" # Comandos:\n"
+" #  p, pick = use a revisão\n"
+" #  e, edit = use a revisão, mas pare para emendar\n"
+" #  f, fold = use a revisão, mas combine com a anterior\n"
+" #  d, drop = remova a revisão do histórico\n"
+" #  m, mess = edite a mensagem sem mudar o conteúdo da revisão\n"
 " #"
 
 msgid ""
@@ -4097,6 +4097,29 b' msgstr ""'
 "um repositório que o Mercurial detectar como não relacionado ao de\n"
 "origem, você pode adicionar uma opção ``--force``.\n"
 
+#. i18n: command names and abbreviations must remain untranslated
+#, python-format
+msgid ""
+"# Edit history between %s and %s\n"
+"#\n"
+"# Commands:\n"
+"#  p, pick = use commit\n"
+"#  e, edit = use commit, but stop for amending\n"
+"#  f, fold = use commit, but fold into previous commit (combines N and N-1)\n"
+"#  d, drop = remove commit from history\n"
+"#  m, mess = edit message without changing commit content\n"
+"#\n"
+msgstr ""
+"# Editar o histórico entre %s e %s\n"
+"#\n"
+"# Comandos:\n"
+"#  p, pick = use a revisão\n"
+"#  e, edit = use a revisão, mas pare para emendar\n"
+"#  f, fold = use a revisão, mas combine com a anterior (combina N e N-1)\n"
+"#  d, drop = remova a revisão do histórico\n"
+"#  m, mess = edite a mensagem sem mudar o conteúdo da revisão\n"
+"# #\n"
+
 msgid "cannot edit history that would orphan nodes"
 msgstr "não é possível editar histórico de forma a produzir nós órfãos"
 
@@ -8039,12 +8062,8 b' msgstr "continua um rebaseamento interro'
 msgid "abort an interrupted rebase"
 msgstr "aborta um rebaseamento interrompido"
 
-msgid ""
-"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
-"hg rebase {-a|-c}"
-msgstr ""
-"hg rebase [-s REV | -b REV] [-d REV] [opções]\n"
-"hg rebase {-a|-c}"
+msgid "[-s REV | -b REV] [-d REV] [OPTION]"
+msgstr "[-s REV | -b REV] [-d REV] [OPÇÃO]"
 
 msgid "move changeset (and descendants) to a different branch"
 msgstr "move a revisão (e descendentes) para um ramo diferente"
@@ -8755,6 +8774,10 b' msgid "fix up the merge and run hg trans'
 msgstr "conserte a mesclagem e execute hg transplant --continue"
 
 #, python-format
+msgid "skipping emptied changeset %s\n"
+msgstr "omitindo revisão resultante vazia %s\n"
+
+#, python-format
 msgid "%s transplanted as %s\n"
 msgstr "%s transplantado em %s\n"
 
@@ -18117,22 +18140,6 b' msgstr ""'
 "    allow_push é examinado após a lista deny_push."
 
 msgid ""
-"``guessmime``\n"
-"    Control MIME types for raw download of file content.\n"
-"    Set to True to let hgweb guess the content type from the file\n"
-"    extension. This will serve HTML files as ``text/html`` and might\n"
-"    allow cross-site scripting attacks when serving untrusted\n"
-"    repositories. Default is False."
-msgstr ""
-"``guessmime``\n"
-"    Controla tipos MIME para download inalterado do conteúdo de\n"
-"    arquivos. Use True para permitir que o hgweb determine o tipo de\n"
-"    conteúdo a partir da extensão do arquivo. Isto servirá arquivos\n"
-"    HTML como ``text/html``, e portanto pode permitir ataques de\n"
-"    cross-site scripting (XSS) ao servir repositórios não confiáveis.\n"
-"    O padrão é False."
-
-msgid ""
 "``allow_read``\n"
 "    If the user has not already been denied repository access due to\n"
 "    the contents of deny_read, this list determines whether to grant\n"
@@ -18266,6 +18273,20 b' msgstr ""'
 "    subdiretório. O padrão é False."
 
 msgid ""
+"``comparisoncontext``\n"
+"    Number of lines of context to show in side-by-side file comparison. If\n"
+"    negative or the value ``full``, whole files are shown. Default is 5.\n"
+"    This setting can be overridden by a ``context`` request parameter to the\n"
+"    ``comparison`` command, taking the same values."
+msgstr ""
+"``comparisoncontext``\n"
+"    Número de linhas de contexto a serem exibidas em comparações lado a\n"
+"    lado. Se negativo, ou com o valor ``full``, serão exibidos arquivos\n"
+"    completos. O padrão é 5.\n"
+"    Esta configuração pode ser redefinida por um parâmetro ``context`` do\n"
+"    pedido para o comando ``comparison``, recebendo os mesmos valores."
+
+msgid ""
 "``contact``\n"
 "    Name or email address of the person in charge of the repository.\n"
 "    Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty."
@@ -18364,18 +18385,20 b' msgstr ""'
 "    Onde escrever o log de erros. O padrão é a saída de erros (stderr)."
 
 msgid ""
-"``comparisoncontext``\n"
-"    Number of lines of context to show in side-by-side file comparison. If\n"
-"    negative or the value ``full``, whole files are shown. Default is 5.\n"
-"    This setting can be overridden by a ``context`` request parameter to the\n"
-"    ``comparison`` command, taking the same values."
-msgstr ""
-"``comparisoncontext``\n"
-"    Número de linhas de contexto a serem exibidas em comparações lado a\n"
-"    lado. Se negativo, ou com o valor ``full``, serão exibidos arquivos\n"
-"    completos. O padrão é 5.\n"
-"    Esta configuração pode ser redefinida por um parâmetro ``context`` do\n"
-"    pedido para o comando ``comparison``, recebendo os mesmos valores."
+"``guessmime``\n"
+"    Control MIME types for raw download of file content.\n"
+"    Set to True to let hgweb guess the content type from the file\n"
+"    extension. This will serve HTML files as ``text/html`` and might\n"
+"    allow cross-site scripting attacks when serving untrusted\n"
+"    repositories. Default is False."
+msgstr ""
+"``guessmime``\n"
+"    Controla tipos MIME para download inalterado do conteúdo de\n"
+"    arquivos. Use True para permitir que o hgweb determine o tipo de\n"
+"    conteúdo a partir da extensão do arquivo. Isto servirá arquivos\n"
+"    HTML como ``text/html``, e portanto pode permitir ataques de\n"
+"    cross-site scripting (XSS) ao servir repositórios não confiáveis.\n"
+"    O padrão é False."
 
 msgid ""
 "``hidden``\n"
@@ -18417,15 +18440,6 b' msgstr ""'
 "    ``http://mercurial.selenic.com/`` será usada."
 
 msgid ""
-"``name``\n"
-"    Repository name to use in the web interface. Default is current\n"
-"    working directory."
-msgstr ""
-"``name``\n"
-"    Nome do repositório a ser usado na interface web. Por padrão é\n"
-"    o nome do diretório de trabalho."
-
-msgid ""
 "``maxchanges``\n"
 "    Maximum number of changes to list on the changelog. Default is 10."
 msgstr ""
@@ -18440,6 +18454,24 b' msgstr ""'
 "    Numero máximo de arquivos listados por revisão. O padrão é 10."
 
 msgid ""
+"``maxshortchanges``\n"
+"    Maximum number of changes to list on the shortlog, graph or filelog\n"
+"    pages. Default is 60."
+msgstr ""
+"``maxshortchanges``\n"
+"    Número máximo de mudanças listadas nas páginas shortlog, graph ou\n"
+"    filelog. O padrão é 60."
+
+msgid ""
+"``name``\n"
+"    Repository name to use in the web interface. Default is current\n"
+"    working directory."
+msgstr ""
+"``name``\n"
+"    Nome do repositório a ser usado na interface web. Por padrão é\n"
+"    o nome do diretório de trabalho."
+
+msgid ""
 "``port``\n"
 "    Port to listen on. Default is 8000."
 msgstr ""

i18n/ru.po

@@ -173,7 +173,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2012-08-01 18:47+0400\n"
+"POT-Creation-Date: 2012-08-03 17:58+0400\n"
 "PO-Revision-Date: 2011-05-12 23:48+0400\n"
 "Last-Translator: Alexander Sauta <[e-mail]>\n"
 "Language-Team: Russian\n"
@@ -4036,7 +4036,6 b' msgstr ""'
 " pick 030b686bedc4 Add gamma\n"
 " pick 7c2fd3b9020c Add delta"
 
-# this output is not localized yet
 msgid ""
 " # Edit history between 633536316234 and 7c2fd3b9020c\n"
 " #\n"
@@ -4048,14 +4047,16 b' msgid ""'
 " #  m, mess = edit message without changing commit content\n"
 " #"
 msgstr ""
-" # Edit history between 633536316234 and 7c2fd3b9020c\n"
+" # Редактирование истории между 633536316234 и 7c2fd3b9020c\n"
 " #\n"
-" # Commands:\n"
-" #  p, pick = use commit\n"
-" #  e, edit = use commit, but stop for amending\n"
-" #  f, fold = use commit, but fold into previous commit\n"
-" #  d, drop = remove commit from history\n"
-" #  m, mess = edit message without changing commit content\n"
+" # Команды:\n"
+" #  p, pick = использовать ревизию\n"
+" #  e, edit = использовать ревизию, но остановиться для внесения изменений\n"
+" #  f, fold = использовать ревизию, но совместить с предыдущим набором "
+"изменений\n"
+" #  d, drop = удалить ревизию из истории\n"
+" #  m, mess = редактировать сообщение фиксации, не изменяя содержимого "
+"ревизии\n"
 " #"
 
 msgid ""
@@ -4263,6 +4264,32 b' msgstr ""'
 "хранилище, которое Mercurial не опознает как связанное с источником,\n"
 "можно использовать параметр ``--force``.\n"
 
+# NOT-SURE commit - ревизия?
+#. i18n: command names and abbreviations must remain untranslated
+#, python-format
+msgid ""
+"# Edit history between %s and %s\n"
+"#\n"
+"# Commands:\n"
+"#  p, pick = use commit\n"
+"#  e, edit = use commit, but stop for amending\n"
+"#  f, fold = use commit, but fold into previous commit (combines N and N-1)\n"
+"#  d, drop = remove commit from history\n"
+"#  m, mess = edit message without changing commit content\n"
+"#\n"
+msgstr ""
+"# Редактирование истории между %s и %s\n"
+"#\n"
+"# Команды:\n"
+"#  p, pick = использовать ревизию\n"
+"#  e, edit = использовать ревизию, но остановиться для внесения изменений\n"
+"#  f, fold = использовать ревизию, но совместить с предыдущим набором "
+"изменений (склеивает N и N-1)\n"
+"#  d, drop = удалить ревизию из истории\n"
+"#  m, mess = редактировать сообщение фиксации, не изменяя содержимого "
+"ревизии\n"
+"#\n"
+
 msgid "cannot edit history that would orphan nodes"
 msgstr "нельзя редактировать историю, если это оставляет висячие узлы"
 
@@ -8238,13 +8265,8 b' msgstr "\xd0\xbf\xd1\x80\xd0\xbe\xd0\xb4\xd0\xbe\xd0\xbb\xd0\xb6\xd0\xb8\xd1\x82\xd1\x8c \xd0\xbf\xd1\x80\xd0\xb5\xd1\x80\xd0\xb2\xd0\xb0\xd0\xbd\xd0\xbd\xd0\xbe\xd0\xb5 \xd0\xbf\xd0\xb5\xd1\x80\xd0\xb5\xd0\xb1\xd0\xb0\xd0\xb7\xd0\xb8\xd1\x80\xd0\xbe\xd0\xb2\xd0\xb0\xd0\xbd\xd0\xb8\xd0\xb5"'
 msgid "abort an interrupted rebase"
 msgstr "отменить прерванное перебазирование"
 
-# BUG one line?
-msgid ""
-"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
-"hg rebase {-a|-c}"
-msgstr ""
-"hg rebase [-s РЕВ | -b РЕВ] [-d РЕВ] [параметры]\n"
-"hg rebase {-a|-c}"
+msgid "[-s REV | -b REV] [-d REV] [OPTION]"
+msgstr "[-s РЕВ | -b РЕВ] [-d РЕВ] [ПАРАМЕТР]"
 
 msgid "move changeset (and descendants) to a different branch"
 msgstr "переместить наборы изменений (с потомками) на другую ветку"
@@ -8968,6 +8990,10 b' msgid "fix up the merge and run hg trans'
 msgstr "разрешите конфликты и запустите hg transplant --continue"
 
 #, python-format
+msgid "skipping emptied changeset %s\n"
+msgstr "пропускается ставшая пустой ревизия %s\n"
+
+#, python-format
 msgid "%s transplanted as %s\n"
 msgstr "%s пересажен как %s\n"
 
@@ -18251,21 +18277,6 b' msgstr ""'
 "    Этот список проверяется после списка deny_push."
 
 msgid ""
-"``guessmime``\n"
-"    Control MIME types for raw download of file content.\n"
-"    Set to True to let hgweb guess the content type from the file\n"
-"    extension. This will serve HTML files as ``text/html`` and might\n"
-"    allow cross-site scripting attacks when serving untrusted\n"
-"    repositories. Default is False."
-msgstr ""
-"``guessmime``\n"
-"    Контролирует MIME-типы при скачивании сырого содержимого файла.\n"
-"    Установите в True чтобы разрешить hgweb угадывать тип содержимого\n"
-"    по расширению файла. При этом HTML файлы будут отдаваться как\n"
-"    ``text/html``, и это может сделать возможными атаки межсайтового\n"
-"    скриптинга при обслуживании недоверенных хранилищ. По умолчанию False."
-
-msgid ""
 "``allow_read``\n"
 "    If the user has not already been denied repository access due to\n"
 "    the contents of deny_read, this list determines whether to grant\n"
@@ -18396,6 +18407,23 b' msgstr ""'
 "(выкл.)."
 
 msgid ""
+"``comparisoncontext``\n"
+"    Number of lines of context to show in side-by-side file comparison. If\n"
+"    negative or the value ``full``, whole files are shown. Default is 5.\n"
+"    This setting can be overridden by a ``context`` request parameter to "
+"the\n"
+"    ``comparison`` command, taking the same values."
+msgstr ""
+"``comparisoncontext``\n"
+"    Количество строк контекста, показываемого при построчном сравнении "
+"файлов.\n"
+"    Если отрицательно или ``full``, файлы показыаются целиком. По умолчанию "
+"5.\n"
+"    Это значение может быть переопределено параметром запроса ``context`` "
+"команды\n"
+"    ``comparison``, принимающей такие же значения."
+
+msgid ""
 "``contact``\n"
 "    Name or email address of the person in charge of the repository.\n"
 "    Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty."
@@ -18490,21 +18518,19 b' msgstr ""'
 "    Куда писать журнал ошибок. По умолчанию stderr."
 
 msgid ""
-"``comparisoncontext``\n"
-"    Number of lines of context to show in side-by-side file comparison. If\n"
-"    negative or the value ``full``, whole files are shown. Default is 5.\n"
-"    This setting can be overridden by a ``context`` request parameter to "
-"the\n"
-"    ``comparison`` command, taking the same values."
-msgstr ""
-"``comparisoncontext``\n"
-"    Количество строк контекста, показываемого при построчном сравнении "
-"файлов.\n"
-"    Если отрицательно или ``full``, файлы показыаются целиком. По умолчанию "
-"5.\n"
-"    Это значение может быть переопределено параметром запроса ``context`` "
-"команды\n"
-"    ``comparison``, принимающей такие же значения."
+"``guessmime``\n"
+"    Control MIME types for raw download of file content.\n"
+"    Set to True to let hgweb guess the content type from the file\n"
+"    extension. This will serve HTML files as ``text/html`` and might\n"
+"    allow cross-site scripting attacks when serving untrusted\n"
+"    repositories. Default is False."
+msgstr ""
+"``guessmime``\n"
+"    Контролирует MIME-типы при скачивании сырого содержимого файла.\n"
+"    Установите в True чтобы разрешить hgweb угадывать тип содержимого\n"
+"    по расширению файла. При этом HTML файлы будут отдаваться как\n"
+"    ``text/html``, и это может сделать возможными атаки межсайтового\n"
+"    скриптинга при обслуживании недоверенных хранилищ. По умолчанию False."
 
 msgid ""
 "``hidden``\n"
@@ -18546,15 +18572,6 b' msgstr ""'
 "    ``http://mercurial.selenic.com/``."
 
 msgid ""
-"``name``\n"
-"    Repository name to use in the web interface. Default is current\n"
-"    working directory."
-msgstr ""
-"``name``\n"
-"    Имя хранилища, используемое в веб-интерфейсе. По умолчанию\n"
-"    текущий рабочий каталог."
-
-msgid ""
 "``maxchanges``\n"
 "    Maximum number of changes to list on the changelog. Default is 10."
 msgstr ""
@@ -18570,6 +18587,25 b' msgstr ""'
 "    По умолчанию 10."
 
 msgid ""
+"``maxshortchanges``\n"
+"    Maximum number of changes to list on the shortlog, graph or filelog\n"
+"    pages. Default is 60."
+msgstr ""
+"``maxshortchanges``\n"
+"    Максимальное количество изменений, показываемых в короткой истории,\n"
+"    графе или истории файла (shortlog, graph, filelog pages). По умолчанию "
+"60."
+
+msgid ""
+"``name``\n"
+"    Repository name to use in the web interface. Default is current\n"
+"    working directory."
+msgstr ""
+"``name``\n"
+"    Имя хранилища, используемое в веб-интерфейсе. По умолчанию\n"
+"    текущий рабочий каталог."
+
+msgid ""
 "``port``\n"
 "    Port to listen on. Default is 8000."
 msgstr ""
@@ -24645,6 +24681,14 b' msgstr "\xd0\xbf\xd0\xbe\xd0\xb8\xd1\x81\xd0\xba \xd0\xbe\xd1\x82\xd0\xb4\xd0\xb0\xd0\xbb\xd0\xb5\xd0\xbd\xd0\xbd\xd1\x8b\xd1\x85 \xd0\xb8\xd0\xb7\xd0\xbc\xd0\xb5\xd0\xbd\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb9"'
 msgid "push failed:"
 msgstr "ошибка при проталкивании:"
 
+# BUG one line?
+#~ msgid ""
+#~ "hg rebase [-s REV | -b REV] [-d REV] [options]\n"
+#~ "hg rebase {-a|-c}"
+#~ msgstr ""
+#~ "hg rebase [-s РЕВ | -b РЕВ] [-d РЕВ] [параметры]\n"
+#~ "hg rebase {-a|-c}"
+
 #~ msgid ""
 #~ "``unstable()``\n"
 #~ "    Unstable changesets are non-obsolete with obsolete descendants."