# HG changeset patch # User Matt Mackall # Date 1327863551 21600 # Node ID 73da3e2b185fc72ca8e9e4d4435ec94db0cafa08 # Parent 2494a8b42dfbce110feed459dd15f3cba885782c# Parent f8955a7f82e6a06a682cd95631fd1c5e55f46103 merge with i18n diff -r f8955a7f82e6 -r 73da3e2b185f i18n/pt_BR.po --- a/i18n/pt_BR.po Fri Jan 27 03:00:32 2012 +0100 +++ b/i18n/pt_BR.po Sun Jan 29 12:59:11 2012 -0600 @@ -12434,7 +12434,8 @@ " setting, or a command-line merge tool like ``diff3``. The resolve\n" " command is used to manage the files involved in a merge, after\n" " :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n" -" working directory must have two parents)." +" working directory must have two parents). See :hg:`help\n" +" merge-tools` for information on configuring merge tools." msgstr "" " Mesclagens com conflitos não resolvidos podem resultar de\n" " mesclagens não interativas usando a opção ``internal:merge``\n" @@ -12443,7 +12444,9 @@ " O comando resolve é usado para gerenciar os arquivos envolvidos\n" " em uma mesclagem, após a execução de :hg:`merge` e antes da\n" " execução de :hg:`commit` (ou seja, enquanto o diretório de\n" -" trabalho tiver dois pais)." +" trabalho tiver dois pais).\n" +" Veja :hg:`help merge-tools` para informações sobre a\n" +" configuração de utilitários de mesclagem." msgid " The resolve command can be used in the following ways:" msgstr " O comando resolve pode ser usado das seguintes maneiras:" @@ -14167,6 +14170,9 @@ msgid "syntax for Mercurial ignore files" msgstr "sintaxe dos arquivos de padrões de arquivos ignorados" +msgid "Working with Phases" +msgstr "Trabalhando Com Fases" + msgid "" "The Mercurial system uses a set of configuration files to control\n" "aspects of its behavior." @@ -16201,11 +16207,45 @@ " não for especificado." msgid "" -"\n" +"``phases``\n" +"\"\"\"\"\"\"\"\"\"\"" +msgstr "" +"``phases``\n" +"\"\"\"\"\"\"\"\"\"\"" + +msgid "" +"Specifies default handling of phases. See :hg:`help phases` for more\n" +"information about working with phases." +msgstr "" +"Especifica o gerenciamento padrão de fases. Veja :hg:`help phases`\n" +"para mais informações sobre fases." + +msgid "" +"``publish``\n" +" Controls draft phase behavior when working as a server. When true,\n" +" pushed changesets are set to public in both client and server and\n" +" pulled or cloned changesets are set to public in the client.\n" +" Default: True" +msgstr "" +"``publish``\n" +" Controla o comportamento da fase rascunho em um servidor. Se for\n" +" True, revisões enviadas usando push se tornam públicas tanto no\n" +" cliente como no servidor, e revisões recebidas usando pull ou\n" +" clone se tornam públicas no cliente. O padrão é True." + +msgid "" +"``new-commit``\n" +" Phase of newly-created commits.\n" +" Default: draft" +msgstr "" +"``new-commit``\n" +" Fase de revisões criadas usando commit.\n" +" Padrão: draft (rascunho)" + +msgid "" "``profiling``\n" "\"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" -"\n" "``profiling``\n" "\"\"\"\"\"\"\"\"\"\"\"\"\"" @@ -19308,6 +19348,187 @@ msgid "See also :hg:`help filesets`.\n" msgstr "Veja também :hg:`help filesets`.\n" +msgid "" +"What are phases?\n" +"----------------" +msgstr "" +"O que são fases?\n" +"----------------" + +msgid "" +"Phases are a system for tracking which changesets have been or should\n" +"be shared. This helps prevent common mistakes when modifying history\n" +"(for instance, with the mq or rebase extensions)." +msgstr "" +"Fases são um sistema para rastrear quais revisões foram ou\n" +"devem ser compartilhadas. Isto ajuda a prevenir erros comuns\n" +"ao modificar o histórico (usando por exemplo as extensões mq\n" +"e rebase)." + +msgid "Each changeset in a repository is in one of the following phases:" +msgstr "Cada revisão em um repositório está em uma das seguintes fases:" + +msgid "" +" - public : changeset is visible on a public server\n" +" - draft : changeset is not yet published\n" +" - secret : changeset should not be pushed, pulled, or cloned" +msgstr "" +" - public (pública): a revisão é visível em um servidor público\n" +" - draft (rascunho): a revisão ainda não foi publicada\n" +" - secret (secreta): a revisão não deve ser propagada em um clone, push ou pull" + +msgid "" +"These phases are ordered (public < draft < secret) and no changeset\n" +"can be in a lower phase than its ancestors. For instance, if a\n" +"changeset is public, all its ancestors are also public. Lastly,\n" +"changeset phases only be changed towards the public phase." +msgstr "" +"Estas fases são ordenadas (pública < rascunho < secreta) e\n" +"nenhuma revisão pode estar em uma fase menor que as de seus\n" +"ancestrais. Por exemplo, se uma revisão é pública, todos os\n" +"seus ancestrais também serão públicos. Por fim, a fase de\n" +"revisões só pode ser modificada em direção à fase pública." + +msgid "" +"How are phases managed?\n" +"-----------------------" +msgstr "" +"Como fases são gerenciadas?\n" +"---------------------------" + +msgid "" +"For the most part, phases should work transparently. By default, a\n" +"changeset is created in the draft phase and is moved into the public\n" +"phase when it is pushed to another repository." +msgstr "" +"Na maior parte, fases devem funcionar de forma transparente.\n" +"Por padrão, uma revisão é criada na fase rascunho, e movida\n" +"para a fase pública quando for enviada para outro repositório." + +msgid "" +"Once changesets become public, extensions like mq and rebase will\n" +"refuse to operate on them to prevent creating duplicate changesets.\n" +"Phases can also be manually manipulated with the :hg:`phase` command\n" +"if needed. See :hg:`help -v phase` for examples." +msgstr "" +"Uma vez que revisões se tornem públicas, extensões como mq e\n" +"rebase se recusarão a operar sobre elas, para impedir a criação\n" +"de revisões duplicadas. Se necessário, fases também podem ser\n" +"manipuladas usando o comando :hg:`phase`.\n" +"Veja :hg:`help -v phase` para alguns exemplos." + +msgid "" +"Phases and servers\n" +"------------------" +msgstr "" +"Fases e servidores\n" +"------------------" + +msgid "Normally, all servers are ``publishing`` by default. This means::" +msgstr "" +"Normalmente, todos os servidores são por padrão ``publishing``\n" +"(\"de publicação\"). Isto quer dizer que::" + +msgid "" +" - all draft changesets that are pulled or cloned appear in phase\n" +" public on the client" +msgstr "" +" - todas as revisões na fase rascunho que forem trazidas desse\n" +" servidor usando pull ou clone aparecerão no cliente na fase\n" +" pública" + +msgid "" +" - all draft changesets that are pushed appear as public on both\n" +" client and server" +msgstr "" +" - todas as revisões na fase rascunho que forem enviadas para esse\n" +" servidor aparecerão como públicas tanto no cliente como no servidor" + +msgid " - secret changesets are neither pushed, pulled, or cloned" +msgstr "" +" - revisões na fase secreta não são transmitidas com push, pull ou clone" + +msgid "" +".. note::\n" +" Pulling a draft changeset from a publishing server does not mark it\n" +" as public on the server side due to the read-only nature of pull." +msgstr "" +".. note::\n" +" Trazer uma revisão rascunho de um servidor de publicação não a\n" +" marca como pública no servidor devido à natureza somente-leitura\n" +" do comando pull." + +msgid "" +"Sometimes it may be desirable to push and pull changesets in the draft\n" +"phase to share unfinished work. This can be done by setting a\n" +"repository to disable publishing in its configuration file::" +msgstr "" +"Às vezes pode ser desejável fazer push e pull de revisões na fase\n" +"rascunho para compartilhar trabalho não concluído. Isto pode ser\n" +"feito desabilitando a publicação de um repositório em seu arquivo\n" +"de configuração::" + +msgid "" +" [phases]\n" +" publish = False" +msgstr "" +" [phases]\n" +" publish = False" + +msgid "See :hg:`help config` for more information on config files." +msgstr "" +"Veja :hg:`help config` para mais informações sobre arquivos de configuração." + +msgid "" +".. note::\n" +" Servers running older versions of Mercurial are treated as\n" +" publishing." +msgstr "" +".. note::\n" +" Servidores executando versões mais antigas do Mercurial são\n" +" considerados como de publicação." + +msgid "" +"Examples\n" +"--------" +msgstr "" +"Exemplos\n" +"--------" + +msgid " - list changesets in draft or secret phase::" +msgstr " - lista revisões nas fases rascunho ou secreta::" + +msgid " hg log -r \"not public()\"" +msgstr " hg log -r \"not public()\"" + +msgid " - change all secret changesets to draft::" +msgstr " - muda todas as revisões secretas para rascunho::" + +msgid " hg phase --draft \"secret()\"" +msgstr " hg phase --draft \"secret()\"" + +msgid "" +" - forcibly move the current changeset and descendants from public to " +"draft::" +msgstr "" +" - força a passagem da revisão atual e seus descendentes da fase pública " +"para a rascunho::" + +msgid " hg phase --force --draft ." +msgstr " hg phase --force --draft ." + +msgid " - show a list of changeset revision and phase::" +msgstr " - mostra uma lista de números de revisão e suas respectivas fases::" + +msgid " hg log --template \"{rev} {phase}\\n\"" +msgstr " hg log --template \"{rev} {phase}\\n\"" + +msgid "" +"See :hg:`help phase` for more information on manually manipulating phases.\n" +msgstr "" +"Veja :hg:`help phase` para mais informações sobre como manipular\n" +"fases manualmente.\n" + msgid "Mercurial supports several ways to specify individual revisions." msgstr "" "O Mercurial aceita diversas notações para identificar revisões\n" @@ -21408,19 +21629,19 @@ msgstr "public não tem argumentos" msgid "" -"``remote([id], [path])``\n" +"``remote([id [,path]])``\n" " Local revision that corresponds to the given identifier in a\n" " remote repository, if present. Here, the '.' identifier is a\n" " synonym for the current local branch." msgstr "" -"``remote([id], [caminho])``\n" +"``remote([id] [,caminho])``\n" " Revisão local que corresponda ao identificador dado em um\n" " repositório remoto, se presente. Aqui, o identificador '.' é um\n" " sinônimo para o ramo local atual." #. i18n: "remote" is a keyword -msgid "remote takes one or two arguments" -msgstr "remote recebe um ou dois argumentos" +msgid "remote takes one, two or no arguments" +msgstr "remote recebe nenhum, um ou dois argumentos" #. i18n: "remote" is a keyword msgid "remote requires a string id" @@ -21710,8 +21931,11 @@ msgstr "erro de certificado ssl em %s: nenhum certificado recebido" #, python-format -msgid "invalid certificate for %s with fingerprint %s" -msgstr "certificado inválido para %s com impressão digital %s" +msgid "certificate for %s has unexpected fingerprint %s" +msgstr "certificado para %s tem impressão digital inesperada %s" + +msgid "check hostfingerprint configuration" +msgstr "verifique a configuração hostfingerprint" #, python-format msgid "%s certificate error: %s" diff -r f8955a7f82e6 -r 73da3e2b185f i18n/ru.po --- a/i18n/ru.po Fri Jan 27 03:00:32 2012 +0100 +++ b/i18n/ru.po Sun Jan 29 12:59:11 2012 -0600 @@ -170,7 +170,7 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-08 13:29+0400\n" +"POT-Creation-Date: 2012-01-27 11:03+0400\n" "PO-Revision-Date: 2011-05-12 23:48+0400\n" "Last-Translator: Alexander Sauta \n" "Language-Team: Russian\n" @@ -2421,7 +2421,8 @@ "внимание: комментарий фиксации CVS ссылается на несуществующую ветку %r:\n" "%s\n" -#, fuzzy, python-format +# NOT-SURE +#, python-format msgid "%d changeset entries\n" msgstr "%d наборов изменений\n" @@ -2517,7 +2518,8 @@ msgid "initializing destination %s repository\n" msgstr "инициализация хранилища назначения %s\n" -#, fuzzy, python-format +# NOT-SURE +#, python-format msgid "could not create hg repository %s as sink" msgstr "не удается создать хранилище-приемник Mercurial %s" @@ -2602,8 +2604,9 @@ "PATH содержит путь к hg" #, python-format +# NOT-SURE msgid "log stream exception '%s'" -msgstr "" +msgstr "исключение '%s' в итераторе потока" msgid "" "svn: cannot probe remote repository, assume it could be a subversion " @@ -4891,9 +4894,10 @@ msgid "apply failed for patch %s" msgstr "не удалось наложить патч %s" -#, fuzzy, python-format +# NOT-SURE +#, python-format msgid "patch didn't work out, merging %s\n" -msgstr "патч не сработал, сливаем %s\n" +msgstr "не удалось наложить патч, сливаем %s\n" #, python-format msgid "update returned %d" @@ -4951,7 +4955,8 @@ msgid "revision %d is not managed" msgstr "ревизия %d не контролируется" -#, fuzzy, python-format +# NOT-SURE +#, python-format msgid "cannot delete revision %d above applied patches" msgstr "невозможно удалить ревизию %d поверх наложенных патчей" @@ -5828,10 +5833,9 @@ msgid "merge queue name (DEPRECATED)" msgstr "имя очереди слияния (УСТАРЕЛО)" -# может, единственный патч? совмещенный патч? -#, fuzzy msgid "reorder patch series and apply only the patch" -msgstr "переупорядочить последовательность патчей и наложить только патч" +msgstr "" +"переупорядочить последовательность патчей и наложить только данный патч" msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" msgstr "hg qpush [-f] [-l] [-a] [--move] [ПАТЧ | ИНДЕКС]" @@ -7620,8 +7624,8 @@ msgid "warning: immutable rebased changeset detected, can't abort\n" msgstr "" -"внимание: обнаружены неизменяемые перебазированные наборы изменений, " -"нельзя прервать\n" +"внимание: обнаружены неизменяемые перебазированные наборы изменений, нельзя " +"прервать\n" msgid "warning: new changesets detected on target branch, can't abort\n" msgstr "" @@ -8810,10 +8814,10 @@ msgid "%s: no key named '%s'" msgstr "%s: нет ключа с именем '%s'" -# может, не из а от? -#, fuzzy, python-format +# NOT-SURE от или из? +#, python-format msgid "Found revision %s from %s\n" -msgstr "найдена ревизия %s из %s\n" +msgstr "Найдена ревизия %s от %s\n" msgid "revision matching date not found" msgstr "не найдена ревизия для данной даты" @@ -9657,6 +9661,10 @@ " current active bookmark will be marked inactive.\n" " " msgstr "" +" Если указан -i/--inactive, новая закладка не будет сделана активной.\n" +" Если указан -r/--rev, новая закладка не будет активной, даже если\n" +" -i/--inactive не задан. Если не указано ИМЯ, текущая активная закладка\n" +" будет помечена как неактивная. " msgid "bookmark name required" msgstr "укажите имя закладки" @@ -10260,7 +10268,7 @@ msgstr "требуются два или три аргумента" # {{{ Debug commands -#, fuzzy +# NOT-SURE msgid "add single file mergeable changes" msgstr "добавить единственный файл, объединяющий изменения" @@ -10979,17 +10987,16 @@ " уже была применена операция graft, а также ревизии слияния будут\n" " пропущены." -#, fuzzy msgid "" " If a graft merge results in conflicts, the graft process is\n" " interrupted so that the current merge can be manually resolved.\n" " Once all conflicts are addressed, the graft process can be\n" " continued with the -c/--continue option." msgstr "" -" Если во время операции возникает конфликт, операция отменяется для\n" -" того, чтобы текущее слияние было завершено вручную. После разрешения\n" -" всех конфликтов, можно продолжить процесс с помощью параметра\n" -" -c/--continue." +" Если во время операции graft возникает конфликт, операция отменяется\n" +" для того, чтобы текущее слияние было завершено вручную. После\n" +" разрешения всех конфликтов, можно продолжить процесс с помощью\n" +" параметра -c/--continue." msgid "" " .. note::\n" @@ -12010,8 +12017,8 @@ " configuration files. See :hg:`help merge-tools` for options." msgstr "" " С помощью ``--tool`` можно задать инструмент для слияния файлов.\n" -" Она заменяет переменную окружения HGEMERGT и настройки конфига.\n" -" Подробнее см. :hg:``help merge-tool``." +" Она заменяет переменную окружения HGMERGE и настройки конфига.\n" +" Подробнее см. :hg:``help merge-tools``." msgid "" " If no revision is specified, the working directory's parent is a\n" @@ -13488,7 +13495,7 @@ msgid "update working directory (or switch revisions)" msgstr "обновить рабочий каталог (или переключить ревизию)" -#, fuzzy +# NOT-SURE update вроде не двигает закладки? msgid "" " Update the repository's working directory to the specified\n" " changeset. If no changeset is specified, update to the tip of the\n" @@ -13497,7 +13504,7 @@ msgstr "" " Обновляет рабочую копию хранилища на указанную ревизию. Если\n" " ревизия не задана, обновляет до оконечной ревизии (tip) текущей\n" -" именованной ветки и перемещает текущую заплатку (см. :hg:`help\n" +" именованной ветки и перемещает текущую закладку (см. :hg:`help\n" " bookmarks`)." msgid "" @@ -13990,9 +13997,9 @@ " не найден инструмент для слияния %s\n" "использовать локальный файл:(l)ocal или взять другой:(o)ther?" -#, fuzzy, python-format +#, python-format msgid "%s.premerge not valid ('%s' is neither boolean nor %s)" -msgstr "некорректный %s.premerge ('%s' не логический и не %s)" +msgstr "некорректный параметр %s.premerge ('%s' не логический и не %s)" # PROMPT #, python-format @@ -15740,7 +15747,7 @@ "``hooks``\n" "\"\"\"\"\"\"\"\"\"" -#, fuzzy +# NOT-SURE site-wide - ? msgid "" "Commands or Python functions that get automatically executed by\n" "various actions such as starting or finishing a commit. Multiple\n" @@ -15752,18 +15759,16 @@ "not specified." msgstr "" "Команды или функции Python, вызываемые автоматически при различных\n" -"действиях, таких как начало или конец фиксации. Можно задавать несколько\n" -"хуков для одного и того же действия, добавляя к действию суффикс.\n" +"действиях, таких как начало или завершение фиксации. Можно задавать\n" +"несколько хуков для одного и того же действия, добавляя к действию суффикс.\n" "Можно переопределить глобальный хук, изменив его значения или задав\n" -"для него пустую строку. Hooks can be prioritized\n" -"by adding a prefix of ``priority`` to the hook name on a new line\n" -"and setting the priority. The default priority is 0 if\n" -"not specified." +"для него пустую строку. Для хука можно задать приоритет, добавив\n" +"префикс ``priority`` к имени хука в отдельной строке и задав приоритет.\n" +"Если приоритет не указан, используется значение по умолчанию - 0." msgid "Example ``.hg/hgrc``::" msgstr "Пример ``.hg/hgrc``::" -#, fuzzy msgid "" " [hooks]\n" " # update working directory after adding changesets\n" @@ -15782,7 +15787,7 @@ " incoming =\n" " incoming.email = /my/email/hook\n" " incoming.autobuild = /my/build/hook\n" -" # force autobuild hook to run before other incoming hooks\n" +" # выполнять хук autobuild перед другими хуками incoming\n" " priority.incoming.autobuild = 1" msgid "" @@ -18984,7 +18989,7 @@ "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" "Возможные инструменты слияния\n" -"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" msgid "" "External merge tools and their properties are configured in the\n" @@ -19093,7 +19098,7 @@ "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" "Выбор инструмента слияния\n" -"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" msgid "Mercurial uses these rules when deciding which merge tool to use:" msgstr "Mercurial использует следующие правила при выбора программы слияния:" @@ -19641,11 +19646,11 @@ " и не входящие в помеченный релиз::" msgid "" -" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())" -"\"\n" -msgstr "" -" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())" -"\"\n" +" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged" +"())\"\n" +msgstr "" +" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged" +"())\"\n" msgid "" "Subrepositories let you nest external repositories or projects into a\n" @@ -20193,11 +20198,11 @@ " Команда push сначала ищет путь с именем `default-push` и предпочтет\n" " использовать его вместо 'default', если оба определены.\n" -#, fuzzy +# NOT-SURE msgid "remote branch lookup not supported" msgstr "поиск отдаленных веток не поддерживается" -#, fuzzy +# NOT-SURE msgid "dirstate branch not accessible" msgstr "нет доступа к ветке с dirstate" @@ -20243,20 +20248,19 @@ #, python-format msgid "" "%d files updated, %d files merged, %d files removed, %d files unresolved\n" -msgstr "" -"%d файлов обновлено, %d слито, %d удалено, %d c конфликтами\n" +msgstr "%d файлов обновлено, %d слито, %d удалено, %d c конфликтами\n" msgid "use 'hg resolve' to retry unresolved file merges\n" msgstr "" "используйте 'hg resolve' чтобы повторить слияние файлов с конфликтами\n" -#, fuzzy +# NOT-SURE отменить слияние или оставить как есть? msgid "" "use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to " "abandon\n" msgstr "" -"используйте 'hg resolve' чтобы повторить слияние файлов с конфликтами или 'hg " -"update -C .' чтобы отменить слияние\n" +"используйте 'hg resolve' чтобы повторить слияние файлов с конфликтами или " +"'hg update -C .' чтобы отменить слияние\n" msgid "(branch merge, don't forget to commit)\n" msgstr "(слияние веток, не забудьте зафиксировать)\n" @@ -20419,7 +20423,8 @@ msgid ".hg/sharedpath points to nonexistent directory %s" msgstr ".hg/sharedpath указывает на несуществующий каталог %s" -#, fuzzy, python-format +# NOT-SURE что такое рабочий родитель? +#, python-format msgid "warning: ignoring unknown working parent %s!\n" msgstr "внимание: игнорируется неизвестный рабочий родитель %s!\n" @@ -20455,11 +20460,13 @@ msgid "no rollback information available\n" msgstr "нет доступной информации для отката\n" -#, fuzzy, python-format +# NOT-SURE откачена - не по-русски. И вообще это так? +#, python-format msgid "repository tip rolled back to revision %s (undo %s: %s)\n" msgstr "оконечная ревизия откачена на ревизию %s (отменен %s: %s)\n" -#, fuzzy, python-format +# NOT-SURE откачена - не по-русски. И вообще это так? +#, python-format msgid "repository tip rolled back to revision %s (undo %s)\n" msgstr "оконечная ревизия откачена на ревизию %s (отменен %s)\n" @@ -20581,11 +20588,12 @@ msgid "adding file changes\n" msgstr "добавляем изменения в файлы\n" -#, fuzzy +# NOT-SURE msgid "received file revlog group is empty" msgstr "полученная группа revlog файла пуста" -#, fuzzy, python-format +# NOT-SURE +#, python-format msgid "missing file data for %s:%s - run hg verify" msgstr "отсутствуют данные файлов для %s:%s - выполните hg verify" @@ -20609,7 +20617,7 @@ msgid "the server sent an unknown error code" msgstr "сервер передал неизвестный код ошибки" -#, fuzzy +# NOT-SURE msgid "streaming all changes\n" msgstr "поточная передача всех изменений\n" @@ -20652,7 +20660,8 @@ msgid "%r specified as email transport, but not in PATH" msgstr "%r задан в качестве транспорта email, но он не доступен в PATH" -#, fuzzy, python-format +# NOT-SURE +#, python-format msgid "ignoring invalid sendcharset: %s\n" msgstr "игнорируется неверная кодировка исходящих писем: %s\n" @@ -20679,7 +20688,8 @@ msgid "invalid pattern" msgstr "недопустимый шаблон" -#, fuzzy, python-format +# NOT-SURE что за список? почему file а не files? +#, python-format msgid "unable to read file list (%s)" msgstr "не удается прочитать список файлов (%s)" @@ -20695,10 +20705,11 @@ msgid "" "untracked files in working directory differ from files in requested revision" msgstr "" -"неотслеживаемые файлы в рабочем каталоге отличаются от файлов в запрашиваемой\n" -"ревизии: '%s'" - -#, fuzzy, python-format +"неотслеживаемые файлы в рабочем каталоге отличаются от файлов в " +"запрашиваемой ревизии" + +# NOT-SURE такой смысл? или конфликт преобразования регистров? +#, python-format msgid "case-folding collision between %s and %s" msgstr "конфликт регистров букв между %s и %s" @@ -21592,7 +21603,8 @@ msgid "ui.portablefilenames value is invalid ('%s')" msgstr "недопустимое значение ui.portablefilenames ('%s')" -#, fuzzy, python-format +# NOT-SURE +#, python-format msgid "possible case-folding collision for %s" msgstr "возможен конфликт при свертке регистра букв в %s" @@ -21641,12 +21653,11 @@ msgid "all local heads known remotely\n" msgstr "все локальные головы известны на отдаленной стороне\n" -#, fuzzy +# NOT-SURE msgid "sampling from both directions\n" msgstr "выборка из обоих направлений\n" -# такая форма? -#, fuzzy +# NOT-SURE такая форма? msgid "queries" msgstr "запросов" @@ -21729,9 +21740,10 @@ msgstr "" "внимание: сертификат %s не может быть проверен (Python слишком старый)\n" +# BUG здесь %s - имя локального хоста #, python-format msgid "%s ssl connection error" -msgstr "" +msgstr "%s - ошибка ssl" #, python-format msgid "%s certificate error: no certificate received" @@ -21748,8 +21760,8 @@ #, python-format msgid "configure hostfingerprint %s or use --insecure to connect insecurely" msgstr "" -"настройте отпечатки пальцев хоста %s или используйте --insecure для небезопасного " -"подключения" +"настройте отпечатки пальцев хоста %s или используйте --insecure для " +"небезопасного подключения" #, python-format msgid "" @@ -22246,9 +22258,10 @@ msgid "style not found: %s" msgstr "стиль не найден: %s" -#, fuzzy, python-format +# NOT-SURE так? +#, python-format msgid "\"%s\" not in template map" -msgstr "\"%s\" не в отображении шаблона" +msgstr "\"%s\" отсутсвует в сопоставлении шаблона" #, python-format msgid "template file %s: %s" diff -r f8955a7f82e6 -r 73da3e2b185f mercurial/commands.py --- a/mercurial/commands.py Fri Jan 27 03:00:32 2012 +0100 +++ b/mercurial/commands.py Sun Jan 29 12:59:11 2012 -0600 @@ -4603,7 +4603,8 @@ setting, or a command-line merge tool like ``diff3``. The resolve command is used to manage the files involved in a merge, after :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the - working directory must have two parents). + working directory must have two parents). See :hg:`help + merge-tools` for information on configuring merge tools. The resolve command can be used in the following ways: @@ -5718,7 +5719,8 @@ ret = hg.update(repo, rev) if not ret and movemarkfrom: - bookmarks.update(repo, [movemarkfrom], repo['.'].node()) + if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): + ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) elif brev in repo._bookmarks: bookmarks.setcurrent(repo, brev) diff -r f8955a7f82e6 -r 73da3e2b185f mercurial/help/config.txt --- a/mercurial/help/config.txt Fri Jan 27 03:00:32 2012 +0100 +++ b/mercurial/help/config.txt Sun Jan 29 12:59:11 2012 -0600 @@ -915,6 +915,21 @@ Optional. Directory or URL to use when pushing if no destination is specified. +``phases`` +"""""""""" + +Specifies default handling of phases. See :hg:`help phases` for more +information about working with phases. + +``publish`` + Controls draft phase behavior when working as a server. When true, + pushed changesets are set to public in both client and server and + pulled or cloned changesets are set to public in the client. + Default: True + +``new-commit`` + Phase of newly-created commits. + Default: draft ``profiling`` """"""""""""" diff -r f8955a7f82e6 -r 73da3e2b185f mercurial/help/phases.txt --- a/mercurial/help/phases.txt Fri Jan 27 03:00:32 2012 +0100 +++ b/mercurial/help/phases.txt Sun Jan 29 12:59:11 2012 -0600 @@ -50,12 +50,31 @@ repository to disable publishing in its configuration file:: [phases] - publishing = False - + publish = False + See :hg:`help config` for more information on config files. .. note:: Servers running older versions of Mercurial are treated as publishing. -See :hg:`help phase` for information on manually manipulating phases. +Examples +-------- + + - list changesets in draft or secret phase:: + + hg log -r "not public()" + + - change all secret changesets to draft:: + + hg phase --draft "secret()" + + - forcibly move the current changeset and descendants from public to draft:: + + hg phase --force --draft . + + - show a list of changeset revision and phase:: + + hg log --template "{rev} {phase}\n" + +See :hg:`help phase` for more information on manually manipulating phases. diff -r f8955a7f82e6 -r 73da3e2b185f mercurial/merge.py --- a/mercurial/merge.py Fri Jan 27 03:00:32 2012 +0100 +++ b/mercurial/merge.py Sun Jan 29 12:59:11 2012 -0600 @@ -173,6 +173,10 @@ if m and m != a: # changed from a to m return m if n and n != a: # changed from a to n + if n == 'l' or a == 'l': + # can't automatically merge symlink flag change here, let + # filemerge take care of it + return m return n return '' # flag was cleared @@ -359,7 +363,6 @@ updated += 1 else: merged += 1 - util.setflags(repo.wjoin(fd), 'l' in flags, 'x' in flags) if (move and repo.dirstate.normalize(fd) != f and os.path.lexists(repo.wjoin(f))): repo.ui.debug("removing %s\n" % f) diff -r f8955a7f82e6 -r 73da3e2b185f mercurial/revset.py --- a/mercurial/revset.py Fri Jan 27 03:00:32 2012 +0100 +++ b/mercurial/revset.py Sun Jan 29 12:59:11 2012 -0600 @@ -745,7 +745,7 @@ return [r for r in subset if repo._phaserev[r] == phases.public] def remote(repo, subset, x): - """``remote([id], [path])`` + """``remote([id [,path]])`` Local revision that corresponds to the given identifier in a remote repository, if present. Here, the '.' identifier is a synonym for the current local branch. @@ -753,7 +753,7 @@ import hg # avoid start-up nasties # i18n: "remote" is a keyword - l = getargs(x, 0, 2, _("remote takes one or two arguments")) + l = getargs(x, 0, 2, _("remote takes one, two or no arguments")) q = '.' if len(l) > 0: @@ -775,8 +775,8 @@ n = other.lookup(q) if n in repo: r = repo[n].rev() - if r in subset: - return [r] + if r in subset: + return [r] return [] def removes(repo, subset, x): diff -r f8955a7f82e6 -r 73da3e2b185f tests/test-bookmarks-pushpull.t --- a/tests/test-bookmarks-pushpull.t Fri Jan 27 03:00:32 2012 +0100 +++ b/tests/test-bookmarks-pushpull.t Sun Jan 29 12:59:11 2012 -0600 @@ -101,6 +101,7 @@ $ cd ../b $ hg up 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + updating bookmark foobar $ echo c2 > f2 $ hg ci -Am2 adding f2 diff -r f8955a7f82e6 -r 73da3e2b185f tests/test-revset.t --- a/tests/test-revset.t Fri Jan 27 03:00:32 2012 +0100 +++ b/tests/test-revset.t Sun Jan 29 12:59:11 2012 -0600 @@ -476,6 +476,24 @@ $ log 'min(1 or 2) and not 1' $ log 'last(1 or 2, 1) and not 2' +tests for 'remote()' predicate: +#. (csets in remote) (id) (remote) +1. less than local current branch "default" +2. same with local specified "default" +3. more than local specified specified + + $ hg clone --quiet -U . ../remote3 + $ cd ../remote3 + $ hg update -q 7 + $ echo r > r + $ hg ci -Aqm 10 + $ log 'remote()' + 7 + $ log 'remote("a-b-c-")' + 2 + $ cd ../repo + $ log 'remote(".a.b.c.", "../remote3")' + $ cd .. test author/desc/keyword in problematic encoding