Mercurial > hg-stable
changeset 10570:fb20362f9782 stable
Merge with hg-i18n
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Tue, 02 Mar 2010 20:58:58 +0100 |
| parents | 992723445a29 (current diff) c4b321baf4a4 (diff) |
| children | d6c1279468ca |
| files | |
| diffstat | 2 files changed, 131 insertions(+), 109 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/pt_BR.po Wed Mar 03 00:12:05 2010 +0900 +++ b/i18n/pt_BR.po Tue Mar 02 20:58:58 2010 +0100 @@ -31,7 +31,7 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2009-06-08 11:30-0300\n" +"POT-Creation-Date: 2010-03-02 10:55-0300\n" "PO-Revision-Date: 2009-10-20 18:22+0200\n" "Last-Translator: Wagner Bruna <wbruna@yahoo.com>\n" "Language-Team: Brazilian Portuguese\n" @@ -7504,6 +7504,16 @@ #, python-format msgid "" +"alias for: hg %s\n" +"\n" +"%s" +msgstr "" +"apelido para: hg %s\n" +"\n" +"%s" + +#, python-format +msgid "" "\n" "use \"hg -v help %s\" to show verbose help\n" msgstr "" @@ -8205,51 +8215,62 @@ " " msgid "" -"retry file merges from a merge or update\n" -"\n" -" This command can cleanly retry unresolved file merges using file\n" -" revisions preserved from the last update or merge.\n" -"\n" -" If a conflict is resolved manually, please note that the changes\n" -" will be overwritten if the merge is retried with resolve. The\n" -" -m/--mark switch should be used to mark the file as resolved.\n" -"\n" -" You can specify a set of files to operate on, or use the -a/--all\n" -" switch to select all unresolved files.\n" -"\n" -" This command also allows listing resolved files and manually\n" -" indicating whether or not files are resolved. All files must be\n" -" marked as resolved before a commit is permitted.\n" -"\n" -" The codes used to show the status of files are::\n" -"\n" -" U = unresolved\n" -" R = resolved\n" -" " -msgstr "" -"tenta mesclar novamente arquivos em uma mesclagem ou atualização\n" -"\n" -" Este comando pode de forma limpa tentar mesclar novamente arquivos\n" -" não resolvidos usando revisões de arquivo preservadas do último\n" -" update ou merge.\n" -"\n" -" Se um conflito foi resolvido manualmente, por favor note que as\n" -" alterações serão sobrescritas se a mesclagem for repetida usando\n" -" resolve. A opção -m/--mark deve ser usada para marcar o arquivo\n" -" como resolvido.\n" -"\n" -" Você pode especificar um conjunto de arquivos, ou usar -a/--all para\n" -" selecionar todos os arquivo não resolvidos.\n" -"\n" -" Este comando também pode listar arquivos resolvidos e\n" -" manualmente marcar arquivos como resolvidos ou não. Todos os\n" -" arquivos devem ser marcados como resolvidos para que a\n" -" consolidação seja aceita.\n" -"\n" -" Os códigos usados para mostrar o estado dos arquivos são::\n" -"\n" -" U = não resolvido\n" -" R = resolvido\n" +"various operations to help finish a merge\n" +"\n" +" This command includes several actions that are often useful while\n" +" performing a merge, after running ``merge`` but before running\n" +" ``commit``. (It is only meaningful if your working directory has\n" +" two parents.) It is most relevant for merges with unresolved\n" +" conflicts, which are typically a result of non-interactive merging with\n" +" ``internal:merge`` or a command-line merge tool like ``diff3``.\n" +"\n" +" The available actions are:\n" +"\n" +" 1) list files that were merged with conflicts (U, for unresolved)\n" +" and without conflicts (R, for resolved): ``hg resolve -l``\n" +" (this is like ``status`` for merges)\n" +" 2) record that you have resolved conflicts in certain files:\n" +" ``hg resolve -m [file ...]`` (default: mark all unresolved files)\n" +" 3) forget that you have resolved conflicts in certain files:\n" +" ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n" +" 4) discard your current attempt(s) at resolving conflicts and\n" +" restart the merge from scratch: ``hg resolve file...``\n" +" (or ``-a`` for all unresolved files)\n" +"\n" +" Note that Mercurial will not let you commit files with unresolved merge\n" +" conflicts. You must use ``hg resolve -m ...`` before you can commit\n" +" after a conflicting merge.\n" +" " +msgstr "" +"diversas operações para auxiliar a execução de uma mesclagem\n" +"\n" +" Este comando inclui diversas ações úteis para realizar uma mesclagem,\n" +" após a execução de ``merge`` mas antes da execução de ``commit`` (só\n" +" faz sentido se seu diretório de trabalho tiver dois pais). É mais\n" +" relevante para mesclagens com conflitos não resolvidos, que tipicamente\n" +" resultam de mesclagem não interativa usando ``internal:merge`` ou um\n" +" utilitário de mesclagem de linha de comando, como o ``diff3``.\n" +"\n" +" As ações disponíveis são:\n" +"\n" +" 1) listar arquivos que foram mesclados com conflitos (marcando-os com\n" +" U, chamados de 'não resolvidos') ou sem conflitos (R, de\n" +" 'resolvidos'): ``hg resolve -l`` (isto é semelhante ao comando\n" +" ``status``, mas específico para mesclagens)\n" +" 2) registrar que você resolveu conflitos em certos arquivos:\n" +" ``hg resolve -m [arquivo ...]`` (por padrão marca todos os\n" +" arquivos não resolvidos)\n" +" 3) esquecer que você resolveu conflitos em certos arquivos:\n" +" ``hg resolve -u [arquivo ...]`` (por padrão desmarca todos os\n" +" arquivos resolvidos)\n" +" 4) descartar sua tentativa atual de resolver conflitos e recomeçar\n" +" do início: ``hg resolve arquivo...`` (ou ``-a`` para todos os\n" +" arquivos não resolvidos)\n" +"\n" +" Note que o Mercurial não deixará que você faça a consolidação de\n" +" arquivos com conflitos de mesclagem não resolvidos. Você deve usar\n" +" ``hg resolve -m ...`` após uma mesclagem com conflitos para que você\n" +" possa consolidar o resultado.\n" " " msgid "too many options specified" @@ -9724,16 +9745,6 @@ msgstr "nenhuma definição para o apelido '%s'\n" #, python-format -msgid "" -"alias for: hg %s\n" -"\n" -"%s" -msgstr "" -"apelido para: hg %s\n" -"\n" -"%s" - -#, python-format msgid "alias '%s' resolves to unknown command '%s'\n" msgstr "apelido '%s' indica comando desconhecido '%s'\n"
--- a/i18n/sv.po Wed Mar 03 00:12:05 2010 +0900 +++ b/i18n/sv.po Tue Mar 02 20:58:58 2010 +0100 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-02-28 19:35+0100\n" -"PO-Revision-Date: 2010-02-28 19:37+0100\n" +"POT-Creation-Date: 2010-03-02 18:23+0100\n" +"PO-Revision-Date: 2010-03-02 18:36+0100\n" "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -5681,6 +5681,16 @@ #, python-format msgid "" +"alias for: hg %s\n" +"\n" +"%s" +msgstr "" +"alias för: hg %s\n" +"\n" +"%s" + +#, python-format +msgid "" "\n" "use \"hg -v help %s\" to show verbose help\n" msgstr "" @@ -6299,47 +6309,58 @@ " " msgid "" -"retry file merges from a merge or update\n" -"\n" -" This command can cleanly retry unresolved file merges using file\n" -" revisions preserved from the last update or merge.\n" -"\n" -" If a conflict is resolved manually, please note that the changes\n" -" will be overwritten if the merge is retried with resolve. The\n" -" -m/--mark switch should be used to mark the file as resolved.\n" -"\n" -" You can specify a set of files to operate on, or use the -a/--all\n" -" switch to select all unresolved files.\n" -"\n" -" This command also allows listing resolved files and manually\n" -" indicating whether or not files are resolved. All files must be\n" -" marked as resolved before a commit is permitted.\n" -"\n" -" The codes used to show the status of files are::\n" -"\n" -" U = unresolved\n" -" R = resolved\n" -" " -msgstr "" -"gör om filsammanfogningar från merge eller update\n" -"\n" -" Det här kommandot kan göra om olösta filsammanfogningar med hjälp av\n" -" filrevisioner bevarade från det senaste update eller merge.\n" -"\n" -" Om en konflikt löses manuellt, notera att ändringarna kommer att\n" -" skrivas över om sammanfogningen görs om med resolve. Flaggan -m/--mark\n" -" bör användas för att markers filen som löst.\n" -"\n" -" Du kan specificera en uppsättning filer att arbeta med, eller använda\n" -" flaggan -a/--all för att välja alla olösta filer.\n" -"\n" -" Kommandot kan också visa lösta filer och manuellt indikera om filer är\n" -" lösta. Alla filer måste markeras som lösta innan arkivering tillåts.\n" -"\n" -" Koderna som används för att visa filstatus är::\n" -"\n" -" U = olöst (engelskans 'unresolved')\n" -" R = löst (engelskans 'resolved')\n" +"various operations to help finish a merge\n" +"\n" +" This command includes several actions that are often useful while\n" +" performing a merge, after running ``merge`` but before running\n" +" ``commit``. (It is only meaningful if your working directory has\n" +" two parents.) It is most relevant for merges with unresolved\n" +" conflicts, which are typically a result of non-interactive merging with\n" +" ``internal:merge`` or a command-line merge tool like ``diff3``.\n" +"\n" +" The available actions are:\n" +"\n" +" 1) list files that were merged with conflicts (U, for unresolved)\n" +" and without conflicts (R, for resolved): ``hg resolve -l``\n" +" (this is like ``status`` for merges)\n" +" 2) record that you have resolved conflicts in certain files:\n" +" ``hg resolve -m [file ...]`` (default: mark all unresolved files)\n" +" 3) forget that you have resolved conflicts in certain files:\n" +" ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n" +" 4) discard your current attempt(s) at resolving conflicts and\n" +" restart the merge from scratch: ``hg resolve file...``\n" +" (or ``-a`` for all unresolved files)\n" +"\n" +" Note that Mercurial will not let you commit files with unresolved merge\n" +" conflicts. You must use ``hg resolve -m ...`` before you can commit\n" +" after a conflicting merge.\n" +" " +msgstr "" +"diverse operationer för att slutföra sammanfogningar\n" +"\n" +" Det här kommandot inkludera flera handlingar som ofta är nyttiga när\n" +" en sammanfogning utförs, efter att ``merge`` körts men innan\n" +" ``commit``. (Det är bara nyttigt om din arbetskatalog har två\n" +" föräldrar.) Det är mest relevant för sammanfogningar med olösta\n" +" konflikter, som är vanliga resultat av icke-interaktiv sammanfogning\n" +" med ``internal:merge`` eller ett kommandoradsverktyg som ``diff3``.\n" +"\n" +" Tillgängliga handlingar är:\n" +"\n" +" 1) visa filer som är sammanfogade med konflikter (U för olösta) och\n" +" utan konflikter (R för lösta): ``hg resolve -l`` (detta är som\n" +" ``status`` för sammanfogningar)\n" +" 2) lagra att du har löst konflikter i vissa filer:\n" +" ``hg resolve -m [fil ...]`` (standard: markera alla olösta filer)\n" +" 3) glöm att du har löst konflikter i vissa filer\n" +" ``hg resolve -u [fil ...]`` (standard: avmarkera alla lösta filer)\n" +" 4) kasta bort ditt nuvarande försök att lösa konflikter och starta\n" +" sammanfogningen från noll: ``hg resolve fil...`` (eller ``-a``\n" +" för alla olösta filer)\n" +"\n" +" Notera att Mercurial inte låter dig arkivera filer med olösta\n" +" konflikter från sammanfogningar. Du måste använda ``hg resolve -m ...``\n" +" innan du kan arkivera efter en sammanfogning med konflikter.\n" " " msgid "too many options specified" @@ -7781,16 +7802,6 @@ msgstr "" #, python-format -msgid "" -"alias for: hg %s\n" -"\n" -"%s" -msgstr "" -"alias för: hg %s\n" -"\n" -"%s" - -#, python-format msgid "alias '%s' resolves to unknown command '%s'\n" msgstr ""