Show More
This diff has been collapsed as it changes many lines, (708 lines changed) Show them Hide them | |||||
@@ -17,8 +17,8 b' msgid ""' | |||||
17 | msgstr "" |
|
17 | msgstr "" | |
18 | "Project-Id-Version: Mercurial\n" |
|
18 | "Project-Id-Version: Mercurial\n" | |
19 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
19 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" | |
20 |
"POT-Creation-Date: 2011-0 |
|
20 | "POT-Creation-Date: 2011-02-23 15:32+0100\n" | |
21 |
"PO-Revision-Date: 2011-0 |
|
21 | "PO-Revision-Date: 2011-02-24 12:04+0100\n" | |
22 | "Last-Translator: <mg@lazybytes.net>\n" |
|
22 | "Last-Translator: <mg@lazybytes.net>\n" | |
23 | "Language-Team: Danish\n" |
|
23 | "Language-Team: Danish\n" | |
24 | "Language: Danish\n" |
|
24 | "Language: Danish\n" | |
@@ -45,8 +45,8 b' msgid ""' | |||||
45 | "Mercurial. Help for other extensions is available in the help system." |
|
45 | "Mercurial. Help for other extensions is available in the help system." | |
46 | msgstr "" |
|
46 | msgstr "" | |
47 |
|
47 | |||
48 |
msgid " |
|
48 | msgid "Options:" | |
49 |
msgstr " |
|
49 | msgstr "Valgmuligheder:" | |
50 |
|
50 | |||
51 | #, python-format |
|
51 | #, python-format | |
52 | msgid " aliases: %s" |
|
52 | msgid " aliases: %s" | |
@@ -289,202 +289,6 b' msgstr ""' | |||||
289 | msgid "acl: access denied for changeset %s" |
|
289 | msgid "acl: access denied for changeset %s" | |
290 | msgstr "acl: adgang nægtet til ændring %s" |
|
290 | msgstr "acl: adgang nægtet til ændring %s" | |
291 |
|
291 | |||
292 | msgid "track a line of development with movable markers" |
|
|||
293 | msgstr "" |
|
|||
294 |
|
||||
295 | msgid "" |
|
|||
296 | "Bookmarks are local movable markers to changesets. Every bookmark\n" |
|
|||
297 | "points to a changeset identified by its hash. If you commit a\n" |
|
|||
298 | "changeset that is based on a changeset that has a bookmark on it, the\n" |
|
|||
299 | "bookmark shifts to the new changeset." |
|
|||
300 | msgstr "" |
|
|||
301 | "Bogmærker er lokale markeringer af ændringer. Ethvert bogmærke peger\n" |
|
|||
302 | "på en ændring som er identificeret ved dennes hashværdi. Hvis du\n" |
|
|||
303 | "deponerer en ændring som er baseret på en ændring med et bogmærke\n" |
|
|||
304 | "tilknyttet, så vil bogmærket bliver flyttet til den nye ændring." |
|
|||
305 |
|
||||
306 | msgid "" |
|
|||
307 | "It is possible to use bookmark names in every revision lookup (e.g.\n" |
|
|||
308 | ":hg:`merge`, :hg:`update`)." |
|
|||
309 | msgstr "" |
|
|||
310 | "Man kan bruge navne på bogmærker alle steder hvor en revision bliver\n" |
|
|||
311 | "brugt (e.g. :hg:`merge`, :hg:`update`)." |
|
|||
312 |
|
||||
313 | msgid "" |
|
|||
314 | "By default, when several bookmarks point to the same changeset, they\n" |
|
|||
315 | "will all move forward together. It is possible to obtain a more\n" |
|
|||
316 | "git-like experience by adding the following configuration option to\n" |
|
|||
317 | "your configuration file::" |
|
|||
318 | msgstr "" |
|
|||
319 | "Når flere bogmærker peget på samme ændring, så vil de som udgangspunkt\n" |
|
|||
320 | "bliver flyttet fremad sammen. Man kan opnå en mere git-agtig opførsel\n" |
|
|||
321 | "ved at tilføje følgende til din konfigurationsfil::" |
|
|||
322 |
|
||||
323 | msgid "" |
|
|||
324 | " [bookmarks]\n" |
|
|||
325 | " track.current = True" |
|
|||
326 | msgstr "" |
|
|||
327 | " [bookmarks]\n" |
|
|||
328 | " track.current = True" |
|
|||
329 |
|
||||
330 | msgid "" |
|
|||
331 | "This will cause Mercurial to track the bookmark that you are currently\n" |
|
|||
332 | "using, and only update it. This is similar to git's approach to\n" |
|
|||
333 | "branching.\n" |
|
|||
334 | msgstr "" |
|
|||
335 | "Dette vil få Mercurial til at holde styr på hvilket bogmærke du bruger\n" |
|
|||
336 | "i øjeblikket og Mercurial vil så kun opdatere dette. Det minder om\n" |
|
|||
337 | "git's måde at lave grene på.\n" |
|
|||
338 |
|
||||
339 | msgid "" |
|
|||
340 | " Bookmarks are pointers to certain commits that move when\n" |
|
|||
341 | " committing. Bookmarks are local. They can be renamed, copied and\n" |
|
|||
342 | " deleted. It is possible to use bookmark names in :hg:`merge` and\n" |
|
|||
343 | " :hg:`update` to merge and update respectively to a given bookmark." |
|
|||
344 | msgstr "" |
|
|||
345 | " Bogmærker er pegepinde til bestemte ændringer og pegepindene\n" |
|
|||
346 | " flytter sig når man deponerer nye ændringer. Bogmærkerne er\n" |
|
|||
347 | " lokale. De kan omdøbes, kopieres og slettes. Det er muligt at\n" |
|
|||
348 | " bruge navne på bogmærker i :hg:`merge` og :hg:`update` for\n" |
|
|||
349 | " respektivt at sammenføje eller opdatere til det givne bogmærke." |
|
|||
350 |
|
||||
351 | msgid "" |
|
|||
352 | " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" |
|
|||
353 | " directory's parent revision with the given name. If you specify\n" |
|
|||
354 | " a revision using -r REV (where REV may be an existing bookmark),\n" |
|
|||
355 | " the bookmark is assigned to that revision." |
|
|||
356 | msgstr "" |
|
|||
357 | " Du kan bruge :hg:`bookmark NAVN` for at sætte et bogmærke på\n" |
|
|||
358 | " arbejdskatalogets forælderrevision med det givne navn. Hvis du\n" |
|
|||
359 | " specificerer en revision med -r REV (hvor REV kan være et\n" |
|
|||
360 | " eksisterende bogmærke), så bliver bogmærket tildelt denne\n" |
|
|||
361 | " revision." |
|
|||
362 |
|
||||
363 | msgid "" |
|
|||
364 | " Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" |
|
|||
365 | " push` and :hg:`help pull`). This requires the bookmark extension to be\n" |
|
|||
366 | " enabled for both the local and remote repositories.\n" |
|
|||
367 | " " |
|
|||
368 | msgstr "" |
|
|||
369 | " Bogmærker kan bliver skubbet og hevet mellem depoter (se :hg:`help\n" |
|
|||
370 | " push` og :hg:`help pull`). Dette kræver at bookmark-udviddelsen er\n" |
|
|||
371 | " slået til i både lokal- og fjerndepotet.\n" |
|
|||
372 | " " |
|
|||
373 |
|
||||
374 | msgid "a bookmark of this name does not exist" |
|
|||
375 | msgstr "et bogmærke med dette navn findes ikke" |
|
|||
376 |
|
||||
377 | msgid "a bookmark of the same name already exists" |
|
|||
378 | msgstr "et bogmærke med samme navn findes allerede" |
|
|||
379 |
|
||||
380 | msgid "new bookmark name required" |
|
|||
381 | msgstr "nyt bogmærkenavn påkrævet" |
|
|||
382 |
|
||||
383 | msgid "bookmark name required" |
|
|||
384 | msgstr "bogmærkenavn påkrævet" |
|
|||
385 |
|
||||
386 | msgid "bookmark name cannot contain newlines" |
|
|||
387 | msgstr "bogmærkenavn kan ikke indeholde linieskift" |
|
|||
388 |
|
||||
389 | msgid "bookmark names cannot consist entirely of whitespace" |
|
|||
390 | msgstr "bogmærkenavne kan ikke bestå udelukkende af tomrum" |
|
|||
391 |
|
||||
392 | msgid "a bookmark cannot have the name of an existing branch" |
|
|||
393 | msgstr "et bogmærke kan ikke hedde det samme som en eksisterende gren" |
|
|||
394 |
|
||||
395 | msgid "no bookmarks set\n" |
|
|||
396 | msgstr "der er ingen bogmærker\n" |
|
|||
397 |
|
||||
398 | #, python-format |
|
|||
399 | msgid "updating bookmark %s\n" |
|
|||
400 | msgstr "opdaterer bogmærke %s\n" |
|
|||
401 |
|
||||
402 | #, python-format |
|
|||
403 | msgid "not updating divergent bookmark %s\n" |
|
|||
404 | msgstr "opdaterer ikke divergerende bogmærke %s\n" |
|
|||
405 |
|
||||
406 | #, python-format |
|
|||
407 | msgid "updating bookmark %s failed!\n" |
|
|||
408 | msgstr "opdatering af bogmærke %s fejlede!\n" |
|
|||
409 |
|
||||
410 | #, python-format |
|
|||
411 | msgid "remote bookmark %s not found!" |
|
|||
412 | msgstr "fjern-bogmærke %s blev ikke fundet!" |
|
|||
413 |
|
||||
414 | #, python-format |
|
|||
415 | msgid "importing bookmark %s\n" |
|
|||
416 | msgstr "importerer bogmærke %s\n" |
|
|||
417 |
|
||||
418 | #, python-format |
|
|||
419 | msgid "exporting bookmark %s\n" |
|
|||
420 | msgstr "eksporterer bogmærke %s\n" |
|
|||
421 |
|
||||
422 | #, python-format |
|
|||
423 | msgid "deleting remote bookmark %s\n" |
|
|||
424 | msgstr "sletter fjern-bogmærke %s\n" |
|
|||
425 |
|
||||
426 | #, python-format |
|
|||
427 | msgid "bookmark %s does not exist on the local or remote repository!\n" |
|
|||
428 | msgstr "bogmærke %s eksisterer ikke i hverken lokal- eller fjerndepotet!\n" |
|
|||
429 |
|
||||
430 | msgid "searching for changed bookmarks\n" |
|
|||
431 | msgstr "leder efter ændrede bogmærker\n" |
|
|||
432 |
|
||||
433 | msgid "no changed bookmarks found\n" |
|
|||
434 | msgstr "fandt ingen ændrede bogmærker\n" |
|
|||
435 |
|
||||
436 | #, python-format |
|
|||
437 | msgid "comparing with %s\n" |
|
|||
438 | msgstr "sammenligner med %s\n" |
|
|||
439 |
|
||||
440 | msgid "bookmark to import" |
|
|||
441 | msgstr "bogmærke der skal importeres" |
|
|||
442 |
|
||||
443 | msgid "BOOKMARK" |
|
|||
444 | msgstr "BOGMÆRKE" |
|
|||
445 |
|
||||
446 | msgid "bookmark to export" |
|
|||
447 | msgstr "bogmærke der skal eksporteres" |
|
|||
448 |
|
||||
449 | msgid "compare bookmark" |
|
|||
450 | msgstr "sammenlign bogmærke" |
|
|||
451 |
|
||||
452 | msgid "" |
|
|||
453 | "``bookmark([name])``\n" |
|
|||
454 | " The named bookmark or all bookmarks." |
|
|||
455 | msgstr "" |
|
|||
456 | "``bookmark([name])``\n" |
|
|||
457 | " Det navngivne bogmærke eller alle bogmærker." |
|
|||
458 |
|
||||
459 | #. i18n: "bookmark" is a keyword |
|
|||
460 | msgid "bookmark takes one or no arguments" |
|
|||
461 | msgstr "bookmark tager et eller to argumenter" |
|
|||
462 |
|
||||
463 | #. i18n: "bookmark" is a keyword |
|
|||
464 | msgid "the argument to bookmark must be a string" |
|
|||
465 | msgstr "argumentet til bookmark skal være en streng" |
|
|||
466 |
|
||||
467 | msgid "force" |
|
|||
468 | msgstr "gennemtving" |
|
|||
469 |
|
||||
470 | msgid "REV" |
|
|||
471 | msgstr "REV" |
|
|||
472 |
|
||||
473 | msgid "revision" |
|
|||
474 | msgstr "revision" |
|
|||
475 |
|
||||
476 | msgid "delete a given bookmark" |
|
|||
477 | msgstr "slet et givent bogmærke" |
|
|||
478 |
|
||||
479 | msgid "NAME" |
|
|||
480 | msgstr "NAVN" |
|
|||
481 |
|
||||
482 | msgid "rename a given bookmark" |
|
|||
483 | msgstr "omdøb et givet bogmærke" |
|
|||
484 |
|
||||
485 | msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" |
|
|||
486 | msgstr "hg bookmarks [-f] [-d] [-m NAVN] [-r REV] [NAVN]" |
|
|||
487 |
|
||||
488 | msgid "hooks for integrating with the Bugzilla bug tracker" |
|
292 | msgid "hooks for integrating with the Bugzilla bug tracker" | |
489 | msgstr "" |
|
293 | msgstr "" | |
490 |
|
294 | |||
@@ -791,6 +595,9 b' msgstr ""' | |||||
791 | " --rev, hvis givet).\n" |
|
595 | " --rev, hvis givet).\n" | |
792 | " " |
|
596 | " " | |
793 |
|
597 | |||
|
598 | msgid "REV" | |||
|
599 | msgstr "REV" | |||
|
600 | ||||
794 | msgid "show children of the specified revision" |
|
601 | msgid "show children of the specified revision" | |
795 | msgstr "vis børn af den givne revision" |
|
602 | msgstr "vis børn af den givne revision" | |
796 |
|
603 | |||
@@ -1030,6 +837,10 b' msgid ""' | |||||
1030 | " branches.current = green\n" |
|
837 | " branches.current = green\n" | |
1031 | " branches.inactive = none" |
|
838 | " branches.inactive = none" | |
1032 | msgstr "" |
|
839 | msgstr "" | |
|
840 | " branches.active = none\n" | |||
|
841 | " branches.closed = black bold\n" | |||
|
842 | " branches.current = green\n" | |||
|
843 | " branches.inactive = none" | |||
1033 |
|
844 | |||
1034 | msgid "" |
|
845 | msgid "" | |
1035 | "The color extension will try to detect whether to use ANSI codes or\n" |
|
846 | "The color extension will try to detect whether to use ANSI codes or\n" | |
@@ -1262,7 +1073,7 b' msgid ""' | |||||
1262 | msgstr "" |
|
1073 | msgstr "" | |
1263 |
|
1074 | |||
1264 | msgid "" |
|
1075 | msgid "" | |
1265 |
" :convert.hg.saverev: store original |
|
1076 | " :convert.hg.saverev: store original revision ID in changeset\n" | |
1266 | " (forces target IDs to change). It takes and boolean argument\n" |
|
1077 | " (forces target IDs to change). It takes and boolean argument\n" | |
1267 | " and defaults to False." |
|
1078 | " and defaults to False." | |
1268 | msgstr "" |
|
1079 | msgstr "" | |
@@ -1410,7 +1221,7 b' msgid ""' | |||||
1410 | msgstr "" |
|
1221 | msgstr "" | |
1411 |
|
1222 | |||
1412 | msgid "" |
|
1223 | msgid "" | |
1413 |
" :convert.p4.startrev: specify initial Perforce revision |
|
1224 | " :convert.p4.startrev: specify initial Perforce revision (a\n" | |
1414 | " Perforce changelist number)." |
|
1225 | " Perforce changelist number)." | |
1415 | msgstr "" |
|
1226 | msgstr "" | |
1416 |
|
1227 | |||
@@ -1434,7 +1245,7 b' msgstr ""' | |||||
1434 |
|
1245 | |||
1435 | msgid "" |
|
1246 | msgid "" | |
1436 | " :convert.hg.usebranchnames: preserve branch names. The default is\n" |
|
1247 | " :convert.hg.usebranchnames: preserve branch names. The default is\n" | |
1437 | " True\n" |
|
1248 | " True.\n" | |
1438 | " " |
|
1249 | " " | |
1439 | msgstr "" |
|
1250 | msgstr "" | |
1440 |
|
1251 | |||
@@ -1593,7 +1404,7 b' msgid "revisions"' | |||||
1593 | msgstr "revisioner" |
|
1404 | msgstr "revisioner" | |
1594 |
|
1405 | |||
1595 | msgid "scanning" |
|
1406 | msgid "scanning" | |
1596 | msgstr "" |
|
1407 | msgstr "skanner" | |
1597 |
|
1408 | |||
1598 | #, python-format |
|
1409 | #, python-format | |
1599 | msgid "unknown sort mode: %s" |
|
1410 | msgid "unknown sort mode: %s" | |
@@ -1692,7 +1503,7 b' msgid "collecting CVS rlog\\n"' | |||||
1692 | msgstr "samler CVS rlog\n" |
|
1503 | msgstr "samler CVS rlog\n" | |
1693 |
|
1504 | |||
1694 | msgid "not a CVS sandbox" |
|
1505 | msgid "not a CVS sandbox" | |
1695 | msgstr "" |
|
1506 | msgstr "ikke en CVS sandkasse" | |
1696 |
|
1507 | |||
1697 | #, python-format |
|
1508 | #, python-format | |
1698 | msgid "reading cvs log cache %s\n" |
|
1509 | msgid "reading cvs log cache %s\n" | |
@@ -1764,10 +1575,10 b' msgstr "Python ElementTree modulet er ik' | |||||
1764 |
|
1575 | |||
1765 | #, python-format |
|
1576 | #, python-format | |
1766 | msgid "%s repository format is unsupported, please upgrade" |
|
1577 | msgid "%s repository format is unsupported, please upgrade" | |
1767 | msgstr "" |
|
1578 | msgstr "%s depotformatet er ikke supporteret, opgrader venligst" | |
1768 |
|
1579 | |||
1769 | msgid "failed to detect repository format!" |
|
1580 | msgid "failed to detect repository format!" | |
1770 | msgstr "" |
|
1581 | msgstr "kunne ikke detektere depotformatet!" | |
1771 |
|
1582 | |||
1772 | msgid "internal calling inconsistency" |
|
1583 | msgid "internal calling inconsistency" | |
1773 | msgstr "intern kaldeinkonsistens" |
|
1584 | msgstr "intern kaldeinkonsistens" | |
@@ -1777,7 +1588,7 b' msgstr "fejl i filafbildning"' | |||||
1777 |
|
1588 | |||
1778 | #, python-format |
|
1589 | #, python-format | |
1779 | msgid "%s:%d: path to %s is missing\n" |
|
1590 | msgid "%s:%d: path to %s is missing\n" | |
1780 | msgstr "" |
|
1591 | msgstr "%s:%d: stien til %s mangler\n" | |
1781 |
|
1592 | |||
1782 | #, python-format |
|
1593 | #, python-format | |
1783 | msgid "%s:%d: %r already in %s list\n" |
|
1594 | msgid "%s:%d: %r already in %s list\n" | |
@@ -1785,7 +1596,7 b' msgstr "%s:%d: %r er allerede i %s liste' | |||||
1785 |
|
1596 | |||
1786 | #, python-format |
|
1597 | #, python-format | |
1787 | msgid "%s:%d: superfluous / in %s %r\n" |
|
1598 | msgid "%s:%d: superfluous / in %s %r\n" | |
1788 | msgstr "" |
|
1599 | msgstr "%s:%d: overflødig / i %s %r\n" | |
1789 |
|
1600 | |||
1790 | #, python-format |
|
1601 | #, python-format | |
1791 | msgid "%s:%d: unknown directive %r\n" |
|
1602 | msgid "%s:%d: unknown directive %r\n" | |
@@ -1972,7 +1783,7 b' msgid "unable to cope with svn output"' | |||||
1972 | msgstr "kan ikke håndtere svn output" |
|
1783 | msgstr "kan ikke håndtere svn output" | |
1973 |
|
1784 | |||
1974 | msgid "writing Subversion tags is not yet implemented\n" |
|
1785 | msgid "writing Subversion tags is not yet implemented\n" | |
1975 | msgstr "" |
|
1786 | msgstr "skrivning af Subversion mærkater er endnu ikke implementeret\n" | |
1976 |
|
1787 | |||
1977 | msgid "automatically manage newlines in repository files" |
|
1788 | msgid "automatically manage newlines in repository files" | |
1978 | msgstr "automatisk håndtering af linieskift i depotfiler" |
|
1789 | msgstr "automatisk håndtering af linieskift i depotfiler" | |
@@ -2182,16 +1993,27 b' msgid ""' | |||||
2182 | " #cmd.cdiff = gdiff\n" |
|
1993 | " #cmd.cdiff = gdiff\n" | |
2183 | " #opts.cdiff = -Nprc5" |
|
1994 | " #opts.cdiff = -Nprc5" | |
2184 | msgstr "" |
|
1995 | msgstr "" | |
|
1996 | " [extdiff]\n" | |||
|
1997 | " # tilføj ny kommando som kører GNU diff(1) i 'context diff' modus\n" | |||
|
1998 | " cdiff = gdiff -Nprc5\n" | |||
|
1999 | " ## eller den gamle måde:\n" | |||
|
2000 | " #cmd.cdiff = gdiff\n" | |||
|
2001 | " #opts.cdiff = -Nprc5" | |||
2185 |
|
2002 | |||
2186 | msgid "" |
|
2003 | msgid "" | |
2187 | " # add new command called vdiff, runs kdiff3\n" |
|
2004 | " # add new command called vdiff, runs kdiff3\n" | |
2188 | " vdiff = kdiff3" |
|
2005 | " vdiff = kdiff3" | |
2189 | msgstr "" |
|
2006 | msgstr "" | |
|
2007 | " # tilføj en ny kommando ved navn vdiff som kører kdiff3\n" | |||
|
2008 | " vdiff = kdiff3" | |||
2190 |
|
2009 | |||
2191 | msgid "" |
|
2010 | msgid "" | |
2192 | " # add new command called meld, runs meld (no need to name twice)\n" |
|
2011 | " # add new command called meld, runs meld (no need to name twice)\n" | |
2193 | " meld =" |
|
2012 | " meld =" | |
2194 | msgstr "" |
|
2013 | msgstr "" | |
|
2014 | " # tilføj en ny kommando ved navn meld som kører meld (ingen grund\n" | |||
|
2015 | " # til at angive navnet to gange)\n" | |||
|
2016 | " meld =" | |||
2195 |
|
2017 | |||
2196 | msgid "" |
|
2018 | msgid "" | |
2197 | " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" |
|
2019 | " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" | |
@@ -2200,9 +2022,15 b' msgid ""' | |||||
2200 | " # your .vimrc\n" |
|
2022 | " # your .vimrc\n" | |
2201 | " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" |
|
2023 | " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" | |
2202 | msgstr "" |
|
2024 | msgstr "" | |
|
2025 | " # tilføj en ny kommando ved navn vimdiff som kører gvimdiff med\n" | |||
|
2026 | " # DirDiff udvidelsen (se\n" | |||
|
2027 | " # http://www.vim.org/scripts/script.php?script_id=102) Brugere fra\n" | |||
|
2028 | " # ikke-engelsktalende lande bør putte \"let g:DirDiffDynamicDiffText\n" | |||
|
2029 | " # = 1\" i deres .vimrc\n" | |||
|
2030 | " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" | |||
2203 |
|
2031 | |||
2204 | msgid "Tool arguments can include variables that are expanded at runtime::" |
|
2032 | msgid "Tool arguments can include variables that are expanded at runtime::" | |
2205 | msgstr "" |
|
2033 | msgstr "Argumenterne til værktøjerne kan indeholde variabler som bliver erstattet på runtime::" | |
2206 |
|
2034 | |||
2207 | msgid "" |
|
2035 | msgid "" | |
2208 | " $parent1, $plabel1 - filename, descriptive label of first parent\n" |
|
2036 | " $parent1, $plabel1 - filename, descriptive label of first parent\n" | |
@@ -2210,6 +2038,10 b' msgid ""' | |||||
2210 | " $parent2, $plabel2 - filename, descriptive label of second parent\n" |
|
2038 | " $parent2, $plabel2 - filename, descriptive label of second parent\n" | |
2211 | " $parent is an alias for $parent1." |
|
2039 | " $parent is an alias for $parent1." | |
2212 | msgstr "" |
|
2040 | msgstr "" | |
|
2041 | " $parent1, $plabel1 - filnavn, beskrivelse af første forælder\n" | |||
|
2042 | " $child, $clabel - filnavn, beskrivelse af barnerevisionen\n" | |||
|
2043 | " $parent2, $plabel2 - filnavn, beskrivelse af anden forælder\n" | |||
|
2044 | " $parent er et alias for $parent1." | |||
2213 |
|
2045 | |||
2214 | msgid "" |
|
2046 | msgid "" | |
2215 | "The extdiff extension will look in your [diff-tools] and [merge-tools]\n" |
|
2047 | "The extdiff extension will look in your [diff-tools] and [merge-tools]\n" | |
@@ -2282,11 +2114,14 b' msgid "comparison program to run"' | |||||
2282 | msgstr "sammenligningsprogram der skal køres" |
|
2114 | msgstr "sammenligningsprogram der skal køres" | |
2283 |
|
2115 | |||
2284 | msgid "OPT" |
|
2116 | msgid "OPT" | |
2285 | msgstr "" |
|
2117 | msgstr "TILVALG" | |
2286 |
|
2118 | |||
2287 | msgid "pass option to comparison program" |
|
2119 | msgid "pass option to comparison program" | |
2288 | msgstr "videregiv argument til sammenligningsprogram" |
|
2120 | msgstr "videregiv argument til sammenligningsprogram" | |
2289 |
|
2121 | |||
|
2122 | msgid "revision" | |||
|
2123 | msgstr "revision" | |||
|
2124 | ||||
2290 | msgid "change made by revision" |
|
2125 | msgid "change made by revision" | |
2291 | msgstr "ændring lavet i revision" |
|
2126 | msgstr "ændring lavet i revision" | |
2292 |
|
2127 | |||
@@ -2311,7 +2146,7 b' msgid "pull, update and merge in one com' | |||||
2311 | msgstr "træk, opdater og sammenføj i en kommando" |
|
2146 | msgstr "træk, opdater og sammenføj i en kommando" | |
2312 |
|
2147 | |||
2313 | msgid "pull changes from a remote repository, merge new changes if needed." |
|
2148 | msgid "pull changes from a remote repository, merge new changes if needed." | |
2314 | msgstr "" |
|
2149 | msgstr "hent ændringer fra fjerndepot, sammenføj nye ændringer hvis nødvendigt" | |
2315 |
|
2150 | |||
2316 | msgid "" |
|
2151 | msgid "" | |
2317 | " This finds all changes from the repository at the specified path\n" |
|
2152 | " This finds all changes from the repository at the specified path\n" | |
@@ -2340,6 +2175,8 b' msgid ""' | |||||
2340 | " Returns 0 on success.\n" |
|
2175 | " Returns 0 on success.\n" | |
2341 | " " |
|
2176 | " " | |
2342 | msgstr "" |
|
2177 | msgstr "" | |
|
2178 | " Returnerer 0 ved succes.\n" | |||
|
2179 | " " | |||
2343 |
|
2180 | |||
2344 | msgid "" |
|
2181 | msgid "" | |
2345 | "working dir not at branch tip (use \"hg update\" to check out branch tip)" |
|
2182 | "working dir not at branch tip (use \"hg update\" to check out branch tip)" | |
@@ -2493,7 +2330,7 b' msgid "the key id to sign with"' | |||||
2493 | msgstr "nøgle ID der skal underskrives med" |
|
2330 | msgstr "nøgle ID der skal underskrives med" | |
2494 |
|
2331 | |||
2495 | msgid "TEXT" |
|
2332 | msgid "TEXT" | |
2496 | msgstr "" |
|
2333 | msgstr "TEKST" | |
2497 |
|
2334 | |||
2498 | msgid "commit message" |
|
2335 | msgid "commit message" | |
2499 | msgstr "deponeringsbesked" |
|
2336 | msgstr "deponeringsbesked" | |
@@ -2602,6 +2439,9 b' msgid ""' | |||||
2602 | " # If you want hyperlinks (optional)\n" |
|
2439 | " # If you want hyperlinks (optional)\n" | |
2603 | " baseurl = http://server/path/to/repo\n" |
|
2440 | " baseurl = http://server/path/to/repo\n" | |
2604 | msgstr "" |
|
2441 | msgstr "" | |
|
2442 | " [web]\n" | |||
|
2443 | " # Hvis du vil have hyperlinks (valgfrit)\n" | |||
|
2444 | " baseurl = http://server/sti/til/depot\n" | |||
2605 |
|
2445 | |||
2606 | #, python-format |
|
2446 | #, python-format | |
2607 | msgid "%s returned an error: %s" |
|
2447 | msgid "%s returned an error: %s" | |
@@ -2641,6 +2481,8 b' msgid ""' | |||||
2641 | " [hgk]\n" |
|
2481 | " [hgk]\n" | |
2642 | " path=/location/of/hgk" |
|
2482 | " path=/location/of/hgk" | |
2643 | msgstr "" |
|
2483 | msgstr "" | |
|
2484 | " [hgk]\n" | |||
|
2485 | " path=/placering/af/hgk" | |||
2644 |
|
2486 | |||
2645 | msgid "" |
|
2487 | msgid "" | |
2646 | "hgk can make use of the extdiff extension to visualize revisions.\n" |
|
2488 | "hgk can make use of the extdiff extension to visualize revisions.\n" | |
@@ -2912,7 +2754,7 b' msgid "rescanning due to .hgignore chang' | |||||
2912 | msgstr "genskanner på grund af ændring af .hgignore\n" |
|
2754 | msgstr "genskanner på grund af ændring af .hgignore\n" | |
2913 |
|
2755 | |||
2914 | msgid "cannot start: socket is already bound" |
|
2756 | msgid "cannot start: socket is already bound" | |
2915 | msgstr "" |
|
2757 | msgstr "kan ikke starte: soklen er allerede i brug" | |
2916 |
|
2758 | |||
2917 | msgid "" |
|
2759 | msgid "" | |
2918 | "cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/" |
|
2760 | "cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/" | |
@@ -2996,7 +2838,7 b' msgid ""' | |||||
2996 | msgstr "" |
|
2838 | msgstr "" | |
2997 |
|
2839 | |||
2998 | msgid "Example::" |
|
2840 | msgid "Example::" | |
2999 | msgstr "" |
|
2841 | msgstr "Eksempel::" | |
3000 |
|
2842 | |||
3001 | msgid "" |
|
2843 | msgid "" | |
3002 | " [keyword]\n" |
|
2844 | " [keyword]\n" | |
@@ -3042,9 +2884,8 b' msgid ""' | |||||
3042 | msgstr "" |
|
2884 | msgstr "" | |
3043 |
|
2885 | |||
3044 | msgid "" |
|
2886 | msgid "" | |
3045 |
"Before changing/disabling active keywords, run :hg:`kwshrink` |
|
2887 | "Before changing/disabling active keywords, you must run :hg:`kwshrink`\n" | |
3046 |
"t |
|
2888 | "to avoid storing expanded keywords in the change history." | |
3047 | "history." |
|
|||
3048 | msgstr "" |
|
2889 | msgstr "" | |
3049 |
|
2890 | |||
3050 | msgid "" |
|
2891 | msgid "" | |
@@ -3107,15 +2948,25 b' msgstr ""' | |||||
3107 | msgid "\textending current template maps\n" |
|
2948 | msgid "\textending current template maps\n" | |
3108 | msgstr "\tudvider aktuelle skabeloner\n" |
|
2949 | msgstr "\tudvider aktuelle skabeloner\n" | |
3109 |
|
2950 | |||
3110 |
msgid "\toverriding default |
|
2951 | msgid "\toverriding default svn keywordset\n" | |
3111 | msgstr "\toverskriver standard skabelon\n" |
|
2952 | msgstr "\toverskriver standard svn skabelon\n" | |
|
2953 | ||||
|
2954 | msgid "\toverriding default cvs keywordset\n" | |||
|
2955 | msgstr "\toverskriver standard cvs skabelon\n" | |||
3112 |
|
2956 | |||
3113 | msgid "" |
|
2957 | msgid "" | |
3114 | "\n" |
|
2958 | "\n" | |
3115 |
"\tconfiguration using default keyword |
|
2959 | "\tconfiguration using default svn keywordset\n" | |
3116 | msgstr "" |
|
2960 | msgstr "" | |
3117 | "\n" |
|
2961 | "\n" | |
3118 | "\tkonfiguration med standard nøgleordskabelon\n" |
|
2962 | "\tkonfiguration med standard svn nøgleordskabelon\n" | |
|
2963 | ||||
|
2964 | msgid "" | |||
|
2965 | "\n" | |||
|
2966 | "\tconfiguration using default cvs keywordset\n" | |||
|
2967 | msgstr "" | |||
|
2968 | "\n" | |||
|
2969 | "\tkonfiguration med standard cvs nøgleordskabelon\n" | |||
3119 |
|
2970 | |||
3120 | msgid "\tdisabling current template maps\n" |
|
2971 | msgid "\tdisabling current template maps\n" | |
3121 | msgstr "deaktiverer nuævrende skabelon\n" |
|
2972 | msgstr "deaktiverer nuævrende skabelon\n" | |
@@ -3194,12 +3045,8 b' msgstr ""' | |||||
3194 | msgid "revert expanded keywords in the working directory" |
|
3045 | msgid "revert expanded keywords in the working directory" | |
3195 | msgstr "før ekspanderede nøgleord tilbge i arbejdskataloget" |
|
3046 | msgstr "før ekspanderede nøgleord tilbge i arbejdskataloget" | |
3196 |
|
3047 | |||
3197 | msgid "" |
|
3048 | msgid " Must be run before changing/disabling active keywords." | |
3198 | " Run before changing/disabling active keywords or if you experience\n" |
|
3049 | msgstr "" | |
3199 | " problems with :hg:`import` or :hg:`merge`." |
|
|||
3200 | msgstr "" |
|
|||
3201 | " Brug denne kommando før du ændrer/deaktiverer nøgleord eller hvis\n" |
|
|||
3202 | " du oplever problemer med :hg:`import` eller :hg:`merge`." |
|
|||
3203 |
|
3050 | |||
3204 | msgid "" |
|
3051 | msgid "" | |
3205 | " kwshrink refuses to run if given files contain local changes.\n" |
|
3052 | " kwshrink refuses to run if given files contain local changes.\n" | |
@@ -3496,14 +3343,14 b' msgid "no patches in series\\n"' | |||||
3496 | msgstr "ingen patches i serien\n" |
|
3343 | msgstr "ingen patches i serien\n" | |
3497 |
|
3344 | |||
3498 | #, python-format |
|
3345 | #, python-format | |
|
3346 | msgid "qpush: %s is already at the top\n" | |||
|
3347 | msgstr "qpush: %s er allerede ved toppen\n" | |||
|
3348 | ||||
|
3349 | #, python-format | |||
3499 | msgid "cannot push to a previous patch: %s" |
|
3350 | msgid "cannot push to a previous patch: %s" | |
3500 | msgstr "kan ikke skubbe til en tidligere rettelse: %s" |
|
3351 | msgstr "kan ikke skubbe til en tidligere rettelse: %s" | |
3501 |
|
3352 | |||
3502 | #, python-format |
|
3353 | #, python-format | |
3503 | msgid "qpush: %s is already at the top\n" |
|
|||
3504 | msgstr "qpush: %s er allerede ved toppen\n" |
|
|||
3505 |
|
||||
3506 | #, python-format |
|
|||
3507 | msgid "guarded by %r" |
|
3354 | msgid "guarded by %r" | |
3508 | msgstr "beskyttet af %r" |
|
3355 | msgstr "beskyttet af %r" | |
3509 |
|
3356 | |||
@@ -4478,6 +4325,9 b' msgstr "hg qheader [RETTELSE]"' | |||||
4478 | msgid "import file in patch directory" |
|
4325 | msgid "import file in patch directory" | |
4479 | msgstr "importer en fil i rettelsesbiblioteket" |
|
4326 | msgstr "importer en fil i rettelsesbiblioteket" | |
4480 |
|
4327 | |||
|
4328 | msgid "NAME" | |||
|
4329 | msgstr "NAVN" | |||
|
4330 | ||||
4481 | msgid "name of patch file" |
|
4331 | msgid "name of patch file" | |
4482 | msgstr "navn på rettelse" |
|
4332 | msgstr "navn på rettelse" | |
4483 |
|
4333 | |||
@@ -5089,6 +4939,10 b' msgid ""' | |||||
5089 | " " |
|
4939 | " " | |
5090 | msgstr "" |
|
4940 | msgstr "" | |
5091 |
|
4941 | |||
|
4942 | #, python-format | |||
|
4943 | msgid "comparing with %s\n" | |||
|
4944 | msgstr "sammenligner med %s\n" | |||
|
4945 | ||||
5092 | msgid "no changes found\n" |
|
4946 | msgid "no changes found\n" | |
5093 | msgstr "fandt ingen ændringer\n" |
|
4947 | msgstr "fandt ingen ændringer\n" | |
5094 |
|
4948 | |||
@@ -5275,6 +5129,21 b' msgstr ""' | |||||
5275 | msgid "%dh%02dm" |
|
5129 | msgid "%dh%02dm" | |
5276 | msgstr "" |
|
5130 | msgstr "" | |
5277 |
|
5131 | |||
|
5132 | #. i18n: format X days and YY hours as "XdYYh" | |||
|
5133 | #, python-format | |||
|
5134 | msgid "%dd%02dh" | |||
|
5135 | msgstr "" | |||
|
5136 | ||||
|
5137 | #. i18n: format X weeks and YY days as "XwYYd" | |||
|
5138 | #, python-format | |||
|
5139 | msgid "%dw%02dd" | |||
|
5140 | msgstr "" | |||
|
5141 | ||||
|
5142 | #. i18n: format X years and YY weeks as "XyYYw" | |||
|
5143 | #, python-format | |||
|
5144 | msgid "%dy%02dw" | |||
|
5145 | msgstr "" | |||
|
5146 | ||||
5278 | msgid "command to delete untracked files from the working directory" |
|
5147 | msgid "command to delete untracked files from the working directory" | |
5279 | msgstr "kommando til at slette filer fra arbejdskataloget som ikke følges" |
|
5148 | msgstr "kommando til at slette filer fra arbejdskataloget som ikke følges" | |
5280 |
|
5149 | |||
@@ -5662,7 +5531,8 b' msgid "running non-interactively, use co' | |||||
5662 | msgstr "kører ikke interaktivt, brug commit i stedet" |
|
5531 | msgstr "kører ikke interaktivt, brug commit i stedet" | |
5663 |
|
5532 | |||
5664 | msgid "cannot partially commit a merge (use \"hg commit\" instead)" |
|
5533 | msgid "cannot partially commit a merge (use \"hg commit\" instead)" | |
5665 | msgstr "kan ikke deponere en sammenføjning partielt (brug i stedet \"hg commit\")" |
|
5534 | msgstr "" | |
|
5535 | "kan ikke deponere en sammenføjning partielt (brug i stedet \"hg commit\")" | |||
5666 |
|
5536 | |||
5667 | msgid "no changes to record\n" |
|
5537 | msgid "no changes to record\n" | |
5668 | msgstr "ingen ændringer at optage\n" |
|
5538 | msgstr "ingen ændringer at optage\n" | |
@@ -6072,7 +5942,7 b' msgstr ""' | |||||
6072 | msgid "" |
|
5942 | msgid "" | |
6073 | "- You should use single encoding in one repository.\n" |
|
5943 | "- You should use single encoding in one repository.\n" | |
6074 | "- If the repository path ends with 0x5c, .hg/hgrc cannot be read.\n" |
|
5944 | "- If the repository path ends with 0x5c, .hg/hgrc cannot be read.\n" | |
6075 |
"- win32mbcs is not compatible with fixutf8 exten |
|
5945 | "- win32mbcs is not compatible with fixutf8 extension." | |
6076 | msgstr "" |
|
5946 | msgstr "" | |
6077 |
|
5947 | |||
6078 | msgid "" |
|
5948 | msgid "" | |
@@ -6262,6 +6132,16 b' msgstr "ukendt depottype \'%s\'"' | |||||
6262 | msgid "archiving" |
|
6132 | msgid "archiving" | |
6263 | msgstr "arkiverer" |
|
6133 | msgstr "arkiverer" | |
6264 |
|
6134 | |||
|
6135 | #, python-format | |||
|
6136 | msgid "bookmark '%s' contains illegal character" | |||
|
6137 | msgstr "" | |||
|
6138 | ||||
|
6139 | msgid "searching for changed bookmarks\n" | |||
|
6140 | msgstr "leder efter ændrede bogmærker\n" | |||
|
6141 | ||||
|
6142 | msgid "no changed bookmarks found\n" | |||
|
6143 | msgstr "fandt ingen ændrede bogmærker\n" | |||
|
6144 | ||||
6265 | msgid "invalid changegroup" |
|
6145 | msgid "invalid changegroup" | |
6266 | msgstr "ugyldig changegroup" |
|
6146 | msgstr "ugyldig changegroup" | |
6267 |
|
6147 | |||
@@ -6276,8 +6156,12 b' msgid "cannot create new bundle reposito' | |||||
6276 | msgstr "" |
|
6156 | msgstr "" | |
6277 |
|
6157 | |||
6278 | #, python-format |
|
6158 | #, python-format | |
6279 |
msgid " |
|
6159 | msgid "stream ended unexpectedly (got %d bytes, expected %d)" | |
6280 |
msgstr " |
|
6160 | msgstr "stream stoppede uventet (fik %d bytes, forventede %d)" | |
|
6161 | ||||
|
6162 | #, python-format | |||
|
6163 | msgid "invalid chunk length %d" | |||
|
6164 | msgstr "ugyldigt længde på chunk: %d" | |||
6281 |
|
6165 | |||
6282 | #, python-format |
|
6166 | #, python-format | |
6283 | msgid "%s: not a Mercurial bundle" |
|
6167 | msgid "%s: not a Mercurial bundle" | |
@@ -6405,6 +6289,10 b' msgid "branch: %s\\n"' | |||||
6405 | msgstr "gren: %s\n" |
|
6289 | msgstr "gren: %s\n" | |
6406 |
|
6290 | |||
6407 | #, python-format |
|
6291 | #, python-format | |
|
6292 | msgid "bookmark: %s\n" | |||
|
6293 | msgstr "bogmærke: %s\n" | |||
|
6294 | ||||
|
6295 | #, python-format | |||
6408 | msgid "tag: %s\n" |
|
6296 | msgid "tag: %s\n" | |
6409 | msgstr "mærkat: %s\n" |
|
6297 | msgstr "mærkat: %s\n" | |
6410 |
|
6298 | |||
@@ -6578,12 +6466,12 b' msgstr " Tilf\xc3\xb8j alle nye filer og fjern alle manglende filer fra depotet."' | |||||
6578 |
|
6466 | |||
6579 | msgid "" |
|
6467 | msgid "" | |
6580 | " New files are ignored if they match any of the patterns in\n" |
|
6468 | " New files are ignored if they match any of the patterns in\n" | |
6581 | " .hgignore. As with add, these changes take effect at the next\n" |
|
6469 | " ``.hgignore``. As with add, these changes take effect at the next\n" | |
6582 | " commit." |
|
6470 | " commit." | |
6583 | msgstr "" |
|
6471 | msgstr "" | |
6584 | " Nye filer bliver ignoreret hvis de matcher et af mønstrene i\n" |
|
6472 | " Nye filer bliver ignoreret hvis de matcher et af mønstrene i\n" | |
6585 |
" .hgignore. Som ved add, så træder disse ændringer først i |
|
6473 | " ``.hgignore``. Som ved add, så træder disse ændringer først i\n" | |
6586 | " ved næste commit." |
|
6474 | " kræft ved næste commit." | |
6587 |
|
6475 | |||
6588 | msgid "" |
|
6476 | msgid "" | |
6589 | " Use the -s/--similarity option to detect renamed files. With a\n" |
|
6477 | " Use the -s/--similarity option to detect renamed files. With a\n" | |
@@ -6696,37 +6584,28 b' msgid "reverse effect of earlier changes' | |||||
6696 | msgstr "omgør effekten af tidligere ændringer" |
|
6584 | msgstr "omgør effekten af tidligere ændringer" | |
6697 |
|
6585 | |||
6698 | msgid "" |
|
6586 | msgid "" | |
6699 | " The backout command merges the reverse effect of the reverted\n" |
|
6587 | " Prepare a new changeset with the effect of REV undone in the\n" | |
6700 |
" c |
|
6588 | " current working directory." | |
6701 | msgstr "" |
|
6589 | msgstr "" | |
6702 |
|
6590 | |||
6703 | msgid "" |
|
6591 | msgid "" | |
6704 | " With the --merge option, it first commits the reverted changes\n" |
|
6592 | " If REV is the parent of the working directory, then this changeset\n" | |
6705 | " as a new changeset. This new changeset is a child of the reverted\n" |
|
6593 | " is committed automatically. Otherwise, hg needs to merge the\n" | |
6706 | " changeset.\n" |
|
6594 | " changes and the merged result is left uncommitted." | |
6707 | " The --merge option remembers the parent of the working directory\n" |
|
6595 | msgstr "" | |
6708 | " before starting the backout, then merges the new head with that\n" |
|
6596 | ||
6709 | " changeset afterwards.\n" |
|
6597 | msgid "" | |
6710 | " This will result in an explicit merge in the history." |
|
6598 | " By default, the pending changeset will have one parent,\n" | |
6711 | msgstr "" |
|
6599 | " maintaining a linear history. With --merge, the pending changeset\n" | |
6712 | " Med --merge tilvalget bliver de omgjorte ændringer først deponeret\n" |
|
6600 | " will instead have two parents: the old parent of the working\n" | |
6713 | " som en ny ændring. Denne nye ændring vil være et barn af den\n" |
|
6601 | " directory and a child of REV that simply undoes REV." | |
6714 | " omgjorte ændring. Derefter bliver det nye hoved sammenføjet med\n" |
|
6602 | msgstr "" | |
6715 | " arbejdskatalogets forælderrevision. Derved skabes der en eksplicit\n" |
|
6603 | ||
6716 | " sammenføjning i historien." |
|
6604 | msgid "" | |
6717 |
|
6605 | " Before version 1.7, the default behavior was equivalent to\n" | ||
6718 | msgid "" |
|
6606 | " specifying --merge followed by :hg:`update --clean .` to cancel\n" | |
6719 | " If you backout a changeset other than the original parent of the\n" |
|
6607 | " the merge and leave the child of REV as a head to be merged\n" | |
6720 | " working directory, the result of this merge is not committed,\n" |
|
6608 | " separately." | |
6721 | " as with a normal merge. Otherwise, no merge is needed and the\n" |
|
|||
6722 | " commit is automatic." |
|
|||
6723 | msgstr "" |
|
|||
6724 |
|
||||
6725 | msgid "" |
|
|||
6726 | " Note that the default behavior (without --merge) has changed in\n" |
|
|||
6727 | " version 1.7. To restore the previous default behavior, use\n" |
|
|||
6728 | " :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n" |
|
|||
6729 | " the ongoing merge." |
|
|||
6730 | msgstr "" |
|
6609 | msgstr "" | |
6731 |
|
6610 | |||
6732 | msgid "please specify just one revision" |
|
6611 | msgid "please specify just one revision" | |
@@ -6836,6 +6715,71 b' msgstr "\xc3\x86ndring %d:%s: %s\\n"' | |||||
6836 | msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" |
|
6715 | msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" | |
6837 | msgstr "Tester ændring %d:%s (%d ændringer tilbage, ~%d test)\n" |
|
6716 | msgstr "Tester ændring %d:%s (%d ændringer tilbage, ~%d test)\n" | |
6838 |
|
6717 | |||
|
6718 | msgid "track a line of development with movable markers" | |||
|
6719 | msgstr "" | |||
|
6720 | ||||
|
6721 | msgid "" | |||
|
6722 | " Bookmarks are pointers to certain commits that move when\n" | |||
|
6723 | " committing. Bookmarks are local. They can be renamed, copied and\n" | |||
|
6724 | " deleted. It is possible to use bookmark names in :hg:`merge` and\n" | |||
|
6725 | " :hg:`update` to merge and update respectively to a given bookmark." | |||
|
6726 | msgstr "" | |||
|
6727 | " Bogmærker er pegepinde til bestemte ændringer og pegepindene\n" | |||
|
6728 | " flytter sig når man deponerer nye ændringer. Bogmærkerne er\n" | |||
|
6729 | " lokale. De kan omdøbes, kopieres og slettes. Det er muligt at\n" | |||
|
6730 | " bruge navne på bogmærker i :hg:`merge` og :hg:`update` for\n" | |||
|
6731 | " respektivt at sammenføje eller opdatere til det givne bogmærke." | |||
|
6732 | ||||
|
6733 | msgid "" | |||
|
6734 | " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" | |||
|
6735 | " directory's parent revision with the given name. If you specify\n" | |||
|
6736 | " a revision using -r REV (where REV may be an existing bookmark),\n" | |||
|
6737 | " the bookmark is assigned to that revision." | |||
|
6738 | msgstr "" | |||
|
6739 | " Du kan bruge :hg:`bookmark NAVN` for at sætte et bogmærke på\n" | |||
|
6740 | " arbejdskatalogets forælderrevision med det givne navn. Hvis du\n" | |||
|
6741 | " specificerer en revision med -r REV (hvor REV kan være et\n" | |||
|
6742 | " eksisterende bogmærke), så bliver bogmærket tildelt denne\n" | |||
|
6743 | " revision." | |||
|
6744 | ||||
|
6745 | msgid "" | |||
|
6746 | " Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" | |||
|
6747 | " push` and :hg:`help pull`). This requires both the local and remote\n" | |||
|
6748 | " repositories to support bookmarks. For versions prior to 1.8, this " | |||
|
6749 | "means\n" | |||
|
6750 | " the bookmarks extension must be enabled.\n" | |||
|
6751 | " " | |||
|
6752 | msgstr "" | |||
|
6753 | " Bogmærker kan skubbes og hives mellem depoter (se :hg:`help push`\n" | |||
|
6754 | " og :hg:`help pull`). Dette kræver at både lokal- og fjerndepotet\n" | |||
|
6755 | " understøtter bogmærker. For versioner før 1.8 betyder det at\n" | |||
|
6756 | " bookmark-udviddelsen skal være slået til.\n" | |||
|
6757 | " " | |||
|
6758 | ||||
|
6759 | msgid "a bookmark of this name does not exist" | |||
|
6760 | msgstr "et bogmærke med dette navn findes ikke" | |||
|
6761 | ||||
|
6762 | msgid "a bookmark of the same name already exists" | |||
|
6763 | msgstr "et bogmærke med samme navn findes allerede" | |||
|
6764 | ||||
|
6765 | msgid "new bookmark name required" | |||
|
6766 | msgstr "nyt bogmærkenavn påkrævet" | |||
|
6767 | ||||
|
6768 | msgid "bookmark name required" | |||
|
6769 | msgstr "bogmærkenavn påkrævet" | |||
|
6770 | ||||
|
6771 | msgid "bookmark name cannot contain newlines" | |||
|
6772 | msgstr "bogmærkenavn kan ikke indeholde linieskift" | |||
|
6773 | ||||
|
6774 | msgid "bookmark names cannot consist entirely of whitespace" | |||
|
6775 | msgstr "bogmærkenavne kan ikke bestå udelukkende af tomrum" | |||
|
6776 | ||||
|
6777 | msgid "a bookmark cannot have the name of an existing branch" | |||
|
6778 | msgstr "et bogmærke kan ikke hedde det samme som en eksisterende gren" | |||
|
6779 | ||||
|
6780 | msgid "no bookmarks set\n" | |||
|
6781 | msgstr "der er ingen bogmærker\n" | |||
|
6782 | ||||
6839 | msgid "set or show the current branch name" |
|
6783 | msgid "set or show the current branch name" | |
6840 | msgstr "angiv eller vis navnet på den aktuelle gren" |
|
6784 | msgstr "angiv eller vis navnet på den aktuelle gren" | |
6841 |
|
6785 | |||
@@ -7014,23 +6958,23 b' msgstr ""' | |||||
7014 |
|
6958 | |||
7015 | msgid "" |
|
6959 | msgid "" | |
7016 | " The location of the source is added to the new repository's\n" |
|
6960 | " The location of the source is added to the new repository's\n" | |
7017 | " .hg/hgrc file, as the default to be used for future pulls." |
|
6961 | " ``.hg/hgrc`` file, as the default to be used for future pulls." | |
7018 | msgstr "" |
|
6962 | msgstr "" | |
7019 |
" Placeringen af kilden tilføjes til det nye depots .hg/hgrc fil |
|
6963 | " Placeringen af kilden tilføjes til det nye depots ``.hg/hgrc`` fil\n" | |
7020 |
" den nye standard for fremtidige kald til |
|
6964 | " som den nye standard for fremtidige kald til :hg:`pull`." | |
7021 |
|
6965 | |||
7022 | msgid " See :hg:`help urls` for valid source format details." |
|
6966 | msgid " See :hg:`help urls` for valid source format details." | |
7023 | msgstr " Se :hg:`help urls` for detaljer om gyldige formatter for kilden." |
|
6967 | msgstr " Se :hg:`help urls` for detaljer om gyldige formatter for kilden." | |
7024 |
|
6968 | |||
7025 | msgid "" |
|
6969 | msgid "" | |
7026 | " It is possible to specify an ``ssh://`` URL as the destination, but no\n" |
|
6970 | " It is possible to specify an ``ssh://`` URL as the destination, but no\n" | |
7027 | " .hg/hgrc and working directory will be created on the remote side.\n" |
|
6971 | " ``.hg/hgrc`` and working directory will be created on the remote side.\n" | |
7028 | " Please see :hg:`help urls` for important details about ``ssh://`` URLs." |
|
6972 | " Please see :hg:`help urls` for important details about ``ssh://`` URLs." | |
7029 | msgstr "" |
|
6973 | msgstr "" | |
7030 | " Det er muligt at specificere en ``ssh://`` URL som destination,\n" |
|
6974 | " Det er muligt at specificere en ``ssh://`` URL som destination,\n" | |
7031 |
" men der vil ikke bliver oprettet nogen .hg/hgrc fil eller |
|
6975 | " men der vil ikke bliver oprettet nogen ``.hg/hgrc`` fil eller\n" | |
7032 |
" arbejdskatalog på den anden side. Se venligst :hg:`help |
|
6976 | " noget arbejdskatalog på den anden side. Se venligst :hg:`help\n" | |
7033 | " vigtige detaljer om ``ssh://`` URLer." |
|
6977 | " urls` for vigtige detaljer om ``ssh://`` URLer." | |
7034 |
|
6978 | |||
7035 | msgid "" |
|
6979 | msgid "" | |
7036 | " A set of changesets (tags, or branch names) to pull may be specified\n" |
|
6980 | " A set of changesets (tags, or branch names) to pull may be specified\n" | |
@@ -7139,11 +7083,11 b' msgstr "l\xc3\xa6gger de specificerede filer eller alle udest\xc3\xa5ende \xc3\xa6ndringer i depot"' | |||||
7139 |
|
7083 | |||
7140 | msgid "" |
|
7084 | msgid "" | |
7141 | " Commit changes to the given files into the repository. Unlike a\n" |
|
7085 | " Commit changes to the given files into the repository. Unlike a\n" | |
7142 |
" centralized |
|
7086 | " centralized SCM, this operation is a local operation. See\n" | |
7143 | " :hg:`push` for a way to actively distribute your changes." |
|
7087 | " :hg:`push` for a way to actively distribute your changes." | |
7144 | msgstr "" |
|
7088 | msgstr "" | |
7145 | " Deponerer ændringer i de angivne filer ind i depotet. Dette er en\n" |
|
7089 | " Deponerer ændringer i de angivne filer ind i depotet. Dette er en\n" | |
7146 |
" lokal operation, i modsætning til et centraliseret |
|
7090 | " lokal operation, i modsætning til et centraliseret SCM. Se\n" | |
7147 | " :hg:`push` for en måde til aktivt distribuere dine ændringer." |
|
7091 | " :hg:`push` for en måde til aktivt distribuere dine ændringer." | |
7148 |
|
7092 | |||
7149 | msgid "" |
|
7093 | msgid "" | |
@@ -7401,6 +7345,12 b' msgstr "ugyldig revisionsidentification ' | |||||
7401 | msgid "parse and display a date" |
|
7345 | msgid "parse and display a date" | |
7402 | msgstr "fortolk og vis en dato" |
|
7346 | msgstr "fortolk og vis en dato" | |
7403 |
|
7347 | |||
|
7348 | msgid "display the combined ignore pattern" | |||
|
7349 | msgstr "" | |||
|
7350 | ||||
|
7351 | msgid "no ignore patterns found" | |||
|
7352 | msgstr "fandt ingen ignore mønstre" | |||
|
7353 | ||||
7404 | msgid "dump the contents of an index file" |
|
7354 | msgid "dump the contents of an index file" | |
7405 | msgstr "dump indholdet af en indeksfil" |
|
7355 | msgstr "dump indholdet af en indeksfil" | |
7406 |
|
7356 | |||
@@ -7763,8 +7713,10 b' msgstr ""' | |||||
7763 | "detaljer" |
|
7713 | "detaljer" | |
7764 |
|
7714 | |||
7765 | #, python-format |
|
7715 | #, python-format | |
7766 | msgid "use \"hg -v help%s\" to show aliases and global options" |
|
7716 | msgid "use \"hg -v help%s\" to show builtin aliases and global options" | |
7767 | msgstr "brug \"hg -v help%s\" for at vise aliaser og globale valgmuligheder" |
|
7717 | msgstr "" | |
|
7718 | "brug \"hg -v help%s\" for at vise indbyggede aliaser og globale " | |||
|
7719 | "valgmuligheder" | |||
7768 |
|
7720 | |||
7769 | #, python-format |
|
7721 | #, python-format | |
7770 | msgid "use \"hg -v help %s\" to show global options" |
|
7722 | msgid "use \"hg -v help %s\" to show global options" | |
@@ -7967,6 +7919,9 b' msgstr ""' | |||||
7967 | msgid "cannot combine --bundle and --subrepos" |
|
7919 | msgid "cannot combine --bundle and --subrepos" | |
7968 | msgstr "" |
|
7920 | msgstr "" | |
7969 |
|
7921 | |||
|
7922 | msgid "remote doesn't support bookmarks\n" | |||
|
7923 | msgstr "fjerdepotet understøtter ikke bogmærker\n" | |||
|
7924 | ||||
7970 | msgid "create a new repository in the given directory" |
|
7925 | msgid "create a new repository in the given directory" | |
7971 | msgstr "opret et nyt depot i det givne katalog" |
|
7926 | msgstr "opret et nyt depot i det givne katalog" | |
7972 |
|
7927 | |||
@@ -8295,6 +8250,10 b' msgid ""' | |||||
8295 | " " |
|
8250 | " " | |
8296 | msgstr "" |
|
8251 | msgstr "" | |
8297 |
|
8252 | |||
|
8253 | #, python-format | |||
|
8254 | msgid "remote bookmark %s not found!" | |||
|
8255 | msgstr "fjern-bogmærke %s blev ikke fundet!" | |||
|
8256 | ||||
8298 | msgid "" |
|
8257 | msgid "" | |
8299 | "other repository doesn't support revision lookup, so a rev cannot be " |
|
8258 | "other repository doesn't support revision lookup, so a rev cannot be " | |
8300 | "specified." |
|
8259 | "specified." | |
@@ -8302,6 +8261,10 b' msgstr ""' | |||||
8302 | "det andet depot understøtter ikke revisionsopslag, så en revision kan ikke " |
|
8261 | "det andet depot understøtter ikke revisionsopslag, så en revision kan ikke " | |
8303 | "angives." |
|
8262 | "angives." | |
8304 |
|
8263 | |||
|
8264 | #, python-format | |||
|
8265 | msgid "importing bookmark %s\n" | |||
|
8266 | msgstr "importerer bogmærke %s\n" | |||
|
8267 | ||||
8305 | msgid "push changes to the specified destination" |
|
8268 | msgid "push changes to the specified destination" | |
8306 | msgstr "skub ændringer til den angivne destination" |
|
8269 | msgstr "skub ændringer til den angivne destination" | |
8307 |
|
8270 | |||
@@ -8358,6 +8321,22 b' msgstr ""' | |||||
8358 | msgid "pushing to %s\n" |
|
8321 | msgid "pushing to %s\n" | |
8359 | msgstr "skubber til %s\n" |
|
8322 | msgstr "skubber til %s\n" | |
8360 |
|
8323 | |||
|
8324 | #, python-format | |||
|
8325 | msgid "exporting bookmark %s\n" | |||
|
8326 | msgstr "eksporterer bogmærke %s\n" | |||
|
8327 | ||||
|
8328 | #, python-format | |||
|
8329 | msgid "deleting remote bookmark %s\n" | |||
|
8330 | msgstr "sletter fjern-bogmærke %s\n" | |||
|
8331 | ||||
|
8332 | #, python-format | |||
|
8333 | msgid "bookmark %s does not exist on the local or remote repository!\n" | |||
|
8334 | msgstr "bogmærke %s eksisterer ikke i hverken lokal- eller fjerndepotet!\n" | |||
|
8335 | ||||
|
8336 | #, python-format | |||
|
8337 | msgid "updating bookmark %s failed!\n" | |||
|
8338 | msgstr "opdatering af bogmærke %s fejlede!\n" | |||
|
8339 | ||||
8361 | msgid "roll back an interrupted transaction" |
|
8340 | msgid "roll back an interrupted transaction" | |
8362 | msgstr "" |
|
8341 | msgstr "" | |
8363 |
|
8342 | |||
@@ -8887,6 +8866,14 b' msgid "%d outgoing"' | |||||
8887 | msgstr "%d udgående" |
|
8866 | msgstr "%d udgående" | |
8888 |
|
8867 | |||
8889 | #, python-format |
|
8868 | #, python-format | |
|
8869 | msgid "%d incoming bookmarks" | |||
|
8870 | msgstr "%d indgående bogmærker" | |||
|
8871 | ||||
|
8872 | #, python-format | |||
|
8873 | msgid "%d outgoing bookmarks" | |||
|
8874 | msgstr "%d udgående bogmærker" | |||
|
8875 | ||||
|
8876 | #, python-format | |||
8890 | msgid "remote: %s\n" |
|
8877 | msgid "remote: %s\n" | |
8891 | msgstr "fjernsystem: %s\n" |
|
8878 | msgstr "fjernsystem: %s\n" | |
8892 |
|
8879 | |||
@@ -9185,6 +9172,9 b' msgstr "specificer ssh kommandoen som sk' | |||||
9185 | msgid "specify hg command to run on the remote side" |
|
9172 | msgid "specify hg command to run on the remote side" | |
9186 | msgstr "angiv hg kommando som skal udføres på fjernsystemet" |
|
9173 | msgstr "angiv hg kommando som skal udføres på fjernsystemet" | |
9187 |
|
9174 | |||
|
9175 | msgid "do not verify server certificate (ignoring web.cacerts config)" | |||
|
9176 | msgstr "" | |||
|
9177 | ||||
9188 | msgid "PATTERN" |
|
9178 | msgid "PATTERN" | |
9189 | msgstr "" |
|
9179 | msgstr "" | |
9190 |
|
9180 | |||
@@ -9341,6 +9331,18 b' msgstr "undlad at opdatere til m\xc3\xa5let"' | |||||
9341 | msgid "[-gbsr] [-U] [-c CMD] [REV]" |
|
9331 | msgid "[-gbsr] [-U] [-c CMD] [REV]" | |
9342 | msgstr "[-gbsr] [-U] [-c KOMMANDO] [REV]" |
|
9332 | msgstr "[-gbsr] [-U] [-c KOMMANDO] [REV]" | |
9343 |
|
9333 | |||
|
9334 | msgid "force" | |||
|
9335 | msgstr "gennemtving" | |||
|
9336 | ||||
|
9337 | msgid "delete a given bookmark" | |||
|
9338 | msgstr "slet et givent bogmærke" | |||
|
9339 | ||||
|
9340 | msgid "rename a given bookmark" | |||
|
9341 | msgstr "omdøb et givet bogmærke" | |||
|
9342 | ||||
|
9343 | msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" | |||
|
9344 | msgstr "hg bookmarks [-f] [-d] [-m NAVN] [-r REV] [NAVN]" | |||
|
9345 | ||||
9344 | msgid "set branch name even if it shadows an existing branch" |
|
9346 | msgid "set branch name even if it shadows an existing branch" | |
9345 | msgstr "sæt grennavnet selv hvis det overskygger en eksisterende gren" |
|
9347 | msgstr "sæt grennavnet selv hvis det overskygger en eksisterende gren" | |
9346 |
|
9348 | |||
@@ -9619,6 +9621,9 b' msgstr "fil hvor bundterne skal gemmes"' | |||||
9619 | msgid "a remote changeset intended to be added" |
|
9621 | msgid "a remote changeset intended to be added" | |
9620 | msgstr "" |
|
9622 | msgstr "" | |
9621 |
|
9623 | |||
|
9624 | msgid "compare bookmarks" | |||
|
9625 | msgstr "sammenlign bogmærker" | |||
|
9626 | ||||
9622 | msgid "a specific branch you would like to pull" |
|
9627 | msgid "a specific branch you would like to pull" | |
9623 | msgstr "en bestemt gren du gerne vil hive ned" |
|
9628 | msgstr "en bestemt gren du gerne vil hive ned" | |
9624 |
|
9629 | |||
@@ -9715,12 +9720,21 b' msgstr "opdater til det nye gren-hovede hvis \xc3\xa6ndringer blev trukket ned"' | |||||
9715 | msgid "run even when remote repository is unrelated" |
|
9720 | msgid "run even when remote repository is unrelated" | |
9716 | msgstr "kør selv hvis fjerndepotet er urelateret" |
|
9721 | msgstr "kør selv hvis fjerndepotet er urelateret" | |
9717 |
|
9722 | |||
|
9723 | msgid "BOOKMARK" | |||
|
9724 | msgstr "BOGMÆRKE" | |||
|
9725 | ||||
|
9726 | msgid "bookmark to pull" | |||
|
9727 | msgstr "bogmærke der skal hentes" | |||
|
9728 | ||||
9718 | msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" |
|
9729 | msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" | |
9719 | msgstr "[-u] [-f] [-r REV]... [-e KOMMANDO] [--remotecmd KOMMANDO] [KILDE]" |
|
9730 | msgstr "[-u] [-f] [-r REV]... [-e KOMMANDO] [--remotecmd KOMMANDO] [KILDE]" | |
9720 |
|
9731 | |||
9721 | msgid "force push" |
|
9732 | msgid "force push" | |
9722 | msgstr "gennemtving skubning" |
|
9733 | msgstr "gennemtving skubning" | |
9723 |
|
9734 | |||
|
9735 | msgid "bookmark to push" | |||
|
9736 | msgstr "bogmærke der skal skubbes" | |||
|
9737 | ||||
9724 | msgid "allow pushing a new branch" |
|
9738 | msgid "allow pushing a new branch" | |
9725 | msgstr "" |
|
9739 | msgstr "" | |
9726 |
|
9740 | |||
@@ -10166,6 +10180,11 b' msgstr "ingen definition for alias \'%s\'\\' | |||||
10166 |
|
10180 | |||
10167 | #, python-format |
|
10181 | #, python-format | |
10168 | msgid "" |
|
10182 | msgid "" | |
|
10183 | "No argument found for substitution of %i variable in alias '%s' definition." | |||
|
10184 | msgstr "" | |||
|
10185 | ||||
|
10186 | #, python-format | |||
|
10187 | msgid "" | |||
10169 | "error in definition for alias '%s': %s may only be given on the command " |
|
10188 | "error in definition for alias '%s': %s may only be given on the command " | |
10170 | "line\n" |
|
10189 | "line\n" | |
10171 | msgstr "" |
|
10190 | msgstr "" | |
@@ -11971,7 +11990,10 b' msgid ""' | |||||
11971 | ":commit: commit creates a consistent snapshot of the state of the\n" |
|
11990 | ":commit: commit creates a consistent snapshot of the state of the\n" | |
11972 | " entire project and its subrepositories. It does this by first\n" |
|
11991 | " entire project and its subrepositories. It does this by first\n" | |
11973 | " attempting to commit all modified subrepositories, then recording\n" |
|
11992 | " attempting to commit all modified subrepositories, then recording\n" | |
11974 |
" their state and finally committing it in the parent |
|
11993 | " their state and finally committing it in the parent\n" | |
|
11994 | " repository. Mercurial can be made to abort if any subrepository\n" | |||
|
11995 | " content is modified by setting \"ui.commitsubrepos=no\" in a\n" | |||
|
11996 | " configuration file (see :hg:`help config`)." | |||
11975 | msgstr "" |
|
11997 | msgstr "" | |
11976 |
|
11998 | |||
11977 | msgid "" |
|
11999 | msgid "" | |
@@ -12300,13 +12322,13 b' msgid ""' | |||||
12300 | " file://local/filesystem/path[#revision]\n" |
|
12322 | " file://local/filesystem/path[#revision]\n" | |
12301 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
12323 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" | |
12302 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
12324 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" | |
12303 |
" ssh://[user |
|
12325 | " ssh://[user@]host[:port]/[path][#revision]" | |
12304 | msgstr "" |
|
12326 | msgstr "" | |
12305 | " local/filesystem/path[#revision]\n" |
|
12327 | " local/filesystem/path[#revision]\n" | |
12306 | " file://local/filesystem/path[#revision]\n" |
|
12328 | " file://local/filesystem/path[#revision]\n" | |
12307 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
12329 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" | |
12308 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
12330 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" | |
12309 |
" ssh://[user |
|
12331 | " ssh://[user@]host[:port]/[path][#revision]" | |
12310 |
|
12332 | |||
12311 | msgid "" |
|
12333 | msgid "" | |
12312 | "Paths in the local filesystem can either point to Mercurial\n" |
|
12334 | "Paths in the local filesystem can either point to Mercurial\n" | |
@@ -12649,12 +12671,12 b' msgid "no interrupted transaction availa' | |||||
12649 | msgstr "ingen afbrudt transaktion tilgængelig\n" |
|
12671 | msgstr "ingen afbrudt transaktion tilgængelig\n" | |
12650 |
|
12672 | |||
12651 | #, python-format |
|
12673 | #, python-format | |
12652 |
msgid "r |
|
12674 | msgid "repository tip rolled back to revision %s (undo %s: %s)\n" | |
12653 | msgstr "" |
|
12675 | msgstr "spidsen af depotet rullet tilbage til revision %s (omgør %s: %s)\n" | |
12654 |
|
12676 | |||
12655 | #, python-format |
|
12677 | #, python-format | |
12656 |
msgid "r |
|
12678 | msgid "repository tip rolled back to revision %s (undo %s)\n" | |
12657 |
msgstr " |
|
12679 | msgstr "spidsen af depotet rullet tilbage til revision %s (omgør %s)\n" | |
12658 |
|
12680 | |||
12659 | msgid "rolling back unknown transaction\n" |
|
12681 | msgid "rolling back unknown transaction\n" | |
12660 | msgstr "ruller ukendt transaktion tilbage\n" |
|
12682 | msgstr "ruller ukendt transaktion tilbage\n" | |
@@ -12664,6 +12686,14 b' msgid "Named branch could not be reset, ' | |||||
12664 | msgstr "" |
|
12686 | msgstr "" | |
12665 | "Navngiven gren kunne ikke nulstilles, den nuværende gren er stadig: %s\n" |
|
12687 | "Navngiven gren kunne ikke nulstilles, den nuværende gren er stadig: %s\n" | |
12666 |
|
12688 | |||
|
12689 | #, python-format | |||
|
12690 | msgid "working directory now based on revisions %d and %d\n" | |||
|
12691 | msgstr "arbejdsbiblioteket er nu baseret på revisionerne %d og %d\n\n" | |||
|
12692 | ||||
|
12693 | #, python-format | |||
|
12694 | msgid "working directory now based on revision %d\n" | |||
|
12695 | msgstr "arbejdsbiblioteket er nu baseret på revision %d\n" | |||
|
12696 | ||||
12667 | msgid "no rollback information available\n" |
|
12697 | msgid "no rollback information available\n" | |
12668 | msgstr "ingen tilbagerulningsinformation til stede\n" |
|
12698 | msgstr "ingen tilbagerulningsinformation til stede\n" | |
12669 |
|
12699 | |||
@@ -12691,6 +12721,10 b' msgstr ""' | |||||
12691 | msgid "can't commit subrepos without .hgsub" |
|
12721 | msgid "can't commit subrepos without .hgsub" | |
12692 | msgstr "kan ikke deponere underdepoter uden .hgsub" |
|
12722 | msgstr "kan ikke deponere underdepoter uden .hgsub" | |
12693 |
|
12723 | |||
|
12724 | #, python-format | |||
|
12725 | msgid "uncommitted changes in subrepo %s" | |||
|
12726 | msgstr "udeponerede ændringer i underdepot %s" | |||
|
12727 | ||||
12694 | msgid "file not found!" |
|
12728 | msgid "file not found!" | |
12695 | msgstr "filen blev ikke fundet!" |
|
12729 | msgstr "filen blev ikke fundet!" | |
12696 |
|
12730 | |||
@@ -12724,6 +12758,14 b' msgid ""' | |||||
12724 | msgstr "" |
|
12758 | msgstr "" | |
12725 |
|
12759 | |||
12726 | #, python-format |
|
12760 | #, python-format | |
|
12761 | msgid "updating bookmark %s\n" | |||
|
12762 | msgstr "opdaterer bogmærke %s\n" | |||
|
12763 | ||||
|
12764 | #, python-format | |||
|
12765 | msgid "not updating divergent bookmark %s\n" | |||
|
12766 | msgstr "opdaterer ikke divergerende bogmærke %s\n" | |||
|
12767 | ||||
|
12768 | #, python-format | |||
12727 | msgid "%d changesets found\n" |
|
12769 | msgid "%d changesets found\n" | |
12728 | msgstr "fandt %d ændringer\n" |
|
12770 | msgstr "fandt %d ændringer\n" | |
12729 |
|
12771 | |||
@@ -12934,6 +12976,10 b' msgid "outstanding uncommitted changes (' | |||||
12934 | msgstr "" |
|
12976 | msgstr "" | |
12935 | "udestående ikke-deponerede ændringer (brug 'hg status' for at se ændringer)" |
|
12977 | "udestående ikke-deponerede ændringer (brug 'hg status' for at se ændringer)" | |
12936 |
|
12978 | |||
|
12979 | #, python-format | |||
|
12980 | msgid "outstanding uncommitted changes in subrepository '%s'" | |||
|
12981 | msgstr "udeponerede ændringer i underdepot '%s'" | |||
|
12982 | ||||
12937 | msgid "crosses branches (merge branches or use --clean to discard changes)" |
|
12983 | msgid "crosses branches (merge branches or use --clean to discard changes)" | |
12938 | msgstr "" |
|
12984 | msgstr "" | |
12939 | "krydser grene (sammenføj grenene eller brug --clean for at kassere " |
|
12985 | "krydser grene (sammenføj grenene eller brug --clean for at kassere " | |
@@ -13467,6 +13513,21 b' msgstr "tag tager et eller to argumenter' | |||||
13467 | msgid "the argument to tag must be a string" |
|
13513 | msgid "the argument to tag must be a string" | |
13468 | msgstr "argumentet til tag skal være en streng" |
|
13514 | msgstr "argumentet til tag skal være en streng" | |
13469 |
|
13515 | |||
|
13516 | msgid "" | |||
|
13517 | "``bookmark([name])``\n" | |||
|
13518 | " The named bookmark or all bookmarks." | |||
|
13519 | msgstr "" | |||
|
13520 | "``bookmark([name])``\n" | |||
|
13521 | " Det navngivne bogmærke eller alle bogmærker." | |||
|
13522 | ||||
|
13523 | #. i18n: "bookmark" is a keyword | |||
|
13524 | msgid "bookmark takes one or no arguments" | |||
|
13525 | msgstr "bookmark tager et eller to argumenter" | |||
|
13526 | ||||
|
13527 | #. i18n: "bookmark" is a keyword | |||
|
13528 | msgid "the argument to bookmark must be a string" | |||
|
13529 | msgstr "argumentet til bookmark skal være en streng" | |||
|
13530 | ||||
13470 | msgid "can't negate that" |
|
13531 | msgid "can't negate that" | |
13471 | msgstr "" |
|
13532 | msgstr "" | |
13472 |
|
13533 | |||
@@ -13563,6 +13624,18 b' msgid ""' | |||||
13563 | msgstr "" |
|
13624 | msgstr "" | |
13564 |
|
13625 | |||
13565 | #, python-format |
|
13626 | #, python-format | |
|
13627 | msgid "" | |||
|
13628 | " subrepository sources for %s differ\n" | |||
|
13629 | "use (l)ocal source (%s) or (r)emote source (%s)?\n" | |||
|
13630 | msgstr "" | |||
|
13631 | ||||
|
13632 | #, python-format | |||
|
13633 | msgid "" | |||
|
13634 | " subrepository sources for %s differ (in checked out version)\n" | |||
|
13635 | "use (l)ocal source (%s) or (r)emote source (%s)?\n" | |||
|
13636 | msgstr "" | |||
|
13637 | ||||
|
13638 | #, python-format | |||
13566 | msgid "default path for subrepository %s not found" |
|
13639 | msgid "default path for subrepository %s not found" | |
13567 | msgstr "" |
|
13640 | msgstr "" | |
13568 |
|
13641 | |||
@@ -13641,7 +13714,7 b' msgstr ""' | |||||
13641 | msgid "node '%s' is not well formed" |
|
13714 | msgid "node '%s' is not well formed" | |
13642 | msgstr "knude '%s' er ikke korrekt formet" |
|
13715 | msgstr "knude '%s' er ikke korrekt formet" | |
13643 |
|
13716 | |||
13644 |
msgid ".hg/ |
|
13717 | msgid ".hg/cache/tags is corrupt, rebuilding it\n" | |
13645 | msgstr "" |
|
13718 | msgstr "" | |
13646 |
|
13719 | |||
13647 | #, python-format |
|
13720 | #, python-format | |
@@ -13739,6 +13812,10 b' msgstr "kodeord: "' | |||||
13739 | msgid "edit failed" |
|
13812 | msgid "edit failed" | |
13740 | msgstr "redigering fejlede" |
|
13813 | msgstr "redigering fejlede" | |
13741 |
|
13814 | |||
|
13815 | #, python-format | |||
|
13816 | msgid "ignoring invalid [auth] key '%s'\n" | |||
|
13817 | msgstr "ignorerer ugyldig [auth] nøgle '%s'\n" | |||
|
13818 | ||||
13742 | msgid "http authorization required" |
|
13819 | msgid "http authorization required" | |
13743 | msgstr "" |
|
13820 | msgstr "" | |
13744 |
|
13821 | |||
@@ -13760,10 +13837,6 b' msgstr "bruger:"' | |||||
13760 | msgid "http auth: user %s, password %s\n" |
|
13837 | msgid "http auth: user %s, password %s\n" | |
13761 | msgstr "http godkendelse: bruger %s, kodeord %s\n" |
|
13838 | msgstr "http godkendelse: bruger %s, kodeord %s\n" | |
13762 |
|
13839 | |||
13763 | #, python-format |
|
|||
13764 | msgid "ignoring invalid [auth] key '%s'\n" |
|
|||
13765 | msgstr "ignorerer ugyldig [auth] nøgle '%s'\n" |
|
|||
13766 |
|
||||
13767 | msgid "kb" |
|
13840 | msgid "kb" | |
13768 | msgstr "" |
|
13841 | msgstr "" | |
13769 |
|
13842 | |||
@@ -13777,12 +13850,29 b' msgstr "modtog ikke noget certifikat"' | |||||
13777 | msgid "certificate is for %s" |
|
13850 | msgid "certificate is for %s" | |
13778 | msgstr "certifikatet er for %s" |
|
13851 | msgstr "certifikatet er for %s" | |
13779 |
|
13852 | |||
13780 | msgid "no commonName found in certificate" |
|
13853 | msgid "IDN in certificate not supported" | |
13781 |
msgstr " |
|
13854 | msgstr "IDN er ikke supporteret i certifikatet" | |
13782 |
|
13855 | |||
13783 | #, python-format |
|
13856 | msgid "no commonName or subjectAltName found in certificate" | |
13784 | msgid "%s certificate error: %s" |
|
13857 | msgstr "fandt ikke noget commonName eller subjectAltName i certifikatet" | |
13785 | msgstr "%s certifikatfejl: %s" |
|
13858 | ||
|
13859 | #, python-format | |||
|
13860 | msgid "%s certificate error: %s (use --insecure to connect insecurely)" | |||
|
13861 | msgstr "" | |||
|
13862 | ||||
|
13863 | #, python-format | |||
|
13864 | msgid "invalid certificate for %s with fingerprint %s" | |||
|
13865 | msgstr "" | |||
|
13866 | ||||
|
13867 | #, python-format | |||
|
13868 | msgid "" | |||
|
13869 | "warning: %s certificate with fingerprint %s not verified (check " | |||
|
13870 | "hostfingerprints or web.cacerts config setting)\n" | |||
|
13871 | msgstr "" | |||
|
13872 | ||||
|
13873 | #, python-format | |||
|
13874 | msgid "no certificate for %s with configured hostfingerprint" | |||
|
13875 | msgstr "" | |||
13786 |
|
13876 | |||
13787 | #, python-format |
|
13877 | #, python-format | |
13788 | msgid "" |
|
13878 | msgid "" | |
@@ -13809,9 +13899,6 b' msgstr "stien %r er inde i repo %r"' | |||||
13809 | msgid "path %r traverses symbolic link %r" |
|
13899 | msgid "path %r traverses symbolic link %r" | |
13810 | msgstr "stien %r følger symbolsk link %r" |
|
13900 | msgstr "stien %r følger symbolsk link %r" | |
13811 |
|
13901 | |||
13812 | msgid "Hardlinks not supported" |
|
|||
13813 | msgstr "Hardlinks er ikke supporteret" |
|
|||
13814 |
|
||||
13815 | #, python-format |
|
13902 | #, python-format | |
13816 | msgid "could not symlink to %r: %s" |
|
13903 | msgid "could not symlink to %r: %s" | |
13817 | msgstr "kunne ikke lave et symbolsk link til %r: %s" |
|
13904 | msgstr "kunne ikke lave et symbolsk link til %r: %s" | |
@@ -14054,17 +14141,14 b' msgstr "fandt %d integritetsfejl!\\n"' | |||||
14054 | msgid "(first damaged changeset appears to be %d)\n" |
|
14141 | msgid "(first damaged changeset appears to be %d)\n" | |
14055 | msgstr "(første beskadigede ændring er tilsyneladende %d)\n" |
|
14142 | msgstr "(første beskadigede ændring er tilsyneladende %d)\n" | |
14056 |
|
14143 | |||
14057 | msgid "user name not available - set USERNAME environment variable" |
|
|||
14058 | msgstr "der er ikke noget brugernavn - sæt USERNAME miljøvariabel" |
|
|||
14059 |
|
||||
14060 | msgid "look up remote revision" |
|
14144 | msgid "look up remote revision" | |
14061 | msgstr "" |
|
14145 | msgstr "" | |
14062 |
|
14146 | |||
|
14147 | msgid "push failed (unexpected response):" | |||
|
14148 | msgstr "skub fejlede (uventet svar):" | |||
|
14149 | ||||
14063 | msgid "look up remote changes" |
|
14150 | msgid "look up remote changes" | |
14064 | msgstr "" |
|
14151 | msgstr "" | |
14065 |
|
14152 | |||
14066 | msgid "push failed:" |
|
14153 | msgid "push failed:" | |
14067 | msgstr "skub fejlede:" |
|
14154 | msgstr "skub fejlede:" | |
14068 |
|
||||
14069 | msgid "push failed (unexpected response):" |
|
|||
14070 | msgstr "skub fejlede (uventet svar):" |
|
This diff has been collapsed as it changes many lines, (3412 lines changed) Show them Hide them | |||||
@@ -37,7 +37,7 b' msgid ""' | |||||
37 | msgstr "" |
|
37 | msgstr "" | |
38 | "Project-Id-Version: Mercurial\n" |
|
38 | "Project-Id-Version: Mercurial\n" | |
39 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
39 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" | |
40 |
"POT-Creation-Date: 201 |
|
40 | "POT-Creation-Date: 2011-02-24 11:45+0100\n" | |
41 | "PO-Revision-Date: 2010-12-24 15:09+0100\n" |
|
41 | "PO-Revision-Date: 2010-12-24 15:09+0100\n" | |
42 | "Last-Translator: Martin Roppelt <m.p.roppelt@web.de>\n" |
|
42 | "Last-Translator: Martin Roppelt <m.p.roppelt@web.de>\n" | |
43 | "Language-Team: German (http://transifex.net/projects/p/mercurial/team/de/) " |
|
43 | "Language-Team: German (http://transifex.net/projects/p/mercurial/team/de/) " | |
@@ -58,8 +58,18 b' msgstr "Optionen"' | |||||
58 | msgid "Commands" |
|
58 | msgid "Commands" | |
59 | msgstr "Befehle" |
|
59 | msgstr "Befehle" | |
60 |
|
60 | |||
61 | msgid " options:" |
|
61 | #, fuzzy | |
62 | msgstr " Optionen:" |
|
62 | msgid "Extensions" | |
|
63 | msgstr "%s Erweiterung - %s" | |||
|
64 | ||||
|
65 | msgid "" | |||
|
66 | "This section contains help for extensions that are distributed together with " | |||
|
67 | "Mercurial. Help for other extensions is available in the help system." | |||
|
68 | msgstr "" | |||
|
69 | ||||
|
70 | #, fuzzy | |||
|
71 | msgid "Options:" | |||
|
72 | msgstr "Optionen" | |||
63 |
|
73 | |||
64 | #, python-format |
|
74 | #, python-format | |
65 | msgid " aliases: %s" |
|
75 | msgid " aliases: %s" | |
@@ -120,10 +130,8 b' msgstr ""' | |||||
120 |
|
130 | |||
121 | msgid "" |
|
131 | msgid "" | |
122 | "Branch-based Access Control\n" |
|
132 | "Branch-based Access Control\n" | |
123 | "---------------------------" |
|
133 | "..........................." | |
124 | msgstr "" |
|
134 | msgstr "" | |
125 | "Zweigbasierte Zugriffskontrolle\n" |
|
|||
126 | "-------------------------------" |
|
|||
127 |
|
135 | |||
128 | msgid "" |
|
136 | msgid "" | |
129 | "Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" |
|
137 | "Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" | |
@@ -153,10 +161,8 b' msgstr ""' | |||||
153 |
|
161 | |||
154 | msgid "" |
|
162 | msgid "" | |
155 | "Path-based Access Control\n" |
|
163 | "Path-based Access Control\n" | |
156 | "-------------------------" |
|
164 | "........................." | |
157 | msgstr "" |
|
165 | msgstr "" | |
158 | "Pfadbasierte Zugriffskontrolle\n" |
|
|||
159 | "------------------------------" |
|
|||
160 |
|
166 | |||
161 | msgid "" |
|
167 | msgid "" | |
162 | "Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n" |
|
168 | "Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n" | |
@@ -172,10 +178,8 b' msgstr ""' | |||||
172 |
|
178 | |||
173 | msgid "" |
|
179 | msgid "" | |
174 | "Groups\n" |
|
180 | "Groups\n" | |
175 | "------" |
|
181 | "......" | |
176 | msgstr "" |
|
182 | msgstr "" | |
177 | "Gruppen\n" |
|
|||
178 | "-------" |
|
|||
179 |
|
183 | |||
180 | msgid "" |
|
184 | msgid "" | |
181 | "Group names must be prefixed with an ``@`` symbol. Specifying a group\n" |
|
185 | "Group names must be prefixed with an ``@`` symbol. Specifying a group\n" | |
@@ -195,12 +199,11 b' msgstr ""' | |||||
195 | "läuft, wird die Liste der Benutzer vom Betriebssystem abgerufen.\n" |
|
199 | "läuft, wird die Liste der Benutzer vom Betriebssystem abgerufen.\n" | |
196 | "Andernfalls wird eine Ausnahme ausgelöst." |
|
200 | "Andernfalls wird eine Ausnahme ausgelöst." | |
197 |
|
201 | |||
|
202 | #, fuzzy | |||
198 | msgid "" |
|
203 | msgid "" | |
199 | "Example Configuration\n" |
|
204 | "Example Configuration\n" | |
200 | "---------------------" |
|
205 | "....................." | |
201 | msgstr "" |
|
206 | msgstr "Beispielkonfiguration:" | |
202 | "Beispiel-Konfiguration\n" |
|
|||
203 | "----------------------" |
|
|||
204 |
|
207 | |||
205 | msgid "::" |
|
208 | msgid "::" | |
206 | msgstr "::" |
|
209 | msgstr "::" | |
@@ -403,180 +406,6 b' msgstr ""' | |||||
403 | msgid "acl: access denied for changeset %s" |
|
406 | msgid "acl: access denied for changeset %s" | |
404 | msgstr "acl: Zugriff verweigert auf den Änderungssatz %s" |
|
407 | msgstr "acl: Zugriff verweigert auf den Änderungssatz %s" | |
405 |
|
408 | |||
406 | msgid "track a line of development with movable markers" |
|
|||
407 | msgstr "Folgt einem Entwicklungsstrang mit einer beweglichen Markierung" |
|
|||
408 |
|
||||
409 | msgid "" |
|
|||
410 | "Bookmarks are local movable markers to changesets. Every bookmark\n" |
|
|||
411 | "points to a changeset identified by its hash. If you commit a\n" |
|
|||
412 | "changeset that is based on a changeset that has a bookmark on it, the\n" |
|
|||
413 | "bookmark shifts to the new changeset." |
|
|||
414 | msgstr "" |
|
|||
415 | "Lesezeichen sind lokale, bewegliche Markierungen für Änderungssätze. Jedes\n" |
|
|||
416 | "Lesezeichen zeigt auf einen Änderungssatz, angegeben durch dessen\n" |
|
|||
417 | "Prüfsumme. Wenn Sie einen Commit ausführen, der auf einem Änderungssatz\n" |
|
|||
418 | "mit einem Lesezeichen basiert, bewegt sich das Lesezeichen zum neuen\n" |
|
|||
419 | "Änderungssatz." |
|
|||
420 |
|
||||
421 | msgid "" |
|
|||
422 | "It is possible to use bookmark names in every revision lookup (e.g.\n" |
|
|||
423 | ":hg:`merge`, :hg:`update`)." |
|
|||
424 | msgstr "" |
|
|||
425 | "Es ist möglich, Lesezeichen in jeder Revisionsabfrage zu verwenden\n" |
|
|||
426 | "(z.B. :hg:`merge`, :hg:`update`)." |
|
|||
427 |
|
||||
428 | msgid "" |
|
|||
429 | "By default, when several bookmarks point to the same changeset, they\n" |
|
|||
430 | "will all move forward together. It is possible to obtain a more\n" |
|
|||
431 | "git-like experience by adding the following configuration option to\n" |
|
|||
432 | "your configuration file::" |
|
|||
433 | msgstr "" |
|
|||
434 | "Standardmäßig werden, wenn mehrere Lesezeichen auf einen Änderungssatz\n" |
|
|||
435 | "zeigen, alle aktualisiert. Ist es möglich, ein Git-ähnliches Verhalten\n" |
|
|||
436 | "zu erzeugen, indem die folgenden Einstellungen in die Konfigurationsdatei\n" |
|
|||
437 | "eingefügt werden::" |
|
|||
438 |
|
||||
439 | msgid "" |
|
|||
440 | " [bookmarks]\n" |
|
|||
441 | " track.current = True" |
|
|||
442 | msgstr "" |
|
|||
443 | " [bookmarks]\n" |
|
|||
444 | " track.current = True" |
|
|||
445 |
|
||||
446 | msgid "" |
|
|||
447 | "This will cause Mercurial to track the bookmark that you are currently\n" |
|
|||
448 | "using, and only update it. This is similar to git's approach to\n" |
|
|||
449 | "branching.\n" |
|
|||
450 | msgstr "" |
|
|||
451 | "Dies wird Mercurial dazu bringen, das Lesezeichen, das Sie im Moment\n" |
|
|||
452 | "nutzen, zu verfolgen und nur dies zu aktualisieren. Dies ist ähnlich zur\n" |
|
|||
453 | "Vorgehensweise von Git bei Verzweigungen.\n" |
|
|||
454 |
|
||||
455 | msgid "" |
|
|||
456 | " Bookmarks are pointers to certain commits that move when\n" |
|
|||
457 | " committing. Bookmarks are local. They can be renamed, copied and\n" |
|
|||
458 | " deleted. It is possible to use bookmark names in :hg:`merge` and\n" |
|
|||
459 | " :hg:`update` to merge and update respectively to a given bookmark." |
|
|||
460 | msgstr "" |
|
|||
461 | " Lesezeichen sind Zeiger auf bestimmte Versionen, die mitwandern,\n" |
|
|||
462 | " wenn eine neuen Version erzeugt wird. Lesezeichen sind nur lokal.\n" |
|
|||
463 | " Sie können umbenannt, kopiert und gelöscht werden. Es ist möglich,\n" |
|
|||
464 | " Lesezeichen bei :hg: `merge` und :hg:`update` zu nutzen, um auf das\n" |
|
|||
465 | " angegebene Lesezeichen zu aktualisieren." |
|
|||
466 |
|
||||
467 | msgid "" |
|
|||
468 | " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" |
|
|||
469 | " directory's parent revision with the given name. If you specify\n" |
|
|||
470 | " a revision using -r REV (where REV may be an existing bookmark),\n" |
|
|||
471 | " the bookmark is assigned to that revision.\n" |
|
|||
472 | " " |
|
|||
473 | msgstr "" |
|
|||
474 | " Man kann :hg:`bookmark NAME` aufrufen, um ein Lesezeichen mit dem\n" |
|
|||
475 | " angegeben Namen auf der aktuellen Spitze (tip) zu setzen. Bei Angabe\n" |
|
|||
476 | " einer Revision mit -r REV (REV kann ein vorhandenes Lesezeichen sein) \n" |
|
|||
477 | " wird das Lesezeichen auf dieser Revision gesetzt.\n" |
|
|||
478 | " " |
|
|||
479 |
|
||||
480 | msgid "a bookmark of this name does not exist" |
|
|||
481 | msgstr "Es existiert kein Lesezeichen mit diesem Namen" |
|
|||
482 |
|
||||
483 | msgid "a bookmark of the same name already exists" |
|
|||
484 | msgstr "Ein Lesezeichen mit diesem Namen existiert bereits" |
|
|||
485 |
|
||||
486 | msgid "new bookmark name required" |
|
|||
487 | msgstr "Ein neuer Name für das Lesezeichen muss übergeben werden" |
|
|||
488 |
|
||||
489 | msgid "bookmark name required" |
|
|||
490 | msgstr "Ein Name für das Lesezeichen muss übergeben werden" |
|
|||
491 |
|
||||
492 | msgid "bookmark name cannot contain newlines" |
|
|||
493 | msgstr "Ein Lesezeichenname darf keine Zeilenumbrüche enthalten" |
|
|||
494 |
|
||||
495 | msgid "bookmark names cannot consist entirely of whitespace" |
|
|||
496 | msgstr "Ein Lesezeichenname darf nicht ausschließlich aus Leerraum bestehen" |
|
|||
497 |
|
||||
498 | msgid "a bookmark cannot have the name of an existing branch" |
|
|||
499 | msgstr "" |
|
|||
500 | "Ein Lesezeichen darf nicht denselben Namen wie ein existierender Zweig haben" |
|
|||
501 |
|
||||
502 | msgid "no bookmarks set\n" |
|
|||
503 | msgstr "Keine Lesezeichen gesetzt\n" |
|
|||
504 |
|
||||
505 | #, python-format |
|
|||
506 | msgid "updating bookmark %s\n" |
|
|||
507 | msgstr "Aktualisiere Lesezeichen %s\n" |
|
|||
508 |
|
||||
509 | #, python-format |
|
|||
510 | msgid "not updating divergent bookmark %s\n" |
|
|||
511 | msgstr "Aktualisiere nicht divergierendes Lesezeichen %s\n" |
|
|||
512 |
|
||||
513 | #, python-format |
|
|||
514 | msgid "updating bookmark %s failed!\n" |
|
|||
515 | msgstr "Aktualisieren des Lesezeichens %s fehlgeschlagen!\n" |
|
|||
516 |
|
||||
517 | #, python-format |
|
|||
518 | msgid "remote bookmark %s not found!" |
|
|||
519 | msgstr "Entferntes Lesezeichen %s wurde nicht gefunden!" |
|
|||
520 |
|
||||
521 | #, python-format |
|
|||
522 | msgid "importing bookmark %s\n" |
|
|||
523 | msgstr "Importierte Lesezeichen %s\n" |
|
|||
524 |
|
||||
525 | #, python-format |
|
|||
526 | msgid "exporting bookmark %s\n" |
|
|||
527 | msgstr "Exportiere Lesezeichen %s\n" |
|
|||
528 |
|
||||
529 | #, python-format |
|
|||
530 | msgid "deleting remote bookmark %s\n" |
|
|||
531 | msgstr "Lösche entferntes Lesezeichen %s\n" |
|
|||
532 |
|
||||
533 | #, python-format |
|
|||
534 | msgid "bookmark %s does not exist on the local or remote repository!\n" |
|
|||
535 | msgstr "Lesezeichen %s existiert weder im lokalen noch im entfernten Archiv!\n" |
|
|||
536 |
|
||||
537 | msgid "searching for changes\n" |
|
|||
538 | msgstr "Suche nach Änderungen\n" |
|
|||
539 |
|
||||
540 | msgid "no changes found\n" |
|
|||
541 | msgstr "Keine Änderungen gefunden\n" |
|
|||
542 |
|
||||
543 | #, python-format |
|
|||
544 | msgid "comparing with %s\n" |
|
|||
545 | msgstr "Vergleiche mit %s\n" |
|
|||
546 |
|
||||
547 | msgid "bookmark to import" |
|
|||
548 | msgstr "Zu importierendes Lesezeichen" |
|
|||
549 |
|
||||
550 | msgid "BOOKMARK" |
|
|||
551 | msgstr "LESEZEICHEN" |
|
|||
552 |
|
||||
553 | msgid "bookmark to export" |
|
|||
554 | msgstr "Zu exportierendes Lesezeichen" |
|
|||
555 |
|
||||
556 | msgid "compare bookmark" |
|
|||
557 | msgstr "Vergleiche Lesezeichen" |
|
|||
558 |
|
||||
559 | msgid "force" |
|
|||
560 | msgstr "erzwinge" |
|
|||
561 |
|
||||
562 | msgid "REV" |
|
|||
563 | msgstr "REV" |
|
|||
564 |
|
||||
565 | msgid "revision" |
|
|||
566 | msgstr "Revision" |
|
|||
567 |
|
||||
568 | msgid "delete a given bookmark" |
|
|||
569 | msgstr "Löscht ein gegebenes Lesezeichen" |
|
|||
570 |
|
||||
571 | msgid "NAME" |
|
|||
572 | msgstr "NAME" |
|
|||
573 |
|
||||
574 | msgid "rename a given bookmark" |
|
|||
575 | msgstr "Benennt ein gegebenes Lesezeichen um" |
|
|||
576 |
|
||||
577 | msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" |
|
|||
578 | msgstr "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" |
|
|||
579 |
|
||||
580 | msgid "hooks for integrating with the Bugzilla bug tracker" |
|
409 | msgid "hooks for integrating with the Bugzilla bug tracker" | |
581 | msgstr "Hooks zur Integration mit dem Bugzilla Bugtracker" |
|
410 | msgstr "Hooks zur Integration mit dem Bugzilla Bugtracker" | |
582 |
|
411 | |||
@@ -966,6 +795,9 b' msgstr ""' | |||||
966 | " dem Argument von --rev).\n" |
|
795 | " dem Argument von --rev).\n" | |
967 | " " |
|
796 | " " | |
968 |
|
797 | |||
|
798 | msgid "REV" | |||
|
799 | msgstr "REV" | |||
|
800 | ||||
969 | msgid "show children of the specified revision" |
|
801 | msgid "show children of the specified revision" | |
970 | msgstr "Zeigt die Kinder der übergebenen Revision" |
|
802 | msgstr "Zeigt die Kinder der übergebenen Revision" | |
971 |
|
803 | |||
@@ -1236,6 +1068,8 b' msgstr "Ignoriere unbekannte Farbe/Effek' | |||||
1236 | msgid "win32console not found, please install pywin32\n" |
|
1068 | msgid "win32console not found, please install pywin32\n" | |
1237 | msgstr "win32console nicht gefunden, bitte installiere pywin32\n" |
|
1069 | msgstr "win32console nicht gefunden, bitte installiere pywin32\n" | |
1238 |
|
1070 | |||
|
1071 | #. i18n: 'always', 'auto', and 'never' are keywords and should | |||
|
1072 | #. not be translated | |||
1239 | msgid "when to colorize (boolean, always, auto, or never)" |
|
1073 | msgid "when to colorize (boolean, always, auto, or never)" | |
1240 | msgstr "Wann soll eingefärbt werden (boolescher Wert, always, auto oder never)" |
|
1074 | msgstr "Wann soll eingefärbt werden (boolescher Wert, always, auto oder never)" | |
1241 |
|
1075 | |||
@@ -1338,11 +1172,12 b' msgstr ""' | |||||
1338 | " --sourcesort Versucht die Reihenfolge der Quellrevisionen zu erhalten.\n" |
|
1172 | " --sourcesort Versucht die Reihenfolge der Quellrevisionen zu erhalten.\n" | |
1339 | " Dies wird nur bei Mercurial als Quelle unterstützt." |
|
1173 | " Dies wird nur bei Mercurial als Quelle unterstützt." | |
1340 |
|
1174 | |||
1341 | msgid "" |
|
1175 | #, fuzzy | |
1342 | " If <REVMAP> isn't given, it will be put in a default location\n" |
|
1176 | msgid "" | |
1343 | " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" |
|
1177 | " If ``REVMAP`` isn't given, it will be put in a default location\n" | |
1344 | " that maps each source commit ID to the destination ID for that\n" |
|
1178 | " (``<dest>/.hg/shamap`` by default). The ``REVMAP`` is a simple\n" | |
1345 | " revision, like so::" |
|
1179 | " text file that maps each source commit ID to the destination ID\n" | |
|
1180 | " for that revision, like so::" | |||
1346 | msgstr "" |
|
1181 | msgstr "" | |
1347 | " Wenn <REVMAP> nicht gegeben ist, wird es in einer standardisierten\n" |
|
1182 | " Wenn <REVMAP> nicht gegeben ist, wird es in einer standardisierten\n" | |
1348 | " Stelle (standardmäßig <dest>/.hg/shamap) abgelegt. Die <REVMAP> ist\n" |
|
1183 | " Stelle (standardmäßig <dest>/.hg/shamap) abgelegt. Die <REVMAP> ist\n" | |
@@ -1498,49 +1333,53 b' msgstr ""' | |||||
1498 | " Quellcode aus einem Archiv aus dem default-Zweig in einen benannten\n" |
|
1333 | " Quellcode aus einem Archiv aus dem default-Zweig in einen benannten\n" | |
1499 | " Zweig zu verschieben." |
|
1334 | " Zweig zu verschieben." | |
1500 |
|
1335 | |||
|
1336 | #, fuzzy | |||
1501 | msgid "" |
|
1337 | msgid "" | |
1502 | " Mercurial Source\n" |
|
1338 | " Mercurial Source\n" | |
1503 | " ----------------" |
|
1339 | " ''''''''''''''''" | |
1504 | msgstr "" |
|
1340 | msgstr "" | |
1505 | " Mercurial als Quelle\n" |
|
1341 | " Mercurial als Quelle\n" | |
1506 | " --------------------" |
|
1342 | " --------------------" | |
1507 |
|
1343 | |||
1508 | msgid "" |
|
1344 | msgid "" | |
1509 | " --config convert.hg.ignoreerrors=False (boolean)\n" |
|
1345 | " The Mercurial source recognizes the following configuration\n" | |
1510 | " ignore integrity errors when reading. Use it to fix Mercurial\n" |
|
1346 | " options, which you can set on the command line with ``--config``:" | |
1511 | " repositories with missing revlogs, by converting from and to\n" |
|
1347 | msgstr "" | |
1512 | " Mercurial.\n" |
|
1348 | ||
1513 | " --config convert.hg.saverev=False (boolean)\n" |
|
1349 | msgid "" | |
1514 | " store original revision ID in changeset (forces target IDs to\n" |
|
1350 | " :convert.hg.ignoreerrors: ignore integrity errors when reading.\n" | |
1515 | " change)\n" |
|
1351 | " Use it to fix Mercurial repositories with missing revlogs, by\n" | |
1516 | " --config convert.hg.startrev=0 (hg revision identifier)\n" |
|
1352 | " converting from and to Mercurial. Default is False." | |
1517 | " convert start revision and its descendants" |
|
1353 | msgstr "" | |
1518 | msgstr "" |
|
1354 | ||
1519 | " --config convert.hg.ignoreerrors=False (boolescher Wert)\n" |
|
1355 | msgid "" | |
1520 | " Ignoriert Integritätsfehler beim Lesen. Wird benutzt um Mercurial-\n" |
|
1356 | " :convert.hg.saverev: store original. revision ID in changeset\n" | |
1521 | " Archive ohne Revlog zu korrigieren, wenn von hg in hg konvertiert\n" |
|
1357 | " (forces target IDs to change). It takes and boolean argument\n" | |
1522 | " wird.\n" |
|
1358 | " and defaults to False." | |
1523 | " --config convert.hg.saverev=False (boolescher Wert)\n" |
|
1359 | msgstr "" | |
1524 | " Speichert die Original-Revisions-ID im Änderunsgsatz (erzwingt\n" |
|
1360 | ||
1525 | " Änderung der Ziel-IDs)\n" |
|
1361 | msgid "" | |
1526 | " --config convert.hg.startrev=0 (hg Revisions-ID)\n" |
|
1362 | " :convert.hg.startrev: convert start revision and its descendants.\n" | |
1527 | " Konvertiert alle Nachfahren ab Startrevision" |
|
1363 | " It takes a hg revision identifier and defaults to 0." | |
1528 |
|
1364 | msgstr "" | ||
|
1365 | ||||
|
1366 | #, fuzzy | |||
1529 | msgid "" |
|
1367 | msgid "" | |
1530 | " CVS Source\n" |
|
1368 | " CVS Source\n" | |
1531 | " ----------" |
|
1369 | " ''''''''''" | |
1532 | msgstr "" |
|
1370 | msgstr "" | |
1533 | " CVS als Quelle\n" |
|
1371 | " CVS als Quelle\n" | |
1534 | " --------------" |
|
1372 | " --------------" | |
1535 |
|
1373 | |||
|
1374 | #, fuzzy | |||
1536 | msgid "" |
|
1375 | msgid "" | |
1537 | " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" |
|
1376 | " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" | |
1538 | " to indicate the starting point of what will be converted. Direct\n" |
|
1377 | " to indicate the starting point of what will be converted. Direct\n" | |
1539 | " access to the repository files is not needed, unless of course the\n" |
|
1378 | " access to the repository files is not needed, unless of course the\n" | |
1540 |
" repository is :local:. The conversion uses the top level |
|
1379 | " repository is ``:local:``. The conversion uses the top level\n" | |
1541 |
" in the sandbox to find the CVS repository, and then uses |
|
1380 | " directory in the sandbox to find the CVS repository, and then uses\n" | |
1542 |
" commands to find files to convert. This means that unless |
|
1381 | " CVS rlog commands to find files to convert. This means that unless\n" | |
1543 | " filemap is given, all files under the starting directory will be\n" |
|
1382 | " a filemap is given, all files under the starting directory will be\n" | |
1544 | " converted, and that any directory reorganization in the CVS\n" |
|
1383 | " converted, and that any directory reorganization in the CVS\n" | |
1545 | " sandbox is ignored." |
|
1384 | " sandbox is ignored." | |
1546 | msgstr "" |
|
1385 | msgstr "" | |
@@ -1554,67 +1393,52 b' msgstr ""' | |||||
1554 | " Startverzeichnisses konvertiert und jegliche Verzeichnis-Umordnung im \n" |
|
1393 | " Startverzeichnisses konvertiert und jegliche Verzeichnis-Umordnung im \n" | |
1555 | " Sandkasten ignoriert." |
|
1394 | " Sandkasten ignoriert." | |
1556 |
|
1395 | |||
1557 | msgid " The options shown are the defaults." |
|
1396 | msgid " The following options can be used with ``--config``:" | |
1558 | msgstr " Die folgenden Argumente zeigen die Standardwerte." |
|
1397 | msgstr "" | |
1559 |
|
1398 | |||
1560 | msgid "" |
|
1399 | msgid "" | |
1561 | " --config convert.cvsps.cache=True (boolean)\n" |
|
1400 | " :convert.cvsps.cache: Set to False to disable remote log caching,\n" | |
1562 | " Set to False to disable remote log caching, for testing and\n" |
|
1401 | " for testing and debugging purposes. Default is True." | |
1563 | " debugging purposes.\n" |
|
1402 | msgstr "" | |
1564 | " --config convert.cvsps.fuzz=60 (integer)\n" |
|
1403 | ||
1565 | " Specify the maximum time (in seconds) that is allowed between\n" |
|
1404 | msgid "" | |
1566 | " commits with identical user and log message in a single\n" |
|
1405 | " :convert.cvsps.fuzz: Specify the maximum time (in seconds) that is\n" | |
1567 | " changeset. When very large files were checked in as part of a\n" |
|
1406 | " allowed between commits with identical user and log message in\n" | |
1568 | " changeset then the default may not be long enough.\n" |
|
1407 | " a single changeset. When very large files were checked in as\n" | |
1569 | " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" |
|
1408 | " part of a changeset then the default may not be long enough.\n" | |
1570 | " Specify a regular expression to which commit log messages are\n" |
|
1409 | " The default is 60." | |
1571 | " matched. If a match occurs, then the conversion process will\n" |
|
1410 | msgstr "" | |
1572 | " insert a dummy revision merging the branch on which this log\n" |
|
1411 | ||
1573 | " message occurs to the branch indicated in the regex.\n" |
|
1412 | msgid "" | |
1574 | " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" |
|
1413 | " :convert.cvsps.mergeto: Specify a regular expression to which\n" | |
1575 | " Specify a regular expression to which commit log messages are\n" |
|
1414 | " commit log messages are matched. If a match occurs, then the\n" | |
1576 | " matched. If a match occurs, then the conversion process will\n" |
|
1415 | " conversion process will insert a dummy revision merging the\n" | |
1577 | " add the most recent revision on the branch indicated in the\n" |
|
1416 | " branch on which this log message occurs to the branch\n" | |
1578 | " regex as the second parent of the changeset.\n" |
|
1417 | " indicated in the regex. Default is ``{{mergetobranch\n" | |
1579 | " --config hook.cvslog\n" |
|
1418 | " ([-\\w]+)}}``" | |
1580 | " Specify a Python function to be called at the end of gathering\n" |
|
1419 | msgstr "" | |
1581 | " the CVS log. The function is passed a list with the log entries,\n" |
|
1420 | ||
1582 | " and can modify the entries in-place, or add or delete them.\n" |
|
1421 | msgid "" | |
1583 | " --config hook.cvschangesets\n" |
|
1422 | " :convert.cvsps.mergefrom: Specify a regular expression to which\n" | |
1584 | " Specify a Python function to be called after the changesets\n" |
|
1423 | " commit log messages are matched. If a match occurs, then the\n" | |
1585 | " are calculated from the the CVS log. The function is passed\n" |
|
1424 | " conversion process will add the most recent revision on the\n" | |
1586 | " a list with the changeset entries, and can modify the changesets\n" |
|
1425 | " branch indicated in the regex as the second parent of the\n" | |
1587 | " in-place, or add or delete them." |
|
1426 | " changeset. Default is ``{{mergefrombranch ([-\\w]+)}}``" | |
1588 | msgstr "" |
|
1427 | msgstr "" | |
1589 | " --config convert.cvsps.cache=True (boolescher Wert)\n" |
|
1428 | ||
1590 | " Kann für Tests oder zur Fehlersuche deaktiviert werden, um das\n" |
|
1429 | msgid "" | |
1591 | " Zwischenspeichern des Quell-Logbuchs zu unterbinden.\n" |
|
1430 | " :hook.cvslog: Specify a Python function to be called at the end of\n" | |
1592 | " --config convert.cvsps.fuzz=60 (Ganzzahl)\n" |
|
1431 | " gathering the CVS log. The function is passed a list with the\n" | |
1593 | " Spezifiziert die maximale Zeit (in Sekunden) die zwischen\n" |
|
1432 | " log entries, and can modify the entries in-place, or add or\n" | |
1594 | " einzelnen Änderungssätzen mit selbem Benutzer und Meldung erlaubt\n" |
|
1433 | " delete them." | |
1595 | " ist, damit sie in den gleichen Änderungssatz übernommen werden.\n" |
|
1434 | msgstr "" | |
1596 | " Wenn sehr große Dateien übernommen wurden, ist der Standardwert\n" |
|
1435 | ||
1597 | " vielleicht zu klein.\n" |
|
1436 | msgid "" | |
1598 | " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" |
|
1437 | " :hook.cvschangesets: Specify a Python function to be called after\n" | |
1599 | " Spezifiziert einen Regulären Ausdruck, auf den Versionsmeldungen\n" |
|
1438 | " the changesets are calculated from the the CVS log. The\n" | |
1600 | " geprüft werden. Wenn ein Treffer gefunden wird, wird eine\n" |
|
1439 | " function is passed a list with the changeset entries, and can\n" | |
1601 | " künstliche Revision als Zusammenführung des aktuellen mit dem\n" |
|
1440 | " modify the changesets in-place, or add or delete them." | |
1602 | " gefunden Zweig eingefügt.\n" |
|
1441 | msgstr "" | |
1603 | " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" |
|
|||
1604 | " Spezifiziert einen Regulären Ausdruck, auf den Versionsmeldungen\n" |
|
|||
1605 | " geprüft werden. Wenn ein Treffer gefunden wird, wird die\n" |
|
|||
1606 | " jüngste Revision des angegebenen Zweigs als zweiter Vorfahr der\n" |
|
|||
1607 | " aktuellen Revision angenommen.\n" |
|
|||
1608 | " --config hook.cvslog\n" |
|
|||
1609 | " Spezifiziert eine Python-Funktion, die nach dem Abrufen des\n" |
|
|||
1610 | " CVS-Logs ausgeführt wird. Der Funktion wird eine Liste von\n" |
|
|||
1611 | " Log-Einträgen übergeben, in der in-place Einträge bearbeitet, \n" |
|
|||
1612 | " ergänzt oder gelöscht werden können.\n" |
|
|||
1613 | " --config hook.cvschangesets\n" |
|
|||
1614 | " Spezifiziert eine Python-Funktion, die aufgerufen wird, nachdem\n" |
|
|||
1615 | " die Änderungssätze aus dem CVS-Log berechnet wurden. Der Funktion\n" |
|
|||
1616 | " wird eine Liste von Änderungssätzen übergeben, in der in-place\n" |
|
|||
1617 | " Einträge bearbeitet, ergänzt oder gelöscht werden können." |
|
|||
1618 |
|
1442 | |||
1619 | msgid "" |
|
1443 | msgid "" | |
1620 | " An additional \"debugcvsps\" Mercurial command allows the builtin\n" |
|
1444 | " An additional \"debugcvsps\" Mercurial command allows the builtin\n" | |
@@ -1627,22 +1451,24 b' msgstr ""' | |||||
1627 | " cvsps 2.1 ähnlich. Für weitere Details siehe die Hilfe zu diesem\n" |
|
1451 | " cvsps 2.1 ähnlich. Für weitere Details siehe die Hilfe zu diesem\n" | |
1628 | " Befehl." |
|
1452 | " Befehl." | |
1629 |
|
1453 | |||
|
1454 | #, fuzzy | |||
1630 | msgid "" |
|
1455 | msgid "" | |
1631 | " Subversion Source\n" |
|
1456 | " Subversion Source\n" | |
1632 | " -----------------" |
|
1457 | " '''''''''''''''''" | |
1633 | msgstr "" |
|
1458 | msgstr "" | |
1634 | " Subversion als Quelle\n" |
|
1459 | " Subversion als Quelle\n" | |
1635 | " ---------------------" |
|
1460 | " ---------------------" | |
1636 |
|
1461 | |||
|
1462 | #, fuzzy | |||
1637 | msgid "" |
|
1463 | msgid "" | |
1638 | " Subversion source detects classical trunk/branches/tags layouts.\n" |
|
1464 | " Subversion source detects classical trunk/branches/tags layouts.\n" | |
1639 |
" By default, the supplied |
|
1465 | " By default, the supplied ``svn://repo/path/`` source URL is\n" | |
1640 |
" converted as a single branch. If |
|
1466 | " converted as a single branch. If ``svn://repo/path/trunk`` exists\n" | |
1641 |
" replaces the default branch. If |
|
1467 | " it replaces the default branch. If ``svn://repo/path/branches``\n" | |
1642 | " its subdirectories are listed as possible branches. If\n" |
|
1468 | " exists, its subdirectories are listed as possible branches. If\n" | |
1643 |
" |
|
1469 | " ``svn://repo/path/tags`` exists, it is looked for tags referencing\n" | |
1644 |
" converted branches. Default |
|
1470 | " converted branches. Default ``trunk``, ``branches`` and ``tags``\n" | |
1645 | " can be overridden with following options. Set them to paths\n" |
|
1471 | " values can be overridden with following options. Set them to paths\n" | |
1646 | " relative to the source URL, or leave them blank to disable auto\n" |
|
1472 | " relative to the source URL, or leave them blank to disable auto\n" | |
1647 | " detection." |
|
1473 | " detection." | |
1648 | msgstr "" |
|
1474 | msgstr "" | |
@@ -1658,20 +1484,23 b' msgstr ""' | |||||
1658 | " gesetzt oder leer gelassen werden, um die automatische Erkennung zu\n" |
|
1484 | " gesetzt oder leer gelassen werden, um die automatische Erkennung zu\n" | |
1659 | " verhindern." |
|
1485 | " verhindern." | |
1660 |
|
1486 | |||
1661 | msgid "" |
|
1487 | msgid " The following options can be set with ``--config``:" | |
1662 | " --config convert.svn.branches=branches (directory name)\n" |
|
1488 | msgstr "" | |
1663 | " specify the directory containing branches\n" |
|
1489 | ||
1664 | " --config convert.svn.tags=tags (directory name)\n" |
|
1490 | msgid "" | |
1665 |
" |
|
1491 | " :convert.svn.branches: specify the directory containing branches.\n" | |
1666 | " --config convert.svn.trunk=trunk (directory name)\n" |
|
1492 | " The defaults is ``branches``." | |
1667 | " specify the name of the trunk branch" |
|
1493 | msgstr "" | |
1668 | msgstr "" |
|
1494 | ||
1669 | " --config convert.svn.branches=branches (Verzeichnisname)\n" |
|
1495 | msgid "" | |
1670 | " Spezifiziert das Verzeichnis für die Zweige\n" |
|
1496 | " :convert.svn.tags: specify the directory containing tags. The\n" | |
1671 | " --config convert.svn.tags=tags (Verzeichnisname)\n" |
|
1497 | " default is ``tags``." | |
1672 | " Spezifiziert das Verzeichnis für Tags\n" |
|
1498 | msgstr "" | |
1673 | " --config convert.svn.trunk=trunk (Verzeichnisname)\n" |
|
1499 | ||
1674 | " Spezifiziert den Namen des Hauptzweigs" |
|
1500 | msgid "" | |
|
1501 | " :convert.svn.trunk: specify the name of the trunk branch The\n" | |||
|
1502 | " defauls is ``trunk``." | |||
|
1503 | msgstr "" | |||
1675 |
|
1504 | |||
1676 | msgid "" |
|
1505 | msgid "" | |
1677 | " Source history can be retrieved starting at a specific revision,\n" |
|
1506 | " Source history can be retrieved starting at a specific revision,\n" | |
@@ -1682,27 +1511,30 b' msgstr ""' | |||||
1682 | " Quellhistorie kann vollständig oder ab einer gegebenen Startrevision\n" |
|
1511 | " Quellhistorie kann vollständig oder ab einer gegebenen Startrevision\n" | |
1683 | " erfasst werden:" |
|
1512 | " erfasst werden:" | |
1684 |
|
1513 | |||
1685 | msgid "" |
|
1514 | #, fuzzy | |
1686 | " --config convert.svn.startrev=0 (svn revision number)\n" |
|
1515 | msgid "" | |
1687 |
" |
|
1516 | " :convert.svn.startrev: specify start Subversion revision number.\n" | |
|
1517 | " The default is 0." | |||
1688 | msgstr "" |
|
1518 | msgstr "" | |
1689 | " --config convert.svn.startrev=0 (SVN-Revisionsnummer)\n" |
|
1519 | " --config convert.svn.startrev=0 (SVN-Revisionsnummer)\n" | |
1690 | " Spezifiziert die Startrevision" |
|
1520 | " Spezifiziert die Startrevision" | |
1691 |
|
1521 | |||
|
1522 | #, fuzzy | |||
1692 | msgid "" |
|
1523 | msgid "" | |
1693 | " Perforce Source\n" |
|
1524 | " Perforce Source\n" | |
1694 | " ---------------" |
|
1525 | " '''''''''''''''" | |
1695 | msgstr "" |
|
1526 | msgstr "" | |
1696 | " Perforce als Quelle\n" |
|
1527 | " Perforce als Quelle\n" | |
1697 | " -------------------" |
|
1528 | " -------------------" | |
1698 |
|
1529 | |||
|
1530 | #, fuzzy | |||
1699 | msgid "" |
|
1531 | msgid "" | |
1700 | " The Perforce (P4) importer can be given a p4 depot path or a\n" |
|
1532 | " The Perforce (P4) importer can be given a p4 depot path or a\n" | |
1701 | " client specification as source. It will convert all files in the\n" |
|
1533 | " client specification as source. It will convert all files in the\n" | |
1702 | " source to a flat Mercurial repository, ignoring labels, branches\n" |
|
1534 | " source to a flat Mercurial repository, ignoring labels, branches\n" | |
1703 | " and integrations. Note that when a depot path is given you then\n" |
|
1535 | " and integrations. Note that when a depot path is given you then\n" | |
1704 | " usually should specify a target directory, because otherwise the\n" |
|
1536 | " usually should specify a target directory, because otherwise the\n" | |
1705 | " target may be named ...-hg." |
|
1537 | " target may be named ``...-hg``." | |
1706 | msgstr "" |
|
1538 | msgstr "" | |
1707 | " Der Perforce (P4) Importer kann einen p4 Depotpfad oder eine Client-\n" |
|
1539 | " Der Perforce (P4) Importer kann einen p4 Depotpfad oder eine Client-\n" | |
1708 | " Spezifikation als Quelle annehmen. Alle Dateien werden in ein flaches\n" |
|
1540 | " Spezifikation als Quelle annehmen. Alle Dateien werden in ein flaches\n" | |
@@ -1711,44 +1543,43 b' msgstr ""' | |||||
1711 | " ein Zielpfad genannt werden, da dieser sonst als ...-hg ausfallen\n" |
|
1543 | " ein Zielpfad genannt werden, da dieser sonst als ...-hg ausfallen\n" | |
1712 | " kann." |
|
1544 | " kann." | |
1713 |
|
1545 | |||
|
1546 | #, fuzzy | |||
1714 | msgid "" |
|
1547 | msgid "" | |
1715 | " It is possible to limit the amount of source history to be\n" |
|
1548 | " It is possible to limit the amount of source history to be\n" | |
1716 |
" converted by specifying an initial Perforce revision |
|
1549 | " converted by specifying an initial Perforce revision:" | |
1717 | msgstr "" |
|
1550 | msgstr "" | |
1718 | " Es ist möglich die zu konvertierte Quellhistorie durch Angabe einer\n" |
|
1551 | " Es ist möglich die zu konvertierte Quellhistorie durch Angabe einer\n" | |
1719 | " Startrevision zu begrenzen." |
|
1552 | " Startrevision zu begrenzen." | |
1720 |
|
1553 | |||
1721 | msgid "" |
|
1554 | msgid "" | |
1722 | " --config convert.p4.startrev=0 (perforce changelist number)\n" |
|
1555 | " :convert.p4.startrev: specify initial Perforce revision, a\n" | |
1723 | " specify initial Perforce revision." |
|
1556 | " Perforce changelist number)." | |
1724 | msgstr "" |
|
1557 | msgstr "" | |
1725 | " --config convert.p4.startrev=0 (Perforce Changelist-Nummer)\n" |
|
|||
1726 | " Spezifiziert die Startrevision" |
|
|||
1727 |
|
1558 | |||
1728 | msgid "" |
|
1559 | msgid "" | |
1729 | " Mercurial Destination\n" |
|
1560 | " Mercurial Destination\n" | |
1730 | " ---------------------" |
|
1561 | " '''''''''''''''''''''" | |
1731 | msgstr "" |
|
1562 | msgstr "" | |
1732 | " Mercurial als Ziel\n" |
|
1563 | ||
1733 | " ------------------" |
|
1564 | #, fuzzy | |
1734 |
|
1565 | msgid " The following options are supported:" | ||
1735 | msgid "" |
|
1566 | msgstr "Die folgenden Prädikate werden unterstützt:" | |
1736 | " --config convert.hg.clonebranches=False (boolean)\n" |
|
1567 | ||
1737 | " dispatch source branches in separate clones.\n" |
|
1568 | msgid "" | |
1738 | " --config convert.hg.tagsbranch=default (branch name)\n" |
|
1569 | " :convert.hg.clonebranches: dispatch source branches in separate\n" | |
1739 | " tag revisions branch name\n" |
|
1570 | " clones. The default is False." | |
1740 | " --config convert.hg.usebranchnames=True (boolean)\n" |
|
1571 | msgstr "" | |
1741 | " preserve branch names" |
|
1572 | ||
1742 |
msg |
|
1573 | msgid "" | |
1743 | " --config convert.hg.clonebranches=False (boolescher Wert)\n" |
|
1574 | " :convert.hg.tagsbranch: branch name for tag revisions, defaults to\n" | |
1744 | " Lagert Quellzweige in separaten Klonen ab.\n" |
|
1575 | " ``default``." | |
1745 | " --config convert.hg.tagsbranch=default (Zweigname)\n" |
|
1576 | msgstr "" | |
1746 | " Name des Zweigs, der die Tags enthalten soll.\n" |
|
1577 | ||
1747 | " --config convert.hg.usebranchnames=True (boolescher Wert)\n" |
|
1578 | msgid "" | |
1748 | " Erhält die Zweignamen" |
|
1579 | " :convert.hg.usebranchnames: preserve branch names. The default is\n" | |
1749 |
|
1580 | " True\n" | ||
1750 |
|
|
1581 | " " | |
1751 |
msgstr " |
|
1582 | msgstr "" | |
1752 |
|
1583 | |||
1753 | msgid "create changeset information from CVS" |
|
1584 | msgid "create changeset information from CVS" | |
1754 | msgstr "erstellt Änderungssatz-Informationen aus CVS" |
|
1585 | msgstr "erstellt Änderungssatz-Informationen aus CVS" | |
@@ -2086,6 +1917,14 b' msgstr "darcs Version 2.1 oder neuer ben\xc3\xb6tigt (%r gefunden)"' | |||||
2086 | msgid "Python ElementTree module is not available" |
|
1917 | msgid "Python ElementTree module is not available" | |
2087 | msgstr "Python-Modul ElementTree ist nicht verfügbar" |
|
1918 | msgstr "Python-Modul ElementTree ist nicht verfügbar" | |
2088 |
|
1919 | |||
|
1920 | #, python-format | |||
|
1921 | msgid "%s repository format is unsupported, please upgrade" | |||
|
1922 | msgstr "" | |||
|
1923 | ||||
|
1924 | #, fuzzy | |||
|
1925 | msgid "failed to detect repository format!" | |||
|
1926 | msgstr "Archiv für Patch-Reihen kann nicht geladen werden\n" | |||
|
1927 | ||||
2089 | msgid "internal calling inconsistency" |
|
1928 | msgid "internal calling inconsistency" | |
2090 | msgstr "Inkonsistenz bei internem Aufruf" |
|
1929 | msgstr "Inkonsistenz bei internem Aufruf" | |
2091 |
|
1930 | |||
@@ -2326,11 +2165,13 b' msgstr ""' | |||||
2326 | "Datei benutzt die gleiche Syntax wie alle anderen Konfigurationsdateien.\n" |
|
2165 | "Datei benutzt die gleiche Syntax wie alle anderen Konfigurationsdateien.\n" | |
2327 | "Sie verwendet zwei Bereiche, ``[patterns]`` und ``[repository]``." |
|
2166 | "Sie verwendet zwei Bereiche, ``[patterns]`` und ``[repository]``." | |
2328 |
|
2167 | |||
2329 | msgid "" |
|
2168 | #, fuzzy | |
2330 | "The ``[patterns]`` section specifies the line endings used in the\n" |
|
2169 | msgid "" | |
2331 | "working directory. The format is specified by a file pattern. The\n" |
|
2170 | "The ``[patterns]`` section specifies how line endings should be\n" | |
2332 | "first match is used, so put more specific patterns first. The\n" |
|
2171 | "converted between the working copy and the repository. The format is\n" | |
2333 | "available line endings are ``LF``, ``CRLF``, and ``BIN``." |
|
2172 | "specified by a file pattern. The first match is used, so put more\n" | |
|
2173 | "specific patterns first. The available line endings are ``LF``,\n" | |||
|
2174 | "``CRLF``, and ``BIN``." | |||
2334 | msgstr "" |
|
2175 | msgstr "" | |
2335 | "Der Bereich ``[patterns]`` spezifiziert die Zeilenumbrüche, die in der\n" |
|
2176 | "Der Bereich ``[patterns]`` spezifiziert die Zeilenumbrüche, die in der\n" | |
2336 | "Arbeitskopie verwendet werden. Das Format wird über ein Dateimuster\n" |
|
2177 | "Arbeitskopie verwendet werden. Das Format wird über ein Dateimuster\n" | |
@@ -2338,14 +2179,16 b' msgstr ""' | |||||
2338 | "schere Muster oben notieren. Die verfügbaren Zeilenenden sind ``LF``,\n" |
|
2179 | "schere Muster oben notieren. Die verfügbaren Zeilenenden sind ``LF``,\n" | |
2339 | "``CRLF`` und ``BIN``." |
|
2180 | "``CRLF`` und ``BIN``." | |
2340 |
|
2181 | |||
|
2182 | #, fuzzy | |||
2341 | msgid "" |
|
2183 | msgid "" | |
2342 | "Files with the declared format of ``CRLF`` or ``LF`` are always\n" |
|
2184 | "Files with the declared format of ``CRLF`` or ``LF`` are always\n" | |
2343 | "checked out in that format and files declared to be binary (``BIN``)\n" |
|
2185 | "checked out and stored in the repository in that format and files\n" | |
2344 | "are left unchanged. Additionally, ``native`` is an alias for the\n" |
|
2186 | "declared to be binary (``BIN``) are left unchanged. Additionally,\n" | |
2345 | "platform's default line ending: ``LF`` on Unix (including Mac OS X)\n" |
|
2187 | "``native`` is an alias for checking out in the platform's default line\n" | |
2346 | "and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n" |
|
2188 | "ending: ``LF`` on Unix (including Mac OS X) and ``CRLF`` on\n" | |
2347 | "endings) is Mercurial's default behaviour; it is only needed if you\n" |
|
2189 | "Windows. Note that ``BIN`` (do nothing to line endings) is Mercurial's\n" | |
2348 | "need to override a later, more general pattern." |
|
2190 | "default behaviour; it is only needed if you need to override a later,\n" | |
|
2191 | "more general pattern." | |||
2349 | msgstr "" |
|
2192 | msgstr "" | |
2350 | "Dateien mit dem deklarierten Format ``CRLF`` oder ``LF`` werden immer\n" |
|
2193 | "Dateien mit dem deklarierten Format ``CRLF`` oder ``LF`` werden immer\n" | |
2351 | "in diesem Format ausgecheckt; Dateien, die als binär (``BIN``) angegeben\n" |
|
2194 | "in diesem Format ausgecheckt; Dateien, die als binär (``BIN``) angegeben\n" | |
@@ -2403,6 +2246,12 b' msgstr ""' | |||||
2403 | " native = LF" |
|
2246 | " native = LF" | |
2404 |
|
2247 | |||
2405 | msgid "" |
|
2248 | msgid "" | |
|
2249 | ".. note::\n" | |||
|
2250 | " The rules will first apply when files are touched in the working\n" | |||
|
2251 | " copy, e.g. by updating to null and back to tip to touch all files." | |||
|
2252 | msgstr "" | |||
|
2253 | ||||
|
2254 | msgid "" | |||
2406 | "The extension uses an optional ``[eol]`` section in your hgrc file\n" |
|
2255 | "The extension uses an optional ``[eol]`` section in your hgrc file\n" | |
2407 | "(not the ``.hgeol`` file) for settings that control the overall\n" |
|
2256 | "(not the ``.hgeol`` file) for settings that control the overall\n" | |
2408 | "behavior. There are two settings:" |
|
2257 | "behavior. There are two settings:" | |
@@ -2411,9 +2260,10 b' msgstr ""' | |||||
2411 | "Konfigurationsdatei (nicht die ``.hgeol``-Datei), um das systemweite\n" |
|
2260 | "Konfigurationsdatei (nicht die ``.hgeol``-Datei), um das systemweite\n" | |
2412 | "Verhalten zu definieren. Es gibt zwei Einstellungen:" |
|
2261 | "Verhalten zu definieren. Es gibt zwei Einstellungen:" | |
2413 |
|
2262 | |||
|
2263 | #, fuzzy | |||
2414 | msgid "" |
|
2264 | msgid "" | |
2415 | "- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n" |
|
2265 | "- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n" | |
2416 | " ``CRLF`` override the default interpretation of ``native`` for\n" |
|
2266 | " ``CRLF`` to override the default interpretation of ``native`` for\n" | |
2417 | " checkout. This can be used with :hg:`archive` on Unix, say, to\n" |
|
2267 | " checkout. This can be used with :hg:`archive` on Unix, say, to\n" | |
2418 | " generate an archive where files have line endings for Windows." |
|
2268 | " generate an archive where files have line endings for Windows." | |
2419 | msgstr "" |
|
2269 | msgstr "" | |
@@ -2438,6 +2288,20 b' msgstr ""' | |||||
2438 | " gutem Grund wechselnde Zeilenumbrüche haben." |
|
2288 | " gutem Grund wechselnde Zeilenumbrüche haben." | |
2439 |
|
2289 | |||
2440 | msgid "" |
|
2290 | msgid "" | |
|
2291 | "The extension provides ``cleverencode:`` and ``cleverdecode:`` filters\n" | |||
|
2292 | "like the deprecated win32text extension does. This means that you can\n" | |||
|
2293 | "disable win32text and enable eol and your filters will still work. You\n" | |||
|
2294 | "only need to these filters until you have prepared a ``.hgeol`` file." | |||
|
2295 | msgstr "" | |||
|
2296 | ||||
|
2297 | msgid "" | |||
|
2298 | "The ``win32text.forbid*`` hooks provided by the win32text extension\n" | |||
|
2299 | "have been unified into a single hook named ``eol.hook``. The hook will\n" | |||
|
2300 | "lookup the expected line endings from the ``.hgeol`` file, which means\n" | |||
|
2301 | "you must migrate to a ``.hgeol`` file first before using the hook." | |||
|
2302 | msgstr "" | |||
|
2303 | ||||
|
2304 | msgid "" | |||
2441 | "See :hg:`help patterns` for more information about the glob patterns\n" |
|
2305 | "See :hg:`help patterns` for more information about the glob patterns\n" | |
2442 | "used.\n" |
|
2306 | "used.\n" | |
2443 | msgstr "" |
|
2307 | msgstr "" | |
@@ -2643,6 +2507,9 b' msgstr "OPT"' | |||||
2643 | msgid "pass option to comparison program" |
|
2507 | msgid "pass option to comparison program" | |
2644 | msgstr "Aufrufparameter für das Vergleichsprogramm" |
|
2508 | msgstr "Aufrufparameter für das Vergleichsprogramm" | |
2645 |
|
2509 | |||
|
2510 | msgid "revision" | |||
|
2511 | msgstr "Revision" | |||
|
2512 | ||||
2646 | msgid "change made by revision" |
|
2513 | msgid "change made by revision" | |
2647 | msgstr "Von dieser Revision erzeugte Änderung" |
|
2514 | msgstr "Von dieser Revision erzeugte Änderung" | |
2648 |
|
2515 | |||
@@ -2705,13 +2572,15 b' msgstr ""' | |||||
2705 | " Um die Reihenfolge der Zusammenführung zu ändern kann --switch-parent\n" |
|
2572 | " Um die Reihenfolge der Zusammenführung zu ändern kann --switch-parent\n" | |
2706 | " genutzt werden." |
|
2573 | " genutzt werden." | |
2707 |
|
2574 | |||
2708 | msgid "" |
|
2575 | #, fuzzy | |
2709 |
" See :hg:`help dates` for a list of formats valid for -d/--date. |
|
2576 | msgid " See :hg:`help dates` for a list of formats valid for -d/--date." | |
2710 | " " |
|
2577 | msgstr "" | |
2711 | msgstr "" |
|
2578 | " Siehe 'hg help dates' für eine Liste gültiger Formate für -d/--date." | |
2712 | " Siehe :hg:`help dates` für eine Liste gültiger Datumsformate für\n" |
|
2579 | ||
2713 | " -d/--date.\n" |
|
2580 | msgid "" | |
2714 | " " |
|
2581 | " Returns 0 on success.\n" | |
|
2582 | " " | |||
|
2583 | msgstr "" | |||
2715 |
|
2584 | |||
2716 | msgid "" |
|
2585 | msgid "" | |
2717 | "working dir not at branch tip (use \"hg update\" to check out branch tip)" |
|
2586 | "working dir not at branch tip (use \"hg update\" to check out branch tip)" | |
@@ -2825,6 +2694,14 b' msgstr ""' | |||||
2825 | " verzeichnisses verwendet, oder die Spitze des Archivs, falls keine\n" |
|
2694 | " verzeichnisses verwendet, oder die Spitze des Archivs, falls keine\n" | |
2826 | " (die null-) Version geladen ist." |
|
2695 | " (die null-) Version geladen ist." | |
2827 |
|
2696 | |||
|
2697 | msgid "" | |||
|
2698 | " See :hg:`help dates` for a list of formats valid for -d/--date.\n" | |||
|
2699 | " " | |||
|
2700 | msgstr "" | |||
|
2701 | " Siehe :hg:`help dates` für eine Liste gültiger Datumsformate für\n" | |||
|
2702 | " -d/--date.\n" | |||
|
2703 | " " | |||
|
2704 | ||||
2828 | msgid "uncommitted merge - please provide a specific revision" |
|
2705 | msgid "uncommitted merge - please provide a specific revision" | |
2829 | msgstr "" |
|
2706 | msgstr "" | |
2830 | "Nicht versionierte Zusammenführung - bitte gib eine bestimmte Revision an" |
|
2707 | "Nicht versionierte Zusammenführung - bitte gib eine bestimmte Revision an" | |
@@ -3451,9 +3328,11 b' msgstr ""' | |||||
3451 | " # bevorzugt SVN- oder CVS-artige Standard-Platzhalterzuweisungen\n" |
|
3328 | " # bevorzugt SVN- oder CVS-artige Standard-Platzhalterzuweisungen\n" | |
3452 | " svn = True" |
|
3329 | " svn = True" | |
3453 |
|
3330 | |||
3454 | msgid "" |
|
3331 | #, fuzzy | |
3455 | "NOTE: the more specific you are in your filename patterns the less you\n" |
|
3332 | msgid "" | |
3456 | "lose speed in huge repositories." |
|
3333 | ".. note::\n" | |
|
3334 | " The more specific you are in your filename patterns the less you\n" | |||
|
3335 | " lose speed in huge repositories." | |||
3457 | msgstr "" |
|
3336 | msgstr "" | |
3458 | "HINWEIS: Je genauer die Muster für Dateinamen sind, desto weniger\n" |
|
3337 | "HINWEIS: Je genauer die Muster für Dateinamen sind, desto weniger\n" | |
3459 | "Geschwindigkeit geht in großen Projektarchiven verloren." |
|
3338 | "Geschwindigkeit geht in großen Projektarchiven verloren." | |
@@ -3480,20 +3359,21 b' msgstr ""' | |||||
3480 | " svnutcdate \"2006-09-18 15:13:13Z\"\n" |
|
3359 | " svnutcdate \"2006-09-18 15:13:13Z\"\n" | |
3481 | " svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\"" |
|
3360 | " svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\"" | |
3482 |
|
3361 | |||
|
3362 | #, fuzzy | |||
3483 | msgid "" |
|
3363 | msgid "" | |
3484 | "The default template mappings (view with :hg:`kwdemo -d`) can be\n" |
|
3364 | "The default template mappings (view with :hg:`kwdemo -d`) can be\n" | |
3485 | "replaced with customized keywords and templates. Again, run\n" |
|
3365 | "replaced with customized keywords and templates. Again, run\n" | |
3486 | ":hg:`kwdemo` to control the results of your config changes." |
|
3366 | ":hg:`kwdemo` to control the results of your configuration changes." | |
3487 | msgstr "" |
|
3367 | msgstr "" | |
3488 | "Die Standardzuweisungen von Vorlagen (einzusehen mit :hg:`kwdemo -d`)\n" |
|
3368 | "Die Standardzuweisungen von Vorlagen (einzusehen mit :hg:`kwdemo -d`)\n" | |
3489 | "können mit angepassten Platzhaltern und Vorlagen ersetzt werden. Auch hier\n" |
|
3369 | "können mit angepassten Platzhaltern und Vorlagen ersetzt werden. Auch hier\n" | |
3490 | "sollte :hg:`kwdemo` ausgeführt werden, um die Ergebnisse der eigenen\n" |
|
3370 | "sollte :hg:`kwdemo` ausgeführt werden, um die Ergebnisse der eigenen\n" | |
3491 | "Konfiguration zu testen." |
|
3371 | "Konfiguration zu testen." | |
3492 |
|
3372 | |||
3493 | msgid "" |
|
3373 | #, fuzzy | |
3494 | "Before changing/disabling active keywords, run :hg:`kwshrink` to avoid\n" |
|
3374 | msgid "" | |
3495 | "the risk of inadvertently storing expanded keywords in the change\n" |
|
3375 | "Before changing/disabling active keywords, you must run :hg:`kwshrink`\n" | |
3496 | "history." |
|
3376 | "to avoid storing expanded keywords in the change history." | |
3497 | msgstr "" |
|
3377 | msgstr "" | |
3498 | "Bevor aktive Platzhalter geändert/deaktiviert werden, sollte\n" |
|
3378 | "Bevor aktive Platzhalter geändert/deaktiviert werden, sollte\n" | |
3499 | ":hg:`kwshrink` ausgeführt werden, um die Gefahr von versehentlich\n" |
|
3379 | ":hg:`kwshrink` ausgeführt werden, um die Gefahr von versehentlich\n" | |
@@ -3574,12 +3454,26 b' msgstr ""' | |||||
3574 | msgid "\textending current template maps\n" |
|
3454 | msgid "\textending current template maps\n" | |
3575 | msgstr "\tErweitert die aktuellen Vorlagen-Zuweisungen\n" |
|
3455 | msgstr "\tErweitert die aktuellen Vorlagen-Zuweisungen\n" | |
3576 |
|
3456 | |||
3577 | msgid "\toverriding default template maps\n" |
|
3457 | #, fuzzy | |
|
3458 | msgid "\toverriding default svn keywordset\n" | |||
|
3459 | msgstr "\tÜberschreibt die aktuellen Vorlagen-Zuweisungen\n" | |||
|
3460 | ||||
|
3461 | #, fuzzy | |||
|
3462 | msgid "\toverriding default cvs keywordset\n" | |||
3578 | msgstr "\tÜberschreibt die aktuellen Vorlagen-Zuweisungen\n" |
|
3463 | msgstr "\tÜberschreibt die aktuellen Vorlagen-Zuweisungen\n" | |
3579 |
|
3464 | |||
3580 | msgid "" |
|
3465 | #, fuzzy | |
3581 | "\n" |
|
3466 | msgid "" | |
3582 | "\tconfiguration using default keyword template maps\n" |
|
3467 | "\n" | |
|
3468 | "\tconfiguration using default svn keywordset\n" | |||
|
3469 | msgstr "" | |||
|
3470 | "\n" | |||
|
3471 | "\tKonfiguration mittels der Standard-Platzhalter-Zuweisungen\n" | |||
|
3472 | ||||
|
3473 | #, fuzzy | |||
|
3474 | msgid "" | |||
|
3475 | "\n" | |||
|
3476 | "\tconfiguration using default cvs keywordset\n" | |||
3583 | msgstr "" |
|
3477 | msgstr "" | |
3584 | "\n" |
|
3478 | "\n" | |
3585 | "\tKonfiguration mittels der Standard-Platzhalter-Zuweisungen\n" |
|
3479 | "\tKonfiguration mittels der Standard-Platzhalter-Zuweisungen\n" | |
@@ -3675,12 +3569,8 b' msgstr ""' | |||||
3675 | msgid "revert expanded keywords in the working directory" |
|
3569 | msgid "revert expanded keywords in the working directory" | |
3676 | msgstr "Nimmt Ersetzungen im aktuellen Arbeitsverzeichnis wieder zurück" |
|
3570 | msgstr "Nimmt Ersetzungen im aktuellen Arbeitsverzeichnis wieder zurück" | |
3677 |
|
3571 | |||
3678 | msgid "" |
|
3572 | msgid " Must be run before changing/disabling active keywords." | |
3679 | " Run before changing/disabling active keywords or if you experience\n" |
|
3573 | msgstr "" | |
3680 | " problems with :hg:`import` or :hg:`merge`." |
|
|||
3681 | msgstr "" |
|
|||
3682 | " Führen Sie dies aus, bevor Platzhalter geändert/deaktiviert werden\n" |
|
|||
3683 | " oder wenn Sie Probleme bei :hg:`import` oder :hg:`merge` haben." |
|
|||
3684 |
|
3574 | |||
3685 | msgid "" |
|
3575 | msgid "" | |
3686 | " kwshrink refuses to run if given files contain local changes.\n" |
|
3576 | " kwshrink refuses to run if given files contain local changes.\n" | |
@@ -3893,6 +3783,10 b' msgstr "Kann %s nicht lesen\\n"' | |||||
3893 | msgid "patch %s is empty\n" |
|
3783 | msgid "patch %s is empty\n" | |
3894 | msgstr "Patch %s ist leer\n" |
|
3784 | msgstr "Patch %s ist leer\n" | |
3895 |
|
3785 | |||
|
3786 | #, fuzzy | |||
|
3787 | msgid "repository commit failed" | |||
|
3788 | msgstr "Übernahme der Änderungen schlug fehl" | |||
|
3789 | ||||
3896 | msgid "patch failed, rejects left in working dir\n" |
|
3790 | msgid "patch failed, rejects left in working dir\n" | |
3897 | msgstr "Patch schlug fehl, Fehlerabschnitte noch im Arbeitsverzeichnis\n" |
|
3791 | msgstr "Patch schlug fehl, Fehlerabschnitte noch im Arbeitsverzeichnis\n" | |
3898 |
|
3792 | |||
@@ -3928,6 +3822,10 b' msgstr "Keine Patches angewendet"' | |||||
3928 | msgid "working directory revision is not qtip" |
|
3822 | msgid "working directory revision is not qtip" | |
3929 | msgstr "Revision des Arbeitsverzeichnisses ist nicht qtip" |
|
3823 | msgstr "Revision des Arbeitsverzeichnisses ist nicht qtip" | |
3930 |
|
3824 | |||
|
3825 | #, fuzzy, python-format | |||
|
3826 | msgid "uncommitted changes in subrepository %s" | |||
|
3827 | msgstr "Speichere Unterarchiv %s\n" | |||
|
3828 | ||||
3931 | msgid "local changes found, refresh first" |
|
3829 | msgid "local changes found, refresh first" | |
3932 | msgstr "Lokale Änderungen gefunden. Führe zuerst \"qrefresh\" aus!" |
|
3830 | msgstr "Lokale Änderungen gefunden. Führe zuerst \"qrefresh\" aus!" | |
3933 |
|
3831 | |||
@@ -3938,6 +3836,10 b' msgstr "Lokale \xc3\x84nderungen gefunden"' | |||||
3938 | msgid "\"%s\" cannot be used as the name of a patch" |
|
3836 | msgid "\"%s\" cannot be used as the name of a patch" | |
3939 | msgstr "\"%s\" kann nicht als Patchname verwendet werden" |
|
3837 | msgstr "\"%s\" kann nicht als Patchname verwendet werden" | |
3940 |
|
3838 | |||
|
3839 | #, fuzzy, python-format | |||
|
3840 | msgid "\"%s\" already exists as a directory" | |||
|
3841 | msgstr "%s existiert bereits" | |||
|
3842 | ||||
3941 | #, python-format |
|
3843 | #, python-format | |
3942 | msgid "patch \"%s\" already exists" |
|
3844 | msgid "patch \"%s\" already exists" | |
3943 | msgstr "Patch \"%s\" existiert bereits" |
|
3845 | msgstr "Patch \"%s\" existiert bereits" | |
@@ -3945,6 +3847,10 b' msgstr "Patch \\"%s\\" existiert bereits"' | |||||
3945 | msgid "cannot manage merge changesets" |
|
3847 | msgid "cannot manage merge changesets" | |
3946 | msgstr "Zusammenführungen können nicht mit Patches verwaltet werden" |
|
3848 | msgstr "Zusammenführungen können nicht mit Patches verwaltet werden" | |
3947 |
|
3849 | |||
|
3850 | #, fuzzy, python-format | |||
|
3851 | msgid "cannot write patch \"%s\": %s" | |||
|
3852 | msgstr "Fehlerhafter Patch %s %s" | |||
|
3853 | ||||
3948 | #, python-format |
|
3854 | #, python-format | |
3949 | msgid "error unlinking %s\n" |
|
3855 | msgid "error unlinking %s\n" | |
3950 | msgstr "Fehler beim Löschen von %s\n" |
|
3856 | msgstr "Fehler beim Löschen von %s\n" | |
@@ -3964,14 +3870,14 b' msgid "no patches in series\\n"' | |||||
3964 | msgstr "Keine Patches in Serie\n" |
|
3870 | msgstr "Keine Patches in Serie\n" | |
3965 |
|
3871 | |||
3966 | #, python-format |
|
3872 | #, python-format | |
|
3873 | msgid "qpush: %s is already at the top\n" | |||
|
3874 | msgstr "qpush: %s ist bereits an der Serienspitze\n" | |||
|
3875 | ||||
|
3876 | #, python-format | |||
3967 | msgid "cannot push to a previous patch: %s" |
|
3877 | msgid "cannot push to a previous patch: %s" | |
3968 | msgstr "Kann Änderungen nicht in einen vorherigen Patch übertragen: %s" |
|
3878 | msgstr "Kann Änderungen nicht in einen vorherigen Patch übertragen: %s" | |
3969 |
|
3879 | |||
3970 | #, python-format |
|
3880 | #, python-format | |
3971 | msgid "qpush: %s is already at the top\n" |
|
|||
3972 | msgstr "qpush: %s ist bereits an der Serienspitze\n" |
|
|||
3973 |
|
||||
3974 | #, python-format |
|
|||
3975 | msgid "guarded by %r" |
|
3881 | msgid "guarded by %r" | |
3976 | msgstr "bewacht durch %r" |
|
3882 | msgstr "bewacht durch %r" | |
3977 |
|
3883 | |||
@@ -3988,6 +3894,18 b' msgstr "Alle bekannten Patches sind zur ' | |||||
3988 | msgid "patch series already fully applied\n" |
|
3894 | msgid "patch series already fully applied\n" | |
3989 | msgstr "Patchserie bereits vollständig angewendet\n" |
|
3895 | msgstr "Patchserie bereits vollständig angewendet\n" | |
3990 |
|
3896 | |||
|
3897 | #, fuzzy | |||
|
3898 | msgid "cannot use --exact and --move together" | |||
|
3899 | msgstr "Kann mit --parent nur Zusammenführung rückgängig machen" | |||
|
3900 | ||||
|
3901 | #, fuzzy | |||
|
3902 | msgid "cannot push --exact with applied patches" | |||
|
3903 | msgstr "kann bereits angewendeten Patch %s nicht löschen" | |||
|
3904 | ||||
|
3905 | #, fuzzy, python-format | |||
|
3906 | msgid "%s does not have a parent recorded" | |||
|
3907 | msgstr "%s ist kein Vorgänger von %s" | |||
|
3908 | ||||
3991 | msgid "please specify the patch to move" |
|
3909 | msgid "please specify the patch to move" | |
3992 | msgstr "Bitte geben Sie den zu verschiebenden Patch an" |
|
3910 | msgstr "Bitte geben Sie den zu verschiebenden Patch an" | |
3993 |
|
3911 | |||
@@ -4070,8 +3988,9 b' msgstr "Entferne Speicher-Eintrag %s\\n"' | |||||
4070 | msgid "saved queue repository parents: %s %s\n" |
|
3988 | msgid "saved queue repository parents: %s %s\n" | |
4071 | msgstr "Eltern der gespeicherten Reihe: %s %s\n" |
|
3989 | msgstr "Eltern der gespeicherten Reihe: %s %s\n" | |
4072 |
|
3990 | |||
4073 | msgid "queue directory updating\n" |
|
3991 | #, fuzzy | |
4074 | msgstr "Aktualisiere Reihenverzeichnis\n" |
|
3992 | msgid "updating queue directory\n" | |
|
3993 | msgstr "Aktualisiere Arbeitsverzeichnis\n" | |||
4075 |
|
3994 | |||
4076 | msgid "Unable to load queue repository\n" |
|
3995 | msgid "Unable to load queue repository\n" | |
4077 | msgstr "Archiv für Patch-Reihen kann nicht geladen werden\n" |
|
3996 | msgstr "Archiv für Patch-Reihen kann nicht geladen werden\n" | |
@@ -4165,6 +4084,9 b' msgstr ""' | |||||
4165 | msgid "print the patches already applied" |
|
4084 | msgid "print the patches already applied" | |
4166 | msgstr "Zeigt die bereits angewendeten Patches an" |
|
4085 | msgstr "Zeigt die bereits angewendeten Patches an" | |
4167 |
|
4086 | |||
|
4087 | msgid " Returns 0 on success." | |||
|
4088 | msgstr "" | |||
|
4089 | ||||
4168 | msgid "only one patch applied\n" |
|
4090 | msgid "only one patch applied\n" | |
4169 | msgstr "Nur ein Patch angewendet\n" |
|
4091 | msgstr "Nur ein Patch angewendet\n" | |
4170 |
|
4092 | |||
@@ -4234,13 +4156,17 b' msgstr ""' | |||||
4234 | msgid " To import an existing patch while renaming it::" |
|
4156 | msgid " To import an existing patch while renaming it::" | |
4235 | msgstr " Um einen existierenden Patch zu importieren und umzubenennen::" |
|
4157 | msgstr " Um einen existierenden Patch zu importieren und umzubenennen::" | |
4236 |
|
4158 | |||
4237 | msgid "" |
|
4159 | #, fuzzy | |
4238 |
" hg qimport -e existing-patch -n new-name |
|
4160 | msgid " hg qimport -e existing-patch -n new-name" | |
4239 | " " |
|
|||
4240 | msgstr "" |
|
4161 | msgstr "" | |
4241 | " hg qimport -e existierender-patch -n neuer-name\n" |
|
4162 | " hg qimport -e existierender-patch -n neuer-name\n" | |
4242 | " " |
|
4163 | " " | |
4243 |
|
4164 | |||
|
4165 | msgid "" | |||
|
4166 | " Returns 0 if import succeeded.\n" | |||
|
4167 | " " | |||
|
4168 | msgstr "" | |||
|
4169 | ||||
4244 | msgid "init a new queue repository (DEPRECATED)" |
|
4170 | msgid "init a new queue repository (DEPRECATED)" | |
4245 | msgstr "Richtet ein neues Archiv für Patch-Reihen ein (VERALTET)" |
|
4171 | msgstr "Richtet ein neues Archiv für Patch-Reihen ein (VERALTET)" | |
4246 |
|
4172 | |||
@@ -4290,15 +4216,20 b' msgstr ""' | |||||
4290 | " Das Quell-Patcharchiv wird standardmäßig in <quelle>/.hg/patches\n" |
|
4216 | " Das Quell-Patcharchiv wird standardmäßig in <quelle>/.hg/patches\n" | |
4291 | " gesucht. Verwenden Sie -p <url>, um dies zu ändern." |
|
4217 | " gesucht. Verwenden Sie -p <url>, um dies zu ändern." | |
4292 |
|
4218 | |||
|
4219 | #, fuzzy | |||
4293 | msgid "" |
|
4220 | msgid "" | |
4294 | " The patch directory must be a nested Mercurial repository, as\n" |
|
4221 | " The patch directory must be a nested Mercurial repository, as\n" | |
4295 |
" would be created by :hg:`init --mq`. |
|
4222 | " would be created by :hg:`init --mq`." | |
4296 | " " |
|
|||
4297 | msgstr "" |
|
4223 | msgstr "" | |
4298 | " Das Patchverzeichnis muss ein eingebettetes Mercurial-Archiv sein,\n" |
|
4224 | " Das Patchverzeichnis muss ein eingebettetes Mercurial-Archiv sein,\n" | |
4299 | " wie es von :hg:`init --mq` erzeugt werden würde.\n" |
|
4225 | " wie es von :hg:`init --mq` erzeugt werden würde.\n" | |
4300 | " " |
|
4226 | " " | |
4301 |
|
4227 | |||
|
4228 | msgid "" | |||
|
4229 | " Return 0 on success.\n" | |||
|
4230 | " " | |||
|
4231 | msgstr "" | |||
|
4232 | ||||
4302 | msgid "versioned patch repository not found (see init --mq)" |
|
4233 | msgid "versioned patch repository not found (see init --mq)" | |
4303 | msgstr "Versioniertes Patch-Archiv nicht gefunden (siehe init --mq)" |
|
4234 | msgstr "Versioniertes Patch-Archiv nicht gefunden (siehe init --mq)" | |
4304 |
|
4235 | |||
@@ -4377,12 +4308,12 b' msgstr ""' | |||||
4377 | " wird der Kopf des Patches leer und die Versionsmeldung '[mq]: PATCH' " |
|
4308 | " wird der Kopf des Patches leer und die Versionsmeldung '[mq]: PATCH' " | |
4378 | "sein." |
|
4309 | "sein." | |
4379 |
|
4310 | |||
|
4311 | #, fuzzy | |||
4380 | msgid "" |
|
4312 | msgid "" | |
4381 | " Use the -g/--git option to keep the patch in the git extended diff\n" |
|
4313 | " Use the -g/--git option to keep the patch in the git extended diff\n" | |
4382 | " format. Read the diffs help topic for more information on why this\n" |
|
4314 | " format. Read the diffs help topic for more information on why this\n" | |
4383 | " is important for preserving permission changes and copy/rename\n" |
|
4315 | " is important for preserving permission changes and copy/rename\n" | |
4384 |
" information. |
|
4316 | " information." | |
4385 | " " |
|
|||
4386 | msgstr "" |
|
4317 | msgstr "" | |
4387 | " Verwenden Sie den Schalter -g/--git, um den Patch im erweiterten git-" |
|
4318 | " Verwenden Sie den Schalter -g/--git, um den Patch im erweiterten git-" | |
4388 | "Format\n" |
|
4319 | "Format\n" | |
@@ -4392,6 +4323,11 b' msgstr ""' | |||||
4392 | "wichtig\n" |
|
4323 | "wichtig\n" | |
4393 | " ist." |
|
4324 | " ist." | |
4394 |
|
4325 | |||
|
4326 | msgid "" | |||
|
4327 | " Returns 0 on successful creation of a new patch.\n" | |||
|
4328 | " " | |||
|
4329 | msgstr "" | |||
|
4330 | ||||
4395 | msgid "update the current patch" |
|
4331 | msgid "update the current patch" | |
4396 | msgstr "Aktualisiert den aktuellen Patch" |
|
4332 | msgstr "Aktualisiert den aktuellen Patch" | |
4397 |
|
4333 | |||
@@ -4429,12 +4365,12 b' msgstr ""' | |||||
4429 | " fehlschlägt, wird eine Sicherungskopie in ``.hg/last-message.txt`` " |
|
4365 | " fehlschlägt, wird eine Sicherungskopie in ``.hg/last-message.txt`` " | |
4430 | "abgelegt." |
|
4366 | "abgelegt." | |
4431 |
|
4367 | |||
|
4368 | #, fuzzy | |||
4432 | msgid "" |
|
4369 | msgid "" | |
4433 | " hg add/remove/copy/rename work as usual, though you might want to\n" |
|
4370 | " hg add/remove/copy/rename work as usual, though you might want to\n" | |
4434 | " use git-style patches (-g/--git or [diff] git=1) to track copies\n" |
|
4371 | " use git-style patches (-g/--git or [diff] git=1) to track copies\n" | |
4435 | " and renames. See the diffs help topic for more information on the\n" |
|
4372 | " and renames. See the diffs help topic for more information on the\n" | |
4436 |
" git diff format. |
|
4373 | " git diff format." | |
4437 | " " |
|
|||
4438 | msgstr "" |
|
4374 | msgstr "" | |
4439 | " hg add/remove/copy/rename funktionieren weiter wie gewohnt, obwohl Sie\n" |
|
4375 | " hg add/remove/copy/rename funktionieren weiter wie gewohnt, obwohl Sie\n" | |
4440 | " vermutliche Patches im git-Format (-g/--git oder [diff] git=1) " |
|
4376 | " vermutliche Patches im git-Format (-g/--git oder [diff] git=1) " | |
@@ -4461,12 +4397,12 b' msgstr ""' | |||||
4461 | "damit,\n" |
|
4397 | "damit,\n" | |
4462 | " wie der aktuelle Patch nach einem Aufruf von qrefresh aussehen würde)." |
|
4398 | " wie der aktuelle Patch nach einem Aufruf von qrefresh aussehen würde)." | |
4463 |
|
4399 | |||
|
4400 | #, fuzzy | |||
4464 | msgid "" |
|
4401 | msgid "" | |
4465 | " Use :hg:`diff` if you only want to see the changes made since the\n" |
|
4402 | " Use :hg:`diff` if you only want to see the changes made since the\n" | |
4466 | " last qrefresh, or :hg:`export qtip` if you want to see changes\n" |
|
4403 | " last qrefresh, or :hg:`export qtip` if you want to see changes\n" | |
4467 | " made by the current patch without including changes made since the\n" |
|
4404 | " made by the current patch without including changes made since the\n" | |
4468 |
" qrefresh. |
|
4405 | " qrefresh." | |
4469 | " " |
|
|||
4470 | msgstr "" |
|
4406 | msgstr "" | |
4471 | " Verwenden Sie :hg:`diff`, wenn Sie nur die Änderungen seit dem letzten\n" |
|
4407 | " Verwenden Sie :hg:`diff`, wenn Sie nur die Änderungen seit dem letzten\n" | |
4472 | " qrefresh sehen möchten, oder :hg:`export qtip`, wenn Sie nur die " |
|
4408 | " qrefresh sehen möchten, oder :hg:`export qtip`, wenn Sie nur die " | |
@@ -4498,9 +4434,10 b' msgstr ""' | |||||
4498 | "Anschluss\n" |
|
4434 | "Anschluss\n" | |
4499 | " nicht entfernt." |
|
4435 | " nicht entfernt." | |
4500 |
|
4436 | |||
|
4437 | #, fuzzy | |||
4501 | msgid "" |
|
4438 | msgid "" | |
4502 | " The header for each folded patch will be concatenated with the\n" |
|
4439 | " The header for each folded patch will be concatenated with the\n" | |
4503 |
" current patch header, separated by a line of |
|
4440 | " current patch header, separated by a line of ``* * *``." | |
4504 | msgstr "" |
|
4441 | msgstr "" | |
4505 | " Die Kopfzeilen der einzelnen Patches werden den den Kopf des aktuellen\n" |
|
4442 | " Die Kopfzeilen der einzelnen Patches werden den den Kopf des aktuellen\n" | |
4506 | " Patches angehängt, getrennt mit einer Zeile aus '* * *'." |
|
4443 | " Patches angehängt, getrennt mit einer Zeile aus '* * *'." | |
@@ -4545,22 +4482,24 b' msgstr ""' | |||||
4545 | "wenn er\n" |
|
4482 | "wenn er\n" | |
4546 | " entsprechend aktiviert wurde." |
|
4483 | " entsprechend aktiviert wurde." | |
4547 |
|
4484 | |||
|
4485 | #, fuzzy | |||
4548 | msgid "" |
|
4486 | msgid "" | |
4549 | " With no arguments, print the currently active guards.\n" |
|
4487 | " With no arguments, print the currently active guards.\n" | |
4550 |
" With arguments, set guards for the named patch. |
|
4488 | " With arguments, set guards for the named patch." | |
4551 | " NOTE: Specifying negative guards now requires '--'." |
|
4489 | msgstr "" | |
4552 | msgstr "" |
|
4490 | " Ohne Argumente werden die aktuell aktiven Wächter ausgegeben.\n" | |
4553 |
" |
|
4491 | " Mit einem Argument wird der aktuelle Wächter gesetzt." | |
4554 | " Argumenten werden die Wächter für den angegebenen Patch gesetzt. " |
|
4492 | ||
4555 | "HINWEIS:\n" |
|
4493 | msgid "" | |
4556 | " Die Angabe negativer Wächter erfordert jetzt '--'." |
|
4494 | " .. note::\n" | |
|
4495 | " Specifying negative guards now requires '--'." | |||
|
4496 | msgstr "" | |||
4557 |
|
4497 | |||
4558 | msgid " To set guards on another patch::" |
|
4498 | msgid " To set guards on another patch::" | |
4559 | msgstr " Um die Wächter eines anderen Patches zu setzen::" |
|
4499 | msgstr " Um die Wächter eines anderen Patches zu setzen::" | |
4560 |
|
4500 | |||
4561 | msgid "" |
|
4501 | #, fuzzy | |
4562 |
" hg qguard other.patch -- +2.6.17 -stable |
|
4502 | msgid " hg qguard other.patch -- +2.6.17 -stable" | |
4563 | " " |
|
|||
4564 | msgstr "" |
|
4503 | msgstr "" | |
4565 | " hg qguard anderer.patch -- +2.6.17 -stable\n" |
|
4504 | " hg qguard anderer.patch -- +2.6.17 -stable\n" | |
4566 | " " |
|
4505 | " " | |
@@ -4581,15 +4520,20 b' msgstr "Gibt den Kopf des obersten oder ' | |||||
4581 | msgid "push the next patch onto the stack" |
|
4520 | msgid "push the next patch onto the stack" | |
4582 | msgstr "Schiebt den nächsten Patch auf den Stapel" |
|
4521 | msgstr "Schiebt den nächsten Patch auf den Stapel" | |
4583 |
|
4522 | |||
|
4523 | #, fuzzy | |||
4584 | msgid "" |
|
4524 | msgid "" | |
4585 | " When -f/--force is applied, all local changes in patched files\n" |
|
4525 | " When -f/--force is applied, all local changes in patched files\n" | |
4586 |
" will be lost. |
|
4526 | " will be lost." | |
4587 | " " |
|
|||
4588 | msgstr "" |
|
4527 | msgstr "" | |
4589 | " Wenn -f/--force angegeben ist, werden alle lokalen Änderungen in den\n" |
|
4528 | " Wenn -f/--force angegeben ist, werden alle lokalen Änderungen in den\n" | |
4590 | " gepatchten Dateien verlorengehen.\n" |
|
4529 | " gepatchten Dateien verlorengehen.\n" | |
4591 | " " |
|
4530 | " " | |
4592 |
|
4531 | |||
|
4532 | msgid "" | |||
|
4533 | " Return 0 on succces.\n" | |||
|
4534 | " " | |||
|
4535 | msgstr "" | |||
|
4536 | ||||
4593 | msgid "no saved queues found, please use -n\n" |
|
4537 | msgid "no saved queues found, please use -n\n" | |
4594 | msgstr "Keine gespeicherten Reihen gefunden, bitte benutze -n\n" |
|
4538 | msgstr "Keine gespeicherten Reihen gefunden, bitte benutze -n\n" | |
4595 |
|
4539 | |||
@@ -4600,11 +4544,11 b' msgstr "F\xc3\xbchre mit Reihe bei %s zusammen\\n"' | |||||
4600 | msgid "pop the current patch off the stack" |
|
4544 | msgid "pop the current patch off the stack" | |
4601 | msgstr "Holt den aktuellen Patch vom Stapel herunter" |
|
4545 | msgstr "Holt den aktuellen Patch vom Stapel herunter" | |
4602 |
|
4546 | |||
|
4547 | #, fuzzy | |||
4603 | msgid "" |
|
4548 | msgid "" | |
4604 | " By default, pops off the top of the patch stack. If given a patch\n" |
|
4549 | " By default, pops off the top of the patch stack. If given a patch\n" | |
4605 | " name, keeps popping off patches until the named patch is at the\n" |
|
4550 | " name, keeps popping off patches until the named patch is at the\n" | |
4606 |
" top of the stack. |
|
4551 | " top of the stack." | |
4607 | " " |
|
|||
4608 | msgstr "" |
|
4552 | msgstr "" | |
4609 | " Standardmäßig wird der oberste Patch vom Stapel genommen. Wenn ein\n" |
|
4553 | " Standardmäßig wird der oberste Patch vom Stapel genommen. Wenn ein\n" | |
4610 | " Patchname angegeben ist, wird solange vom Stapel heruntergenommen, bis\n" |
|
4554 | " Patchname angegeben ist, wird solange vom Stapel heruntergenommen, bis\n" | |
@@ -4694,15 +4638,19 b' msgstr ""' | |||||
4694 | " lokalen Versionsnummern sich für gewöhnlich nach dem Wiederherstellen\n" |
|
4638 | " lokalen Versionsnummern sich für gewöhnlich nach dem Wiederherstellen\n" | |
4695 | " ändern werden." |
|
4639 | " ändern werden." | |
4696 |
|
4640 | |||
|
4641 | #, fuzzy | |||
4697 | msgid "" |
|
4642 | msgid "" | |
4698 | " Use the --no-backup option to discard the backup bundle once the\n" |
|
4643 | " Use the --no-backup option to discard the backup bundle once the\n" | |
4699 |
" operation completes. |
|
4644 | " operation completes." | |
4700 | " " |
|
|||
4701 | msgstr "" |
|
4645 | msgstr "" | |
4702 | " Benutzen Sie den Schalter --no-backup, um die Bündel zu entfernen,\n" |
|
4646 | " Benutzen Sie den Schalter --no-backup, um die Bündel zu entfernen,\n" | |
4703 | " wenn die Operation abgeschlossen ist.\n" |
|
4647 | " wenn die Operation abgeschlossen ist.\n" | |
4704 | " " |
|
4648 | " " | |
4705 |
|
4649 | |||
|
4650 | #, fuzzy | |||
|
4651 | msgid "empty revision set" | |||
|
4652 | msgstr "Revisionen ausgeben" | |||
|
4653 | ||||
4706 | msgid "set or print guarded patches to push" |
|
4654 | msgid "set or print guarded patches to push" | |
4707 | msgstr "Setzt die zu übertragenen bewachten Patches oder gibt sie aus" |
|
4655 | msgstr "Setzt die zu übertragenen bewachten Patches oder gibt sie aus" | |
4708 |
|
4656 | |||
@@ -4841,11 +4789,11 b' msgstr ""' | |||||
4841 | " Kontrolle von mq entfernt. Ansonsten müssen die angegebenen Revisionen\n" |
|
4789 | " Kontrolle von mq entfernt. Ansonsten müssen die angegebenen Revisionen\n" | |
4842 | " an der Basis des Stapels der angewandten Patches liegen." |
|
4790 | " an der Basis des Stapels der angewandten Patches liegen." | |
4843 |
|
4791 | |||
|
4792 | #, fuzzy | |||
4844 | msgid "" |
|
4793 | msgid "" | |
4845 | " This can be especially useful if your changes have been applied to\n" |
|
4794 | " This can be especially useful if your changes have been applied to\n" | |
4846 | " an upstream repository, or if you are about to push your changes\n" |
|
4795 | " an upstream repository, or if you are about to push your changes\n" | |
4847 |
" to upstream. |
|
4796 | " to upstream." | |
4848 | " " |
|
|||
4849 | msgstr "" |
|
4797 | msgstr "" | |
4850 | " Dies kann insbes. nützlich sein, wenn Ihre Änderungen in einem\n" |
|
4798 | " Dies kann insbes. nützlich sein, wenn Ihre Änderungen in einem\n" | |
4851 | " vorgelagerten Projektarchiv angewandt wurden, oder wenn Sie Ihre\n" |
|
4799 | " vorgelagerten Projektarchiv angewandt wurden, oder wenn Sie Ihre\n" | |
@@ -4892,11 +4840,11 b' msgstr ""' | |||||
4892 | "die\n" |
|
4840 | "die\n" | |
4893 | " neue Reihe nur erzeugt und das Wechseln wird fehlschlagen." |
|
4841 | " neue Reihe nur erzeugt und das Wechseln wird fehlschlagen." | |
4894 |
|
4842 | |||
|
4843 | #, fuzzy | |||
4895 | msgid "" |
|
4844 | msgid "" | |
4896 | " To delete an existing queue, use --delete. You cannot delete the " |
|
4845 | " To delete an existing queue, use --delete. You cannot delete the " | |
4897 | "currently\n" |
|
4846 | "currently\n" | |
4898 |
" active queue. |
|
4847 | " active queue." | |
4899 | " " |
|
|||
4900 | msgstr "" |
|
4848 | msgstr "" | |
4901 | " Um eine bestehende Reihe zu entfernen, benutzen Sie --delete. Sie können " |
|
4849 | " Um eine bestehende Reihe zu entfernen, benutzen Sie --delete. Sie können " | |
4902 | "die\n" |
|
4850 | "die\n" | |
@@ -5012,7 +4960,8 b' msgstr "Beh\xc3\xa4lt die Patchdatei bei"' | |||||
5012 | msgid "stop managing a revision (DEPRECATED)" |
|
4960 | msgid "stop managing a revision (DEPRECATED)" | |
5013 | msgstr "Hört auf, eine Revision zu verwalten (VERALTET)" |
|
4961 | msgstr "Hört auf, eine Revision zu verwalten (VERALTET)" | |
5014 |
|
4962 | |||
5015 | msgid "hg qdelete [-k] [-r REV]... [PATCH]..." |
|
4963 | #, fuzzy | |
|
4964 | msgid "hg qdelete [-k] [PATCH]..." | |||
5016 | msgstr "hg qdelete [-k] [-r REV]... [PATCH]..." |
|
4965 | msgstr "hg qdelete [-k] [-r REV]... [PATCH]..." | |
5017 |
|
4966 | |||
5018 | msgid "edit patch header" |
|
4967 | msgid "edit patch header" | |
@@ -5045,6 +4994,9 b' msgstr "hg qheader [PATCH]"' | |||||
5045 | msgid "import file in patch directory" |
|
4994 | msgid "import file in patch directory" | |
5046 | msgstr "Import eine Datei in das Patchverzeichnis" |
|
4995 | msgstr "Import eine Datei in das Patchverzeichnis" | |
5047 |
|
4996 | |||
|
4997 | msgid "NAME" | |||
|
4998 | msgstr "NAME" | |||
|
4999 | ||||
5048 | msgid "name of patch file" |
|
5000 | msgid "name of patch file" | |
5049 | msgstr "Name der Patchdatei" |
|
5001 | msgstr "Name der Patchdatei" | |
5050 |
|
5002 | |||
@@ -5105,11 +5057,17 b' msgstr "Name der zu entnehmenden Reihe (' | |||||
5105 | msgid "forget any local changes to patched files" |
|
5057 | msgid "forget any local changes to patched files" | |
5106 | msgstr "Vergisst alle lokalen Änderungen an gepatchten Dateien" |
|
5058 | msgstr "Vergisst alle lokalen Änderungen an gepatchten Dateien" | |
5107 |
|
5059 | |||
5108 | msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" |
|
5060 | #, fuzzy | |
|
5061 | msgid "hg qpop [-a] [-f] [PATCH | INDEX]" | |||
5109 | msgstr "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" |
|
5062 | msgstr "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" | |
5110 |
|
5063 | |||
5111 | msgid "apply if the patch has rejects" |
|
5064 | #, fuzzy | |
5112 | msgstr "Wendet Patch trotz Fehlerabschnitten an" |
|
5065 | msgid "apply on top of local changes" | |
|
5066 | msgstr "Wendet eine oder mehrere Änderungsgruppendateien an" | |||
|
5067 | ||||
|
5068 | #, fuzzy | |||
|
5069 | msgid "apply the target patch to its recorded parent" | |||
|
5070 | msgstr "Legt die benannten Patches mit dem aktuellen Patch zusammen" | |||
5113 |
|
5071 | |||
5114 | msgid "list patch name in commit text" |
|
5072 | msgid "list patch name in commit text" | |
5115 | msgstr "Listet den Patchnamen in der Versionsmeldung auf" |
|
5073 | msgstr "Listet den Patchnamen in der Versionsmeldung auf" | |
@@ -5126,7 +5084,8 b' msgstr "Name der Reihe zum Zusammenf\xc3\xbchren (VERALTET)"' | |||||
5126 | msgid "reorder patch series and apply only the patch" |
|
5084 | msgid "reorder patch series and apply only the patch" | |
5127 | msgstr "Sortiert die Patch-Serie neu und wendet nur den Patch an" |
|
5085 | msgstr "Sortiert die Patch-Serie neu und wendet nur den Patch an" | |
5128 |
|
5086 | |||
5129 | msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]" |
|
5087 | #, fuzzy | |
|
5088 | msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" | |||
5130 | msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]" |
|
5089 | msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]" | |
5131 |
|
5090 | |||
5132 | msgid "refresh only files already in the patch and specified files" |
|
5091 | msgid "refresh only files already in the patch and specified files" | |
@@ -5218,7 +5177,11 b' msgstr "Keine Sicherungskopien"' | |||||
5218 | msgid "no backups (DEPRECATED)" |
|
5177 | msgid "no backups (DEPRECATED)" | |
5219 | msgstr "Keine Sicherungskopien (VERALTET)" |
|
5178 | msgstr "Keine Sicherungskopien (VERALTET)" | |
5220 |
|
5179 | |||
5221 | msgid "hg strip [-f] [-n] REV..." |
|
5180 | msgid "do not modify working copy during strip" | |
|
5181 | msgstr "" | |||
|
5182 | ||||
|
5183 | #, fuzzy | |||
|
5184 | msgid "hg strip [-k] [-f] [-n] REV..." | |||
5222 | msgstr "hg strip [-f] [-n] REV..." |
|
5185 | msgstr "hg strip [-f] [-n] REV..." | |
5223 |
|
5186 | |||
5224 | msgid "hg qtop [-s]" |
|
5187 | msgid "hg qtop [-s]" | |
@@ -5338,8 +5301,8 b' msgstr ""' | |||||
5338 | " template = ... # Vorlagendatei zur Formatierung der E-Mail\n" |
|
5301 | " template = ... # Vorlagendatei zur Formatierung der E-Mail\n" | |
5339 | " incoming = ... # Vorlage für den incoming-Hook\n" |
|
5302 | " incoming = ... # Vorlage für den incoming-Hook\n" | |
5340 | " changegroup = ... # Vorlage für den changegroup-Hook\n" |
|
5303 | " changegroup = ... # Vorlage für den changegroup-Hook\n" | |
5341 |
" maxdiff = 300 # max. Anzahl an Diffzeilen in E-Mails (0=keine, |
|
5304 | " maxdiff = 300 # max. Anzahl an Diffzeilen in E-Mails (0=keine, " | |
5342 | "1=alle)\n" |
|
5305 | "-1=alle)\n" | |
5343 | " maxsubject = 67 # Betreffzeilen bei dieser Länge abschneiden\n" |
|
5306 | " maxsubject = 67 # Betreffzeilen bei dieser Länge abschneiden\n" | |
5344 | " diffstat = True # Diffstat vor den Diffzeilen einfügen?\n" |
|
5307 | " diffstat = True # Diffstat vor den Diffzeilen einfügen?\n" | |
5345 | " sources = serve # benachrichtige nur, wenn die Quelle in der Liste " |
|
5308 | " sources = serve # benachrichtige nur, wenn die Quelle in der Liste " | |
@@ -5432,9 +5395,10 b' msgid "To set the pager that should be u' | |||||
5432 | msgstr "" |
|
5395 | msgstr "" | |
5433 | "Um den zu verwendenden Pager zu setzen, setzen Sie die folgende Variable::" |
|
5396 | "Um den zu verwendenden Pager zu setzen, setzen Sie die folgende Variable::" | |
5434 |
|
5397 | |||
|
5398 | #, fuzzy | |||
5435 | msgid "" |
|
5399 | msgid "" | |
5436 | " [pager]\n" |
|
5400 | " [pager]\n" | |
5437 |
" pager = |
|
5401 | " pager = less -FRSX" | |
5438 | msgstr "" |
|
5402 | msgstr "" | |
5439 | " [pager]\n" |
|
5403 | " [pager]\n" | |
5440 | " pager = LESS='FSRX' less" |
|
5404 | " pager = LESS='FSRX' less" | |
@@ -5500,13 +5464,24 b' msgstr ""' | |||||
5500 | msgid "If pager.attend is present, pager.ignore will be ignored." |
|
5464 | msgid "If pager.attend is present, pager.ignore will be ignored." | |
5501 | msgstr "Wenn pager.attend vorhanden ist, wird pager.ignore ignoriert." |
|
5465 | msgstr "Wenn pager.attend vorhanden ist, wird pager.ignore ignoriert." | |
5502 |
|
5466 | |||
|
5467 | #, fuzzy | |||
5503 | msgid "" |
|
5468 | msgid "" | |
5504 | "To ignore global commands like :hg:`version` or :hg:`help`, you have\n" |
|
5469 | "To ignore global commands like :hg:`version` or :hg:`help`, you have\n" | |
5505 |
"to specify them in your user configuration file. |
|
5470 | "to specify them in your user configuration file." | |
5506 | msgstr "" |
|
5471 | msgstr "" | |
5507 | "Um globale Befehle wie :hg:`version` oder :hg:`help` zu ignorieren,\n" |
|
5472 | "Um globale Befehle wie :hg:`version` oder :hg:`help` zu ignorieren,\n" | |
5508 | "müssen Sie diese in Ihrer Konfigurationsdatei angeben.\n" |
|
5473 | "müssen Sie diese in Ihrer Konfigurationsdatei angeben.\n" | |
5509 |
|
5474 | |||
|
5475 | msgid "" | |||
|
5476 | "The --pager=... option can also be used to control when the pager is\n" | |||
|
5477 | "used. Use a boolean value like yes, no, on, off, or use auto for\n" | |||
|
5478 | "normal behavior.\n" | |||
|
5479 | msgstr "" | |||
|
5480 | ||||
|
5481 | #, fuzzy | |||
|
5482 | msgid "when to paginate (boolean, always, auto, or never)" | |||
|
5483 | msgstr "Wann soll eingefärbt werden (boolescher Wert, always, auto oder never)" | |||
|
5484 | ||||
5510 | msgid "interpret suffixes to refer to ancestor revisions" |
|
5485 | msgid "interpret suffixes to refer to ancestor revisions" | |
5511 | msgstr "Interpretiert Suffixe, um Vorfahren zu referenzieren" |
|
5486 | msgstr "Interpretiert Suffixe, um Vorfahren zu referenzieren" | |
5512 |
|
5487 | |||
@@ -5585,15 +5560,6 b' msgstr ""' | |||||
5585 | "und -archiven als zusammengehörig angezeigt werden." |
|
5560 | "und -archiven als zusammengehörig angezeigt werden." | |
5586 |
|
5561 | |||
5587 | msgid "" |
|
5562 | msgid "" | |
5588 | "With the -d/--diffstat or -c/--confirm options, you will be presented\n" |
|
|||
5589 | "with a final summary of all messages and asked for confirmation before\n" |
|
|||
5590 | "the messages are sent." |
|
|||
5591 | msgstr "" |
|
|||
5592 | "Bei der Angabe der Optionen -d/--diffstat oder -c/--confirm wird eine\n" |
|
|||
5593 | "abschließende Zusammenfassung aller Nachrichten angezeigt und um\n" |
|
|||
5594 | "Bestätigung gebeten, bevor die Nachrichten versendet werden." |
|
|||
5595 |
|
||||
5596 | msgid "" |
|
|||
5597 | "To configure other defaults, add a section like this to your hgrc\n" |
|
5563 | "To configure other defaults, add a section like this to your hgrc\n" | |
5598 | "file::" |
|
5564 | "file::" | |
5599 | msgstr "" |
|
5565 | msgstr "" | |
@@ -5630,52 +5596,6 b' msgstr ""' | |||||
5630 | "werden." |
|
5596 | "werden." | |
5631 |
|
5597 | |||
5632 | msgid "" |
|
5598 | msgid "" | |
5633 | "To avoid sending patches prematurely, it is a good idea to first run\n" |
|
|||
5634 | "the :hg:`email` command with the \"-n\" option (test only). You will be\n" |
|
|||
5635 | "prompted for an email recipient address, a subject and an introductory\n" |
|
|||
5636 | "message describing the patches of your patchbomb. Then when all is\n" |
|
|||
5637 | "done, patchbomb messages are displayed. If the PAGER environment\n" |
|
|||
5638 | "variable is set, your pager will be fired up once for each patchbomb\n" |
|
|||
5639 | "message, so you can verify everything is alright." |
|
|||
5640 | msgstr "" |
|
|||
5641 | "Um das Versenden vorfrüher Patches zu verhindern, sollte man :hg:`email`\n" |
|
|||
5642 | "mit der Option \"-n\" (Testmodus) aufrufen. Sie werden nach einer\n" |
|
|||
5643 | "Empfängeradresse, einem Betreff und einer einleitenden Nachricht gefragt,\n" |
|
|||
5644 | "die die Patches Ihrer Patchbombe beschreibt. Danach werden die\n" |
|
|||
5645 | "Patchbombennachrichten angezeigt. Wenn die PAGER-Umgebungsvariable gesetzt\n" |
|
|||
5646 | "ist, wird Ihr Pager für jede Patchbombe einzeln aufgerufen, so dass alles\n" |
|
|||
5647 | "überprüft werden kann." |
|
|||
5648 |
|
||||
5649 | msgid "" |
|
|||
5650 | "The -m/--mbox option is also very useful. Instead of previewing each\n" |
|
|||
5651 | "patchbomb message in a pager or sending the messages directly, it will\n" |
|
|||
5652 | "create a UNIX mailbox file with the patch emails. This mailbox file\n" |
|
|||
5653 | "can be previewed with any mail user agent which supports UNIX mbox\n" |
|
|||
5654 | "files, e.g. with mutt::" |
|
|||
5655 | msgstr "" |
|
|||
5656 | "Alternativ werden die Nachrichten mit der Option -m/--mbox in eine Datei\n" |
|
|||
5657 | "geschrieben, die von jedem Emailprogramm, welches das UNIX-mbox-Format\n" |
|
|||
5658 | "unterstützt, geprüft werden, zum Beispiel mit mutt::" |
|
|||
5659 |
|
||||
5660 | msgid " % mutt -R -f mbox" |
|
|||
5661 | msgstr "" |
|
|||
5662 |
|
||||
5663 | msgid "" |
|
|||
5664 | "When you are previewing the patchbomb messages, you can use ``formail``\n" |
|
|||
5665 | "(a utility that is commonly installed as part of the procmail\n" |
|
|||
5666 | "package), to send each message out::" |
|
|||
5667 | msgstr "" |
|
|||
5668 | "Mit ``formail`` (häufig durch das procmail-Paket installiert) können die\n" |
|
|||
5669 | "Nachrichten dann aus der mbox-Datei versendet werden::" |
|
|||
5670 |
|
||||
5671 | msgid " % formail -s sendmail -bm -t < mbox" |
|
|||
5672 | msgstr "" |
|
|||
5673 |
|
||||
5674 | msgid "That should be all. Now your patchbomb is on its way out." |
|
|||
5675 | msgstr "" |
|
|||
5676 | "Das sollte es gewesen sein. Nun ist ihre Patchbombe in die Welt gesetzt." |
|
|||
5677 |
|
||||
5678 | msgid "" |
|
|||
5679 | "You can also either configure the method option in the email section\n" |
|
5599 | "You can also either configure the method option in the email section\n" | |
5680 | "to be a sendmail compatible mailer or fill out the [smtp] section so\n" |
|
5600 | "to be a sendmail compatible mailer or fill out the [smtp] section so\n" | |
5681 | "that the patchbomb extension can automatically send patchbombs\n" |
|
5601 | "that the patchbomb extension can automatically send patchbombs\n" | |
@@ -5712,17 +5632,29 b' msgid ""' | |||||
5712 | " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" |
|
5632 | " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" | |
5713 | " the first line of the changeset description as the subject text.\n" |
|
5633 | " the first line of the changeset description as the subject text.\n" | |
5714 | " The message contains two or three parts. First, the changeset\n" |
|
5634 | " The message contains two or three parts. First, the changeset\n" | |
5715 | " description. Next, (optionally) if the diffstat program is\n" |
|
5635 | " description." | |
5716 | " installed and -d/--diffstat is used, the result of running\n" |
|
5636 | msgstr "" | |
5717 | " diffstat on the patch. Finally, the patch itself, as generated by\n" |
|
5637 | "Der Betreff jeder Patch-E-Mail ist \"[PATCH M of N] ...\", mit der ersten\n" | |
5718 | " :hg:`export`." |
|
5638 | "Zeile der Änderungszusammenfassung als weiterem Text. Die Nachricht\n" | |
5719 | msgstr "" |
|
5639 | "besteht aus zwei oder drei Teilen:" | |
5720 | " Die Betreffzeile jeder Patch-Email ist \"[PATCH M of N]\", gefolgt von\n" |
|
5640 | ||
5721 | " der ersten Zeile der Versionsmeldung. Im Körper folgen zwei oder drei\n" |
|
5641 | msgid "" | |
5722 | " drei Teilen: Eine Beschreibung des Änderungssatzes, dann optional\n" |
|
5642 | " With the -d/--diffstat option, if the diffstat program is\n" | |
5723 | " das Ergebnis von diffstat des Patches (wenn das Programm diffstat\n" |
|
5643 | " installed, the result of running diffstat on the patch is inserted." | |
5724 | " installiert ist und der Schalter -d/--diffstat angegeben ist) und\n" |
|
5644 | msgstr "" | |
5725 | " schliesslich der Patch selber, wie durch \"hg export\" generiert." |
|
5645 | ||
|
5646 | msgid " Finally, the patch itself, as generated by :hg:`export`." | |||
|
5647 | msgstr "" | |||
|
5648 | ||||
|
5649 | #, fuzzy | |||
|
5650 | msgid "" | |||
|
5651 | " With the -d/--diffstat or -c/--confirm options, you will be presented\n" | |||
|
5652 | " with a final summary of all messages and asked for confirmation before\n" | |||
|
5653 | " the messages are sent." | |||
|
5654 | msgstr "" | |||
|
5655 | "Bei der Angabe der Optionen -d/--diffstat oder -c/--confirm wird eine\n" | |||
|
5656 | "abschließende Zusammenfassung aller Nachrichten angezeigt und um\n" | |||
|
5657 | "Bestätigung gebeten, bevor die Nachrichten versendet werden." | |||
5726 |
|
5658 | |||
5727 | msgid "" |
|
5659 | msgid "" | |
5728 | " By default the patch is included as text in the email body for\n" |
|
5660 | " By default the patch is included as text in the email body for\n" | |
@@ -5751,6 +5683,40 b' msgstr ""' | |||||
5751 | " Durch -b/--bundle werden Änderungssätze wie durch --outgoing gewählt,\n" |
|
5683 | " Durch -b/--bundle werden Änderungssätze wie durch --outgoing gewählt,\n" | |
5752 | " aber in einer einzelnen Email als Binärbündel (als Anhang) gesendet." |
|
5684 | " aber in einer einzelnen Email als Binärbündel (als Anhang) gesendet." | |
5753 |
|
5685 | |||
|
5686 | #, fuzzy | |||
|
5687 | msgid "" | |||
|
5688 | " With -m/--mbox, instead of previewing each patchbomb message in a\n" | |||
|
5689 | " pager or sending the messages directly, it will create a UNIX\n" | |||
|
5690 | " mailbox file with the patch emails. This mailbox file can be\n" | |||
|
5691 | " previewed with any mail user agent which supports UNIX mbox\n" | |||
|
5692 | " files." | |||
|
5693 | msgstr "" | |||
|
5694 | "Alternativ werden die Nachrichten mit der Option -m/--mbox in eine Datei\n" | |||
|
5695 | "geschrieben, die von jedem Emailprogramm, welches das UNIX-mbox-Format\n" | |||
|
5696 | "unterstützt, geprüft werden, zum Beispiel mit mutt::" | |||
|
5697 | ||||
|
5698 | #, fuzzy | |||
|
5699 | msgid "" | |||
|
5700 | " With -n/--test, all steps will run, but mail will not be sent.\n" | |||
|
5701 | " You will be prompted for an email recipient address, a subject and\n" | |||
|
5702 | " an introductory message describing the patches of your patchbomb.\n" | |||
|
5703 | " Then when all is done, patchbomb messages are displayed. If the\n" | |||
|
5704 | " PAGER environment variable is set, your pager will be fired up once\n" | |||
|
5705 | " for each patchbomb message, so you can verify everything is alright." | |||
|
5706 | msgstr "" | |||
|
5707 | "Um das Versenden vorfrüher Patches zu verhindern, sollte man :hg:`email`\n" | |||
|
5708 | "mit der Option \"-n\" (Testmodus) aufrufen. Sie werden nach einer\n" | |||
|
5709 | "Empfängeradresse, einem Betreff und einer einleitenden Nachricht gefragt,\n" | |||
|
5710 | "die die Patches Ihrer Patchbombe beschreibt. Danach werden die\n" | |||
|
5711 | "Patchbombennachrichten angezeigt. Wenn die PAGER-Umgebungsvariable gesetzt\n" | |||
|
5712 | "ist, wird Ihr Pager für jede Patchbombe einzeln aufgerufen, so dass alles\n" | |||
|
5713 | "überprüft werden kann." | |||
|
5714 | ||||
|
5715 | msgid "" | |||
|
5716 | " In case email sending fails, you will find a backup of your series\n" | |||
|
5717 | " introductory message in ``.hg/last-email.txt``." | |||
|
5718 | msgstr "" | |||
|
5719 | ||||
5754 | msgid "" |
|
5720 | msgid "" | |
5755 | " hg email -r 3000 # send patch 3000 only\n" |
|
5721 | " hg email -r 3000 # send patch 3000 only\n" | |
5756 | " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" |
|
5722 | " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" | |
@@ -5786,6 +5752,15 b' msgstr ""' | |||||
5786 | " hg email -b -r 3000 ZIEL # bündelt Vorfahren von 3000 nicht im ZIEL" |
|
5752 | " hg email -b -r 3000 ZIEL # bündelt Vorfahren von 3000 nicht im ZIEL" | |
5787 |
|
5753 | |||
5788 | msgid "" |
|
5754 | msgid "" | |
|
5755 | " hg email -o -m mbox && # generate an mbox file...\n" | |||
|
5756 | " mutt -R -f mbox # ... and view it with mutt\n" | |||
|
5757 | " hg email -o -m mbox && # generate an mbox file ...\n" | |||
|
5758 | " formail -s sendmail \\ # ... and use formail to send from the " | |||
|
5759 | "mbox\n" | |||
|
5760 | " -bm -t < mbox # ... using sendmail" | |||
|
5761 | msgstr "" | |||
|
5762 | ||||
|
5763 | msgid "" | |||
5789 | " Before using this command, you will need to enable email in your\n" |
|
5764 | " Before using this command, you will need to enable email in your\n" | |
5790 | " hgrc. See the [email] section in hgrc(5) for details.\n" |
|
5765 | " hgrc. See the [email] section in hgrc(5) for details.\n" | |
5791 | " " |
|
5766 | " " | |
@@ -5794,6 +5769,13 b' msgstr ""' | |||||
5794 | " [email] der Konfiguration aktiviert sein. Siehe hgrc(5) für Details.\n" |
|
5769 | " [email] der Konfiguration aktiviert sein. Siehe hgrc(5) für Details.\n" | |
5795 | " " |
|
5770 | " " | |
5796 |
|
5771 | |||
|
5772 | #, python-format | |||
|
5773 | msgid "comparing with %s\n" | |||
|
5774 | msgstr "Vergleiche mit %s\n" | |||
|
5775 | ||||
|
5776 | msgid "no changes found\n" | |||
|
5777 | msgstr "Keine Änderungen gefunden\n" | |||
|
5778 | ||||
5797 | msgid "specify at least one changeset with -r or -o" |
|
5779 | msgid "specify at least one changeset with -r or -o" | |
5798 | msgstr "Mindestens ein Änderungssatz mit -r oder -o wird benötigt" |
|
5780 | msgstr "Mindestens ein Änderungssatz mit -r oder -o wird benötigt" | |
5799 |
|
5781 | |||
@@ -5945,11 +5927,12 b' msgstr ""' | |||||
5945 | msgid "The following settings are available::" |
|
5927 | msgid "The following settings are available::" | |
5946 | msgstr "Die folgenden Einstellungen sind verfügbar::" |
|
5928 | msgstr "Die folgenden Einstellungen sind verfügbar::" | |
5947 |
|
5929 | |||
|
5930 | #, fuzzy | |||
5948 | msgid "" |
|
5931 | msgid "" | |
5949 | " [progress]\n" |
|
5932 | " [progress]\n" | |
5950 | " delay = 3 # number of seconds (float) before showing the progress bar\n" |
|
5933 | " delay = 3 # number of seconds (float) before showing the progress bar\n" | |
5951 | " refresh = 0.1 # time in seconds between refreshes of the progress bar\n" |
|
5934 | " refresh = 0.1 # time in seconds between refreshes of the progress bar\n" | |
5952 | " format = topic bar number # format of the progress bar\n" |
|
5935 | " format = topic bar number estimate # format of the progress bar\n" | |
5953 | " width = <none> # if set, the maximum width of the progress information\n" |
|
5936 | " width = <none> # if set, the maximum width of the progress information\n" | |
5954 | " # (that is, min(width, term width) will be used)\n" |
|
5937 | " # (that is, min(width, term width) will be used)\n" | |
5955 | " clear-complete = True # clear the progress bar after it's done\n" |
|
5938 | " clear-complete = True # clear the progress bar after it's done\n" | |
@@ -5960,7 +5943,8 b' msgstr ""' | |||||
5960 | " [progress]\n" |
|
5943 | " [progress]\n" | |
5961 | " delay = 3 # Verzögerung in Sekunden (float),\n" |
|
5944 | " delay = 3 # Verzögerung in Sekunden (float),\n" | |
5962 | " # bevor der Fortschrittsbalken gezeigt wird\n" |
|
5945 | " # bevor der Fortschrittsbalken gezeigt wird\n" | |
5963 |
" refresh = 0.1 # Sekunden zwischen Aktualisierungen des |
|
5946 | " refresh = 0.1 # Sekunden zwischen Aktualisierungen des " | |
|
5947 | "Fortschrittsbalkens\n" | |||
5964 | " format = topic bar number # Format des Fortschrittsbalkens\n" |
|
5948 | " format = topic bar number # Format des Fortschrittsbalkens\n" | |
5965 | " width = <none> # Maximalbreite der Fortschrittsinformation\n" |
|
5949 | " width = <none> # Maximalbreite der Fortschrittsinformation\n" | |
5966 | " # (damit wird min(width, term width) verwendet)\n" |
|
5950 | " # (damit wird min(width, term width) verwendet)\n" | |
@@ -5969,17 +5953,49 b' msgstr ""' | |||||
5969 | " assume-tty = False # Mit True wird IMMER ein Fortschrittsbalken gezeigt,\n" |
|
5953 | " assume-tty = False # Mit True wird IMMER ein Fortschrittsbalken gezeigt,\n" | |
5970 | " # es sei denn disable ist auf True gesetzt" |
|
5954 | " # es sei denn disable ist auf True gesetzt" | |
5971 |
|
5955 | |||
5972 | msgid "" |
|
5956 | #, fuzzy | |
5973 | "Valid entries for the format field are topic, bar, number, unit, and\n" |
|
5957 | msgid "" | |
5974 | "item. item defaults to the last 20 characters of the item, but this\n" |
|
5958 | "Valid entries for the format field are topic, bar, number, unit,\n" | |
5975 | "can be changed by adding either ``-<num>`` which would take the last\n" |
|
5959 | "estimate, and item. item defaults to the last 20 characters of the\n" | |
5976 | "num characters, or ``+<num>`` for the first num characters.\n" |
|
5960 | "item, but this can be changed by adding either ``-<num>`` which would\n" | |
|
5961 | "take the last num characters, or ``+<num>`` for the first num\n" | |||
|
5962 | "characters.\n" | |||
5977 | msgstr "" |
|
5963 | msgstr "" | |
5978 | "Gültige Einträge für das Format-Feld sind topic, bar, number, unit\n" |
|
5964 | "Gültige Einträge für das Format-Feld sind topic, bar, number, unit\n" | |
5979 | "und item. item zeigt normalerweise die letzten 20 Zeichen des Objektes.\n" |
|
5965 | "und item. item zeigt normalerweise die letzten 20 Zeichen des Objektes.\n" | |
5980 | "Mit dem Zusatz ``-<num>`` oder ``+<num>`` werden stattdessen entweder \n" |
|
5966 | "Mit dem Zusatz ``-<num>`` oder ``+<num>`` werden stattdessen entweder \n" | |
5981 | "die letzten (-) oder die ersten (+) num Zeichen gezeigt.\n" |
|
5967 | "die letzten (-) oder die ersten (+) num Zeichen gezeigt.\n" | |
5982 |
|
5968 | |||
|
5969 | #. i18n: format XX seconds as "XXs" | |||
|
5970 | #, python-format | |||
|
5971 | msgid "%02ds" | |||
|
5972 | msgstr "" | |||
|
5973 | ||||
|
5974 | #. i18n: format X minutes and YY seconds as "XmYYs" | |||
|
5975 | #, python-format | |||
|
5976 | msgid "%dm%02ds" | |||
|
5977 | msgstr "" | |||
|
5978 | ||||
|
5979 | #. i18n: format X hours and YY minutes as "XhYYm" | |||
|
5980 | #, python-format | |||
|
5981 | msgid "%dh%02dm" | |||
|
5982 | msgstr "" | |||
|
5983 | ||||
|
5984 | #. i18n: format X days and YY hours as "XdYYh" | |||
|
5985 | #, python-format | |||
|
5986 | msgid "%dd%02dh" | |||
|
5987 | msgstr "" | |||
|
5988 | ||||
|
5989 | #. i18n: format X weeks and YY days as "XwYYd" | |||
|
5990 | #, python-format | |||
|
5991 | msgid "%dw%02dd" | |||
|
5992 | msgstr "" | |||
|
5993 | ||||
|
5994 | #. i18n: format X years and YY weeks as "XyYYw" | |||
|
5995 | #, python-format | |||
|
5996 | msgid "%dy%02dw" | |||
|
5997 | msgstr "" | |||
|
5998 | ||||
5983 | msgid "command to delete untracked files from the working directory" |
|
5999 | msgid "command to delete untracked files from the working directory" | |
5984 | msgstr "Löscht nicht versionierte Dateien aus dem Arbeitsverzeichnis" |
|
6000 | msgstr "Löscht nicht versionierte Dateien aus dem Arbeitsverzeichnis" | |
5985 |
|
6001 | |||
@@ -6088,7 +6104,8 b' msgstr ""' | |||||
6088 | "http://mercurial.selenic.com/wiki/RebaseExtension\n" |
|
6104 | "http://mercurial.selenic.com/wiki/RebaseExtension\n" | |
6089 |
|
6105 | |||
6090 | msgid "move changeset (and descendants) to a different branch" |
|
6106 | msgid "move changeset (and descendants) to a different branch" | |
6091 | msgstr "Verschiebt Versionen (und ihre Nachfolger) auf einen abweichenden Zweig" |
|
6107 | msgstr "" | |
|
6108 | "Verschiebt Versionen (und ihre Nachfolger) auf einen abweichenden Zweig" | |||
6092 |
|
6109 | |||
6093 | msgid "" |
|
6110 | msgid "" | |
6094 | " Rebase uses repeated merging to graft changesets from one part of\n" |
|
6111 | " Rebase uses repeated merging to graft changesets from one part of\n" | |
@@ -6096,7 +6113,8 b' msgid ""' | |||||
6096 | " useful for linearizing *local* changes relative to a master\n" |
|
6113 | " useful for linearizing *local* changes relative to a master\n" | |
6097 | " development tree." |
|
6114 | " development tree." | |
6098 | msgstr "" |
|
6115 | msgstr "" | |
6099 |
" Rebase nutzt wiederholtes Zusammenführen um Versionen von einem Teil |
|
6116 | " Rebase nutzt wiederholtes Zusammenführen um Versionen von einem Teil " | |
|
6117 | "der\n" | |||
6100 | " Versionshistorie auf einen anderen zu pfropfen. Dies ist nützlich, um\n" |
|
6118 | " Versionshistorie auf einen anderen zu pfropfen. Dies ist nützlich, um\n" | |
6101 | " *lokale* Änderungen in einem Hauptentwicklunszweig zu linearisieren." |
|
6119 | " *lokale* Änderungen in einem Hauptentwicklunszweig zu linearisieren." | |
6102 |
|
6120 | |||
@@ -6202,11 +6220,11 b' msgstr "keepbranches und extrafn k\xc3\xb6nnen nicht gleichzeitig genutzt werden"' | |||||
6202 | msgid "rebasing" |
|
6220 | msgid "rebasing" | |
6203 | msgstr "Revision" |
|
6221 | msgstr "Revision" | |
6204 |
|
6222 | |||
6205 | #, fuzzy |
|
6223 | msgid "changesets" | |
6206 | msgid " changesets" |
|
6224 | msgstr "Änderungssätze" | |
6207 | msgstr "Füge Änderungssätze hinzu\n" |
|
6225 | ||
6208 |
|
6226 | #, fuzzy | ||
6209 |
msgid " |
|
6227 | msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)" | |
6210 | msgstr "" |
|
6228 | msgstr "" | |
6211 | "Behebe ungelöste Konflikte mit hg resolve, dann führe hg rebase --continue " |
|
6229 | "Behebe ungelöste Konflikte mit hg resolve, dann führe hg rebase --continue " | |
6212 | "aus" |
|
6230 | "aus" | |
@@ -6365,11 +6383,6 b' msgstr ""' | |||||
6365 | " Falls keine Liste von Dateien angegeben wird, gelten alle von\n" |
|
6383 | " Falls keine Liste von Dateien angegeben wird, gelten alle von\n" | |
6366 | " \"hg status\" gemeldeten Änderungen als Kandidaten für 'record'." |
|
6384 | " \"hg status\" gemeldeten Änderungen als Kandidaten für 'record'." | |
6367 |
|
6385 | |||
6368 | #, fuzzy |
|
|||
6369 | msgid " See :hg:`help dates` for a list of formats valid for -d/--date." |
|
|||
6370 | msgstr "" |
|
|||
6371 | " Siehe 'hg help dates' für eine Liste gültiger Formate für -d/--date." |
|
|||
6372 |
|
||||
6373 | msgid "" |
|
6386 | msgid "" | |
6374 | " You will be prompted for whether to record changes to each\n" |
|
6387 | " You will be prompted for whether to record changes to each\n" | |
6375 | " modified file, and for files with multiple changes, for each\n" |
|
6388 | " modified file, and for files with multiple changes, for each\n" | |
@@ -6416,7 +6429,7 b' msgid "running non-interactively, use co' | |||||
6416 | msgstr "Nicht-interaktive Ausführung, nutze stattdessen 'commit'" |
|
6429 | msgstr "Nicht-interaktive Ausführung, nutze stattdessen 'commit'" | |
6417 |
|
6430 | |||
6418 | #, fuzzy |
|
6431 | #, fuzzy | |
6419 | msgid "cannot partially commit a merge (use hg commit instead)" |
|
6432 | msgid "cannot partially commit a merge (use \"hg commit\" instead)" | |
6420 | msgstr "" |
|
6433 | msgstr "" | |
6421 | "Ein Merge kann nicht teilweise versioniert werden (Gib keine Dateien oder " |
|
6434 | "Ein Merge kann nicht teilweise versioniert werden (Gib keine Dateien oder " | |
6422 | "Muster an)" |
|
6435 | "Muster an)" | |
@@ -6424,9 +6437,6 b' msgstr ""' | |||||
6424 | msgid "no changes to record\n" |
|
6437 | msgid "no changes to record\n" | |
6425 | msgstr "Keine Änderungen zu übernehmen\n" |
|
6438 | msgstr "Keine Änderungen zu übernehmen\n" | |
6426 |
|
6439 | |||
6427 | msgid "patch failed to apply" |
|
|||
6428 | msgstr "Patch schlug fehl" |
|
|||
6429 |
|
||||
6430 | msgid "hg record [OPTION]... [FILE]..." |
|
6440 | msgid "hg record [OPTION]... [FILE]..." | |
6431 | msgstr "hg record [OPTION]... [DATEI]..." |
|
6441 | msgstr "hg record [OPTION]... [DATEI]..." | |
6432 |
|
6442 | |||
@@ -6505,9 +6515,6 b' msgstr "Quelle und Ziel sind auf unterschiedlichen Ger\xc3\xa4ten"' | |||||
6505 | msgid "not linkable: %s\n" |
|
6515 | msgid "not linkable: %s\n" | |
6506 | msgstr "fester Verweis nicht möglich: %s\n" |
|
6516 | msgstr "fester Verweis nicht möglich: %s\n" | |
6507 |
|
6517 | |||
6508 | msgid " files" |
|
|||
6509 | msgstr " Dateien" |
|
|||
6510 |
|
||||
6511 | #, fuzzy |
|
6518 | #, fuzzy | |
6512 | msgid "pruning" |
|
6519 | msgid "pruning" | |
6513 | msgstr "Führe aus: %s\n" |
|
6520 | msgstr "Führe aus: %s\n" | |
@@ -6594,15 +6601,16 b' msgid ""' | |||||
6594 | msgstr "" |
|
6601 | msgstr "" | |
6595 |
|
6602 | |||
6596 | msgid "" |
|
6603 | msgid "" | |
6597 | " NOTE: using rollback or extensions that destroy/modify history\n" |
|
6604 | " .. note::\n" | |
6598 | " (mq, rebase, etc.) can cause considerable confusion with shared\n" |
|
6605 | " using rollback or extensions that destroy/modify history (mq,\n" | |
6599 | " clones. In particular, if two shared clones are both updated to\n" |
|
6606 | " rebase, etc.) can cause considerable confusion with shared\n" | |
6600 | " the same changeset, and one of them destroys that changeset with\n" |
|
6607 | " clones. In particular, if two shared clones are both updated to\n" | |
6601 | " rollback, the other clone will suddenly stop working: all\n" |
|
6608 | " the same changeset, and one of them destroys that changeset\n" | |
6602 | " operations will fail with \"abort: working directory has unknown\n" |
|
6609 | " with rollback, the other clone will suddenly stop working: all\n" | |
6603 | " parent\". The only known workaround is to use debugsetparents on\n" |
|
6610 | " operations will fail with \"abort: working directory has unknown\n" | |
6604 | " the broken clone to reset it to a changeset that still exists\n" |
|
6611 | " parent\". The only known workaround is to use debugsetparents on\n" | |
6605 | " (e.g. tip).\n" |
|
6612 | " the broken clone to reset it to a changeset that still exists\n" | |
|
6613 | " (e.g. tip).\n" | |||
6606 | " " |
|
6614 | " " | |
6607 | msgstr "" |
|
6615 | msgstr "" | |
6608 |
|
6616 | |||
@@ -6759,6 +6767,14 b' msgstr ""' | |||||
6759 | msgid "outstanding local changes" |
|
6767 | msgid "outstanding local changes" | |
6760 | msgstr "" |
|
6768 | msgstr "" | |
6761 |
|
6769 | |||
|
6770 | #, fuzzy | |||
|
6771 | msgid "" | |||
|
6772 | "``transplanted(set)``\n" | |||
|
6773 | " Transplanted changesets in set." | |||
|
6774 | msgstr "" | |||
|
6775 | "``p1(set)``\n" | |||
|
6776 | " Erster Vorfahr der Änderungssätze in set." | |||
|
6777 | ||||
6762 | msgid "pull patches from REPO" |
|
6778 | msgid "pull patches from REPO" | |
6763 | msgstr "" |
|
6779 | msgstr "" | |
6764 |
|
6780 | |||
@@ -6823,11 +6839,13 b' msgstr ""' | |||||
6823 | msgid "Note that there are some limitations on using this extension:" |
|
6839 | msgid "Note that there are some limitations on using this extension:" | |
6824 | msgstr "" |
|
6840 | msgstr "" | |
6825 |
|
6841 | |||
6826 | msgid "- You should use single encoding in one repository." |
|
6842 | msgid "" | |
6827 | msgstr "" |
|
6843 | "- You should use single encoding in one repository.\n" | |
6828 |
|
6844 | "- If the repository path ends with 0x5c, .hg/hgrc cannot be read.\n" | ||
6829 | msgid "" |
|
6845 | "- win32mbcs is not compatible with fixutf8 extension." | |
6830 | "\n" |
|
6846 | msgstr "" | |
|
6847 | ||||
|
6848 | msgid "" | |||
6831 | "By default, win32mbcs uses encoding.encoding decided by Mercurial.\n" |
|
6849 | "By default, win32mbcs uses encoding.encoding decided by Mercurial.\n" | |
6832 | "You can specify the encoding by config option::" |
|
6850 | "You can specify the encoding by config option::" | |
6833 | msgstr "" |
|
6851 | msgstr "" | |
@@ -6943,6 +6961,14 b' msgid ""' | |||||
6943 | "** = %sdecode:\n" |
|
6961 | "** = %sdecode:\n" | |
6944 | msgstr "" |
|
6962 | msgstr "" | |
6945 |
|
6963 | |||
|
6964 | #, fuzzy | |||
|
6965 | msgid "" | |||
|
6966 | "win32text is deprecated: http://mercurial.selenic.com/wiki/" | |||
|
6967 | "Win32TextExtension\n" | |||
|
6968 | msgstr "" | |||
|
6969 | "Weitere Informationen:\n" | |||
|
6970 | "http://mercurial.selenic.com/wiki/RebaseExtension\n" | |||
|
6971 | ||||
6946 | msgid "discover and advertise repositories on the local network" |
|
6972 | msgid "discover and advertise repositories on the local network" | |
6947 | msgstr "" |
|
6973 | msgstr "" | |
6948 |
|
6974 | |||
@@ -6982,6 +7008,21 b' msgstr "Bei Archivierung in Dateien kann kein Pr\xc3\xa4fix angegeben werden"' | |||||
6982 | msgid "unknown archive type '%s'" |
|
7008 | msgid "unknown archive type '%s'" | |
6983 | msgstr "Unbekannter Archivtyp '%s'" |
|
7009 | msgstr "Unbekannter Archivtyp '%s'" | |
6984 |
|
7010 | |||
|
7011 | msgid "archiving" | |||
|
7012 | msgstr "" | |||
|
7013 | ||||
|
7014 | #, python-format | |||
|
7015 | msgid "bookmark '%s' contains illegal character" | |||
|
7016 | msgstr "Lesezeichen '%s' enthält illegale Zeichen" | |||
|
7017 | ||||
|
7018 | #, fuzzy | |||
|
7019 | msgid "searching for changed bookmarks\n" | |||
|
7020 | msgstr "Suche nach Änderungen\n" | |||
|
7021 | ||||
|
7022 | #, fuzzy | |||
|
7023 | msgid "no changed bookmarks found\n" | |||
|
7024 | msgstr "Keine Änderungen gefunden\n" | |||
|
7025 | ||||
6985 | msgid "invalid changegroup" |
|
7026 | msgid "invalid changegroup" | |
6986 | msgstr "" |
|
7027 | msgstr "" | |
6987 |
|
7028 | |||
@@ -7031,9 +7072,6 b' msgstr "Log-Grenzwert `limit` muss eine ' | |||||
7031 | msgid "limit must be positive" |
|
7072 | msgid "limit must be positive" | |
7032 | msgstr "Log-Grenzwert `limit` muss positiv sein" |
|
7073 | msgstr "Log-Grenzwert `limit` muss positiv sein" | |
7033 |
|
7074 | |||
7034 | msgid "too many revisions specified" |
|
|||
7035 | msgstr "Zu viele Revisionen angegeben" |
|
|||
7036 |
|
||||
7037 | #, python-format |
|
7075 | #, python-format | |
7038 | msgid "invalid format spec '%%%s' in output filename" |
|
7076 | msgid "invalid format spec '%%%s' in output filename" | |
7039 | msgstr "Ungültiges Format '%%%s' für den Namen der Ausgabedatei" |
|
7077 | msgstr "Ungültiges Format '%%%s' für den Namen der Ausgabedatei" | |
@@ -7052,6 +7090,12 b' msgstr ""' | |||||
7052 | "Interpretiere die Entfernung von %s als Umbenennung in %s (%d%% ähnlich)\n" |
|
7090 | "Interpretiere die Entfernung von %s als Umbenennung in %s (%d%% ähnlich)\n" | |
7053 |
|
7091 | |||
7054 | #, python-format |
|
7092 | #, python-format | |
|
7093 | msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" | |||
|
7094 | msgstr "" | |||
|
7095 | "%s ist nicht im Archiv, daher gilt %s als neu hinzugefügt (nicht als " | |||
|
7096 | "kopiert).\n" | |||
|
7097 | ||||
|
7098 | #, python-format | |||
7055 | msgid "%s: not copying - file is not managed\n" |
|
7099 | msgid "%s: not copying - file is not managed\n" | |
7056 | msgstr "%s kann nicht kopiert werden - steht nicht unter Versionskontrolle\n" |
|
7100 | msgstr "%s kann nicht kopiert werden - steht nicht unter Versionskontrolle\n" | |
7057 |
|
7101 | |||
@@ -7091,12 +7135,6 b' msgstr "Verschiebe %s nach %s\\n"' | |||||
7091 | msgid "copying %s to %s\n" |
|
7135 | msgid "copying %s to %s\n" | |
7092 | msgstr "Kopiere %s nach %s\n" |
|
7136 | msgstr "Kopiere %s nach %s\n" | |
7093 |
|
7137 | |||
7094 | #, python-format |
|
|||
7095 | msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" |
|
|||
7096 | msgstr "" |
|
|||
7097 | "%s ist nicht im Archiv, daher gilt %s als neu hinzugefügt (nicht als " |
|
|||
7098 | "kopiert).\n" |
|
|||
7099 |
|
||||
7100 | msgid "no source or destination specified" |
|
7138 | msgid "no source or destination specified" | |
7101 | msgstr "Weder Quelle noch Ziel angegeben" |
|
7139 | msgstr "Weder Quelle noch Ziel angegeben" | |
7102 |
|
7140 | |||
@@ -7128,6 +7166,10 b' msgid "branch: %s\\n"' | |||||
7128 | msgstr "Zweig: %s\n" |
|
7166 | msgstr "Zweig: %s\n" | |
7129 |
|
7167 | |||
7130 | #, python-format |
|
7168 | #, python-format | |
|
7169 | msgid "bookmark: %s\n" | |||
|
7170 | msgstr "Lesezeichen: %s\n" | |||
|
7171 | ||||
|
7172 | #, python-format | |||
7131 | msgid "tag: %s\n" |
|
7173 | msgid "tag: %s\n" | |
7132 | msgstr "Marke: %s\n" |
|
7174 | msgstr "Marke: %s\n" | |
7133 |
|
7175 | |||
@@ -7303,9 +7345,10 b' msgstr ""' | |||||
7303 | " Füge alle neuen Dateien hinzu und lösche alle fehlenden Dateien aus\n" |
|
7345 | " Füge alle neuen Dateien hinzu und lösche alle fehlenden Dateien aus\n" | |
7304 | " dem Projektarchiv." |
|
7346 | " dem Projektarchiv." | |
7305 |
|
7347 | |||
|
7348 | #, fuzzy | |||
7306 | msgid "" |
|
7349 | msgid "" | |
7307 | " New files are ignored if they match any of the patterns in\n" |
|
7350 | " New files are ignored if they match any of the patterns in\n" | |
7308 | " .hgignore. As with add, these changes take effect at the next\n" |
|
7351 | " ``.hgignore``. As with add, these changes take effect at the next\n" | |
7309 | " commit." |
|
7352 | " commit." | |
7310 | msgstr "" |
|
7353 | msgstr "" | |
7311 | " Neue Dateien werden ignoriert, wenn sie einem der Muster aus .hgignore\n" |
|
7354 | " Neue Dateien werden ignoriert, wenn sie einem der Muster aus .hgignore\n" | |
@@ -7367,11 +7410,6 b' msgstr ""' | |||||
7367 | " mit unerwünschtem Ergebnis.\n" |
|
7410 | " mit unerwünschtem Ergebnis.\n" | |
7368 | " " |
|
7411 | " " | |
7369 |
|
7412 | |||
7370 | msgid "" |
|
|||
7371 | " Returns 0 on success.\n" |
|
|||
7372 | " " |
|
|||
7373 | msgstr "" |
|
|||
7374 |
|
||||
7375 | msgid "at least one filename or pattern is required" |
|
7413 | msgid "at least one filename or pattern is required" | |
7376 | msgstr "Mindestens ein Dateiname oder Muster benötigt" |
|
7414 | msgstr "Mindestens ein Dateiname oder Muster benötigt" | |
7377 |
|
7415 | |||
@@ -7450,35 +7488,31 b' msgstr ""' | |||||
7450 | msgid "reverse effect of earlier changeset" |
|
7488 | msgid "reverse effect of earlier changeset" | |
7451 | msgstr "Macht einen vorangegangen Änderungssatz rückgängig" |
|
7489 | msgstr "Macht einen vorangegangen Änderungssatz rückgängig" | |
7452 |
|
7490 | |||
7453 | msgid "" |
|
7491 | #, fuzzy | |
7454 | " Commit the backed out changes as a new changeset. The new\n" |
|
7492 | msgid "" | |
7455 | " changeset is a child of the backed out changeset." |
|
7493 | " Prepare a new changeset with the effect of REV undone in the\n" | |
7456 | msgstr "" |
|
7494 | " current working directory." | |
7457 | " Bereits vollzogene Änderungen werden noch einmal rückwärts angewendet\n" |
|
7495 | msgstr "Setzt die Vorgängerversionen des Arbeitsverzeichnisses manuell" | |
7458 | " und als neuer Änderungssatz (als Kind des rückgängig gemachten) " |
|
7496 | ||
7459 | "übernommen." |
|
7497 | msgid "" | |
7460 |
|
7498 | " If REV is the parent of the working directory, then this changeset\n" | ||
7461 | msgid "" |
|
7499 | " is committed automatically. Otherwise, hg needs to merge the\n" | |
7462 | " If you backout a changeset other than the tip, a new head is\n" |
|
7500 | " changes and the merged result is left uncommitted." | |
7463 | " created. This head will be the new tip and you should merge this\n" |
|
7501 | msgstr "" | |
7464 | " backout changeset with another head." |
|
7502 | ||
7465 |
msg |
|
7503 | msgid "" | |
7466 | " Soll ein anderer Änderungssatz als die Spitze (tip) zurückgezogen " |
|
7504 | " By default, the pending changeset will have one parent,\n" | |
7467 | "werden,\n" |
|
7505 | " maintaining a linear history. With --merge, the pending changeset\n" | |
7468 | " so wird ein neuer Kopf erzeugt und dieser ist die neue Spitze." |
|
7506 | " will instead have two parents: the old parent of the working\n" | |
7469 |
|
7507 | " directory and a child of REV that simply undoes REV." | ||
7470 |
msg |
|
7508 | msgstr "" | |
7471 | " The --merge option remembers the parent of the working directory\n" |
|
7509 | ||
7472 | " before starting the backout, then merges the new head with that\n" |
|
7510 | msgid "" | |
7473 | " changeset afterwards. This saves you from doing the merge by hand.\n" |
|
7511 | " Before version 1.7, the default behavior was equivalent to\n" | |
7474 | " The result of this merge is not committed, as with a normal merge." |
|
7512 | " specifying --merge followed by :hg:`update --clean .` to cancel\n" | |
7475 | msgstr "" |
|
7513 | " the merge and leave the child of REV as a head to be merged\n" | |
7476 | " Die dadurch notwendige Zusammenführung kann durch die Option --merge\n" |
|
7514 | " separately." | |
7477 | " automatisch mit der Vorgängerversion des Arbeitsverzeichnisses " |
|
7515 | msgstr "" | |
7478 | "durchgeführt\n" |
|
|||
7479 | " werden. Das Resultat dieser Zusammenführung wird wie üblich nicht " |
|
|||
7480 | "sofort\n" |
|
|||
7481 | " übernommen, sondern existiert als lokale Änderung." |
|
|||
7482 |
|
7516 | |||
7483 | msgid "please specify just one revision" |
|
7517 | msgid "please specify just one revision" | |
7484 | msgstr "Bitte nur eine Revision angeben" |
|
7518 | msgstr "Bitte nur eine Revision angeben" | |
@@ -7510,12 +7544,6 b' msgstr "\xc3\x84nderungssatz %s macht \xc3\x84nderungssatz %s r\xc3\xbcckg\xc3\xa4ngig\\n"' | |||||
7510 | msgid "merging with changeset %s\n" |
|
7544 | msgid "merging with changeset %s\n" | |
7511 | msgstr "Führe mit Änderungssatz %s zusammen\n" |
|
7545 | msgstr "Führe mit Änderungssatz %s zusammen\n" | |
7512 |
|
7546 | |||
7513 | msgid "the backout changeset is a new head - do not forget to merge\n" |
|
|||
7514 | msgstr "Neuen Kopf erstellt - Zusammenführung nicht vergessen\n" |
|
|||
7515 |
|
||||
7516 | msgid "(use \"backout --merge\" if you want to auto-merge)\n" |
|
|||
7517 | msgstr "(nutze \"backout --merge\" für eine automatische Zusammenführung)\n" |
|
|||
7518 |
|
||||
7519 | msgid "subdivision search of changesets" |
|
7547 | msgid "subdivision search of changesets" | |
7520 | msgstr "Binäre Suche von Änderungssätzen" |
|
7548 | msgstr "Binäre Suche von Änderungssätzen" | |
7521 |
|
7549 | |||
@@ -7610,6 +7638,72 b' msgstr "\xc3\x84nderungssatz %d:%s: %s\\n"' | |||||
7610 | msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" |
|
7638 | msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" | |
7611 | msgstr "Teste Änderungssatz %d:%s (%d Änderungssätze verbleiben, ~%d Tests)\n" |
|
7639 | msgstr "Teste Änderungssatz %d:%s (%d Änderungssätze verbleiben, ~%d Tests)\n" | |
7612 |
|
7640 | |||
|
7641 | msgid "track a line of development with movable markers" | |||
|
7642 | msgstr "Folgt einem Entwicklungsstrang mit einer beweglichen Markierung" | |||
|
7643 | ||||
|
7644 | msgid "" | |||
|
7645 | " Bookmarks are pointers to certain commits that move when\n" | |||
|
7646 | " committing. Bookmarks are local. They can be renamed, copied and\n" | |||
|
7647 | " deleted. It is possible to use bookmark names in :hg:`merge` and\n" | |||
|
7648 | " :hg:`update` to merge and update respectively to a given bookmark." | |||
|
7649 | msgstr "" | |||
|
7650 | " Lesezeichen sind Zeiger auf bestimmte Versionen, die mitwandern,\n" | |||
|
7651 | " wenn eine neuen Version erzeugt wird. Lesezeichen sind nur lokal.\n" | |||
|
7652 | " Sie können umbenannt, kopiert und gelöscht werden. Es ist möglich,\n" | |||
|
7653 | " Lesezeichen bei :hg: `merge` und :hg:`update` zu nutzen, um auf das\n" | |||
|
7654 | " angegebene Lesezeichen zu aktualisieren." | |||
|
7655 | ||||
|
7656 | msgid "" | |||
|
7657 | " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" | |||
|
7658 | " directory's parent revision with the given name. If you specify\n" | |||
|
7659 | " a revision using -r REV (where REV may be an existing bookmark),\n" | |||
|
7660 | " the bookmark is assigned to that revision." | |||
|
7661 | msgstr "" | |||
|
7662 | " Man kann :hg:`bookmark NAME` aufrufen, um ein Lesezeichen mit dem\n" | |||
|
7663 | " angegeben Namen auf der aktuellen Spitze (tip) zu setzen. Bei Angabe\n" | |||
|
7664 | " einer Revision mit -r REV (REV kann ein vorhandenes Lesezeichen sein) \n" | |||
|
7665 | " wird das Lesezeichen auf dieser Revision gesetzt.\n" | |||
|
7666 | " " | |||
|
7667 | ||||
|
7668 | msgid "" | |||
|
7669 | " Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" | |||
|
7670 | " push` and :hg:`help pull`). This requires both the local and remote\n" | |||
|
7671 | " repositories to support bookmarks. For versions prior to 1.8, this " | |||
|
7672 | "means\n" | |||
|
7673 | " the bookmarks extension must be enabled.\n" | |||
|
7674 | " " | |||
|
7675 | msgstr "" | |||
|
7676 | " Lesezeichen können zwischen Mercurial Archiven ausgetauscht werden.\n" | |||
|
7677 | " (siehe :hg:`help push` bzw. :hg:`help pull`). Beide Archive müssen dafür\n" | |||
|
7678 | " Lesezeichen unterstützen. Bis Mercurial version 1.8 muss hierfür die\n" | |||
|
7679 | " Lesezeichenerweiterung (bookmarks extension) angeschaltet werden.\n" | |||
|
7680 | " " | |||
|
7681 | ||||
|
7682 | msgid "a bookmark of this name does not exist" | |||
|
7683 | msgstr "Es existiert kein Lesezeichen mit diesem Namen" | |||
|
7684 | ||||
|
7685 | msgid "a bookmark of the same name already exists" | |||
|
7686 | msgstr "Ein Lesezeichen mit diesem Namen existiert bereits" | |||
|
7687 | ||||
|
7688 | msgid "new bookmark name required" | |||
|
7689 | msgstr "Ein neuer Name für das Lesezeichen muss übergeben werden" | |||
|
7690 | ||||
|
7691 | msgid "bookmark name required" | |||
|
7692 | msgstr "Ein Name für das Lesezeichen muss übergeben werden" | |||
|
7693 | ||||
|
7694 | msgid "bookmark name cannot contain newlines" | |||
|
7695 | msgstr "Ein Lesezeichenname darf keine Zeilenumbrüche enthalten" | |||
|
7696 | ||||
|
7697 | msgid "bookmark names cannot consist entirely of whitespace" | |||
|
7698 | msgstr "Ein Lesezeichenname darf nicht ausschließlich aus Leerraum bestehen" | |||
|
7699 | ||||
|
7700 | msgid "a bookmark cannot have the name of an existing branch" | |||
|
7701 | msgstr "" | |||
|
7702 | "Ein Lesezeichen darf nicht denselben Namen wie ein existierender Zweig haben" | |||
|
7703 | ||||
|
7704 | msgid "no bookmarks set\n" | |||
|
7705 | msgstr "Keine Lesezeichen gesetzt\n" | |||
|
7706 | ||||
7613 | msgid "set or show the current branch name" |
|
7707 | msgid "set or show the current branch name" | |
7614 | msgstr "Setzt oder zeigt den Namen des aktuellen Zweigs" |
|
7708 | msgstr "Setzt oder zeigt den Namen des aktuellen Zweigs" | |
7615 |
|
7709 | |||
@@ -7816,9 +7910,10 b' msgstr ""' | |||||
7816 | " Wird kein Zielverzeichnis angegeben, wird der Basisname der Quelle " |
|
7910 | " Wird kein Zielverzeichnis angegeben, wird der Basisname der Quelle " | |
7817 | "genutzt." |
|
7911 | "genutzt." | |
7818 |
|
7912 | |||
|
7913 | #, fuzzy | |||
7819 | msgid "" |
|
7914 | msgid "" | |
7820 | " The location of the source is added to the new repository's\n" |
|
7915 | " The location of the source is added to the new repository's\n" | |
7821 | " .hg/hgrc file, as the default to be used for future pulls." |
|
7916 | " ``.hg/hgrc`` file, as the default to be used for future pulls." | |
7822 | msgstr "" |
|
7917 | msgstr "" | |
7823 | " Die Adresse der Quelle wird der .hg/hgrc Datei des neuen Archivs\n" |
|
7918 | " Die Adresse der Quelle wird der .hg/hgrc Datei des neuen Archivs\n" | |
7824 | " als Standard für entfernte Aktionen (pull/push) hinzugefügt." |
|
7919 | " als Standard für entfernte Aktionen (pull/push) hinzugefügt." | |
@@ -7830,7 +7925,7 b' msgstr " Siehe \'hg help urls\' f\xc3\xbcr Details g\xc3\xbcltiger Quellformate."' | |||||
7830 | #, fuzzy |
|
7925 | #, fuzzy | |
7831 | msgid "" |
|
7926 | msgid "" | |
7832 | " It is possible to specify an ``ssh://`` URL as the destination, but no\n" |
|
7927 | " It is possible to specify an ``ssh://`` URL as the destination, but no\n" | |
7833 | " .hg/hgrc and working directory will be created on the remote side.\n" |
|
7928 | " ``.hg/hgrc`` and working directory will be created on the remote side.\n" | |
7834 | " Please see :hg:`help urls` for important details about ``ssh://`` URLs." |
|
7929 | " Please see :hg:`help urls` for important details about ``ssh://`` URLs." | |
7835 | msgstr "" |
|
7930 | msgstr "" | |
7836 | " Es ist möglich eine ``ssh://`` URL als Ziel anzugeben, aber es werden " |
|
7931 | " Es ist möglich eine ``ssh://`` URL als Ziel anzugeben, aber es werden " | |
@@ -7940,7 +8035,7 b' msgstr ""' | |||||
7940 | #, fuzzy |
|
8035 | #, fuzzy | |
7941 | msgid "" |
|
8036 | msgid "" | |
7942 | " Commit changes to the given files into the repository. Unlike a\n" |
|
8037 | " Commit changes to the given files into the repository. Unlike a\n" | |
7943 |
" centralized |
|
8038 | " centralized SCM, this operation is a local operation. See\n" | |
7944 | " :hg:`push` for a way to actively distribute your changes." |
|
8039 | " :hg:`push` for a way to actively distribute your changes." | |
7945 | msgstr "" |
|
8040 | msgstr "" | |
7946 | " Übernimmt Änderungen der angegebenen Dateien ins Archiv. Anders als\n" |
|
8041 | " Übernimmt Änderungen der angegebenen Dateien ins Archiv. Anders als\n" | |
@@ -8282,6 +8377,13 b' msgstr ""' | |||||
8282 | msgid "parse and display a date" |
|
8377 | msgid "parse and display a date" | |
8283 | msgstr "Liest ein Datum ein und gibt es wieder aus" |
|
8378 | msgstr "Liest ein Datum ein und gibt es wieder aus" | |
8284 |
|
8379 | |||
|
8380 | msgid "display the combined ignore pattern" | |||
|
8381 | msgstr "" | |||
|
8382 | ||||
|
8383 | #, fuzzy | |||
|
8384 | msgid "no ignore patterns found" | |||
|
8385 | msgstr "Keine [keyword]-Muster konfiguriert" | |||
|
8386 | ||||
8285 | msgid "dump the contents of an index file" |
|
8387 | msgid "dump the contents of an index file" | |
8286 | msgstr "" |
|
8388 | msgstr "" | |
8287 |
|
8389 | |||
@@ -8334,9 +8436,10 b' msgstr ""' | |||||
8334 | " (Aktuelles patch Werkzeug könnte mit patch inkompatibel or fehlkonfiguriert " |
|
8436 | " (Aktuelles patch Werkzeug könnte mit patch inkompatibel or fehlkonfiguriert " | |
8335 | "sein. Prüfe die .hgrc Datei!)\n" |
|
8437 | "sein. Prüfe die .hgrc Datei!)\n" | |
8336 |
|
8438 | |||
|
8439 | #, fuzzy | |||
8337 | msgid "" |
|
8440 | msgid "" | |
8338 | " Internal patcher failure, please report this error to http://mercurial." |
|
8441 | " Internal patcher failure, please report this error to http://mercurial." | |
8339 |
"selenic.com/ |
|
8442 | "selenic.com/wiki/BugTracker\n" | |
8340 | msgstr "" |
|
8443 | msgstr "" | |
8341 | " Fehlschlag des internen patch Werkzeugs. Bitte melden Sie diesen Fehler bei " |
|
8444 | " Fehlschlag des internen patch Werkzeugs. Bitte melden Sie diesen Fehler bei " | |
8342 | "http://www.selenic.com/mercurial/bts\n" |
|
8445 | "http://www.selenic.com/mercurial/bts\n" | |
@@ -8471,9 +8574,10 b' msgstr ""' | |||||
8471 |
|
8574 | |||
8472 | #, fuzzy |
|
8575 | #, fuzzy | |
8473 | msgid "" |
|
8576 | msgid "" | |
8474 | " NOTE: diff may generate unexpected results for merges, as it will\n" |
|
8577 | " .. note::\n" | |
8475 | " default to comparing against the working directory's first parent\n" |
|
8578 | " diff may generate unexpected results for merges, as it will\n" | |
8476 | " changeset if no revisions are specified." |
|
8579 | " default to comparing against the working directory's first\n" | |
|
8580 | " parent changeset if no revisions are specified." | |||
8477 | msgstr "" |
|
8581 | msgstr "" | |
8478 | "Zeigt Änderungen des Projektarchiv oder angegebener Dateien an\n" |
|
8582 | "Zeigt Änderungen des Projektarchiv oder angegebener Dateien an\n" | |
8479 | "\n" |
|
8583 | "\n" | |
@@ -8678,9 +8782,10 b' msgstr ""' | |||||
8678 |
|
8782 | |||
8679 | #, fuzzy |
|
8783 | #, fuzzy | |
8680 | msgid "" |
|
8784 | msgid "" | |
8681 | " NOTE: export may generate unexpected diff output for merge\n" |
|
8785 | " .. note::\n" | |
8682 | " changesets, as it will compare the merge changeset against its\n" |
|
8786 | " export may generate unexpected diff output for merge\n" | |
8683 | " first parent only." |
|
8787 | " changesets, as it will compare the merge changeset against its\n" | |
|
8788 | " first parent only." | |||
8684 | msgstr "" |
|
8789 | msgstr "" | |
8685 | "Gibt Kopfzeilen und Änderungsverlauf einer oder mehrerer Versionen aus\n" |
|
8790 | "Gibt Kopfzeilen und Änderungsverlauf einer oder mehrerer Versionen aus\n" | |
8686 | "\n" |
|
8791 | "\n" | |
@@ -9205,8 +9310,8 b' msgid "use \\"hg help\\" for the full list' | |||||
9205 | msgstr "" |
|
9310 | msgstr "" | |
9206 | "Nutze \"hg help\" für eine Liste aller Befehle oder \"hg -v\" für Details" |
|
9311 | "Nutze \"hg help\" für eine Liste aller Befehle oder \"hg -v\" für Details" | |
9207 |
|
9312 | |||
9208 | #, python-format |
|
9313 | #, fuzzy, python-format | |
9209 | msgid "use \"hg -v help%s\" to show aliases and global options" |
|
9314 | msgid "use \"hg -v help%s\" to show builtin aliases and global options" | |
9210 | msgstr "Nutze \"hg -v help%s\" um Aliase und globale Optionen anzuzeigen" |
|
9315 | msgstr "Nutze \"hg -v help%s\" um Aliase und globale Optionen anzuzeigen" | |
9211 |
|
9316 | |||
9212 | #, python-format |
|
9317 | #, python-format | |
@@ -9761,7 +9866,7 b' msgstr ""' | |||||
9761 |
|
9866 | |||
9762 | #, fuzzy |
|
9867 | #, fuzzy | |
9763 | msgid "" |
|
9868 | msgid "" | |
9764 | " If no revision range is specified, the default is tip:0 unless\n" |
|
9869 | " If no revision range is specified, the default is ``tip:0`` unless\n" | |
9765 | " --follow is set, in which case the working directory parent is\n" |
|
9870 | " --follow is set, in which case the working directory parent is\n" | |
9766 | " used as the starting revision. You can specify a revision set for\n" |
|
9871 | " used as the starting revision. You can specify a revision set for\n" | |
9767 | " log, see :hg:`help revsets` for more information." |
|
9872 | " log, see :hg:`help revsets` for more information." | |
@@ -9785,10 +9890,11 b' msgstr ""' | |||||
9785 |
|
9890 | |||
9786 | #, fuzzy |
|
9891 | #, fuzzy | |
9787 | msgid "" |
|
9892 | msgid "" | |
9788 | " NOTE: log -p/--patch may generate unexpected diff output for merge\n" |
|
9893 | " .. note::\n" | |
9789 | " changesets, as it will only compare the merge changeset against\n" |
|
9894 | " log -p/--patch may generate unexpected diff output for merge\n" | |
9790 | " its first parent. Also, only files different from BOTH parents\n" |
|
9895 | " changesets, as it will only compare the merge changeset against\n" | |
9791 | " will appear in files:." |
|
9896 | " its first parent. Also, only files different from BOTH parents\n" | |
|
9897 | " will appear in files:." | |||
9792 | msgstr "" |
|
9898 | msgstr "" | |
9793 | " HINWEIS: log -p/--patch kann ein unerwartetes Diff für " |
|
9899 | " HINWEIS: log -p/--patch kann ein unerwartetes Diff für " | |
9794 | "Zusammenführungen\n" |
|
9900 | "Zusammenführungen\n" | |
@@ -9844,6 +9950,12 b' msgstr ""' | |||||
9844 | " weitere Änderungen durchgeführt werden dürfen. Nach dem Übernehmen hat\n" |
|
9950 | " weitere Änderungen durchgeführt werden dürfen. Nach dem Übernehmen hat\n" | |
9845 | " die neue Revision zwei Vorfahren." |
|
9951 | " die neue Revision zwei Vorfahren." | |
9846 |
|
9952 | |||
|
9953 | msgid "" | |||
|
9954 | " ``--tool`` can be used to specify the merge tool used for file\n" | |||
|
9955 | " merges. It overrides the HGMERGE environment variable and your\n" | |||
|
9956 | " configuration files." | |||
|
9957 | msgstr "" | |||
|
9958 | ||||
9847 | #, fuzzy |
|
9959 | #, fuzzy | |
9848 | msgid "" |
|
9960 | msgid "" | |
9849 | " If no revision is specified, the working directory's parent is a\n" |
|
9961 | " If no revision is specified, the working directory's parent is a\n" | |
@@ -9860,6 +9972,10 b' msgstr ""' | |||||
9860 | " explizit angegeben werden.\n" |
|
9972 | " explizit angegeben werden.\n" | |
9861 | " " |
|
9973 | " " | |
9862 |
|
9974 | |||
|
9975 | #, fuzzy | |||
|
9976 | msgid " :hg:`resolve` must be used to resolve unresolved files." | |||
|
9977 | msgstr "Nutze 'hg resolve', um ungelöste Merges zu wiederholen\n" | |||
|
9978 | ||||
9863 | msgid "" |
|
9979 | msgid "" | |
9864 | " To undo an uncommitted merge, use :hg:`update --clean .` which\n" |
|
9980 | " To undo an uncommitted merge, use :hg:`update --clean .` which\n" | |
9865 | " will check out a clean copy of the original merge parent, losing\n" |
|
9981 | " will check out a clean copy of the original merge parent, losing\n" | |
@@ -10113,6 +10229,10 b' msgid ""' | |||||
10113 | " " |
|
10229 | " " | |
10114 | msgstr "" |
|
10230 | msgstr "" | |
10115 |
|
10231 | |||
|
10232 | #, python-format | |||
|
10233 | msgid "remote bookmark %s not found!" | |||
|
10234 | msgstr "Entferntes Lesezeichen %s wurde nicht gefunden!" | |||
|
10235 | ||||
10116 | #, fuzzy |
|
10236 | #, fuzzy | |
10117 | msgid "" |
|
10237 | msgid "" | |
10118 | "other repository doesn't support revision lookup, so a rev cannot be " |
|
10238 | "other repository doesn't support revision lookup, so a rev cannot be " | |
@@ -10121,6 +10241,10 b' msgstr ""' | |||||
10121 | "Das andere Projektarchiv unterstützt keine Revisionsabfragen, daher kann " |
|
10241 | "Das andere Projektarchiv unterstützt keine Revisionsabfragen, daher kann " | |
10122 | "keine Revision angegeben werden." |
|
10242 | "keine Revision angegeben werden." | |
10123 |
|
10243 | |||
|
10244 | #, python-format | |||
|
10245 | msgid "importing bookmark %s\n" | |||
|
10246 | msgstr "Importierte Lesezeichen %s\n" | |||
|
10247 | ||||
10124 | msgid "push changes to the specified destination" |
|
10248 | msgid "push changes to the specified destination" | |
10125 | msgstr "" |
|
10249 | msgstr "" | |
10126 | "Überträgt lokale Änderungen in das angegebene Ziel\n" |
|
10250 | "Überträgt lokale Änderungen in das angegebene Ziel\n" | |
@@ -10262,6 +10386,22 b' msgstr ""' | |||||
10262 | msgid "pushing to %s\n" |
|
10386 | msgid "pushing to %s\n" | |
10263 | msgstr "Übertrage nach %s\n" |
|
10387 | msgstr "Übertrage nach %s\n" | |
10264 |
|
10388 | |||
|
10389 | #, python-format | |||
|
10390 | msgid "exporting bookmark %s\n" | |||
|
10391 | msgstr "Exportiere Lesezeichen %s\n" | |||
|
10392 | ||||
|
10393 | #, python-format | |||
|
10394 | msgid "deleting remote bookmark %s\n" | |||
|
10395 | msgstr "Lösche entferntes Lesezeichen %s\n" | |||
|
10396 | ||||
|
10397 | #, python-format | |||
|
10398 | msgid "bookmark %s does not exist on the local or remote repository!\n" | |||
|
10399 | msgstr "Lesezeichen %s existiert weder im lokalen noch im entfernten Archiv!\n" | |||
|
10400 | ||||
|
10401 | #, python-format | |||
|
10402 | msgid "updating bookmark %s failed!\n" | |||
|
10403 | msgstr "Aktualisieren des Lesezeichens %s fehlgeschlagen!\n" | |||
|
10404 | ||||
10265 | msgid "roll back an interrupted transaction" |
|
10405 | msgid "roll back an interrupted transaction" | |
10266 | msgstr "Setzt eine unterbrochene Transaktion zurück" |
|
10406 | msgstr "Setzt eine unterbrochene Transaktion zurück" | |
10267 |
|
10407 | |||
@@ -10405,10 +10545,13 b' msgid " The resolve command can be us' | |||||
10405 | msgstr "" |
|
10545 | msgstr "" | |
10406 |
|
10546 | |||
10407 | msgid "" |
|
10547 | msgid "" | |
10408 |
" - :hg:`resolve FILE...`: attempt to re-merge the |
|
10548 | " - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the " | |
10409 | " discarding any previous merge attempts. Re-merging is not\n" |
|
10549 | "specified\n" | |
|
10550 | " files, discarding any previous merge attempts. Re-merging is not\n" | |||
10410 | " performed for files already marked as resolved. Use ``--all/-a``\n" |
|
10551 | " performed for files already marked as resolved. Use ``--all/-a``\n" | |
10411 | " to selects all unresolved files." |
|
10552 | " to selects all unresolved files. ``--tool`` can be used to specify\n" | |
|
10553 | " the merge tool used for the given files. It overrides the HGMERGE\n" | |||
|
10554 | " environment variable and your configuration files." | |||
10412 | msgstr "" |
|
10555 | msgstr "" | |
10413 |
|
10556 | |||
10414 | msgid "" |
|
10557 | msgid "" | |
@@ -10482,13 +10625,13 b' msgstr ""' | |||||
10482 | " " |
|
10625 | " " | |
10483 |
|
10626 | |||
10484 | msgid "" |
|
10627 | msgid "" | |
10485 | " NOTE: This command is most likely not what you are looking for. revert\n" |
|
10628 | " .. note::\n" | |
10486 | " will partially overwrite content in the working directory without " |
|
10629 | " This command is most likely not what you are looking for.\n" | |
10487 | "changing\n" |
|
10630 | " Revert will partially overwrite content in the working\n" | |
10488 | " the working directory parents. Use :hg:`update -r rev` to check out " |
|
10631 | " directory without changing the working directory parents. Use\n" | |
10489 | "earlier\n" |
|
10632 | " :hg:`update -r rev` to check out earlier revisions, or\n" | |
10490 |
" |
|
10633 | " :hg:`update --clean .` to undo a merge which has added another\n" | |
10491 |
" |
|
10634 | " parent." | |
10492 | msgstr "" |
|
10635 | msgstr "" | |
10493 |
|
10636 | |||
10494 | #, fuzzy |
|
10637 | #, fuzzy | |
@@ -10725,6 +10868,9 b' msgstr ""' | |||||
10725 | msgid "you can't specify a revision and a date" |
|
10868 | msgid "you can't specify a revision and a date" | |
10726 | msgstr "ungültige Angabe von Revision und Datum gleichzeitig" |
|
10869 | msgstr "ungültige Angabe von Revision und Datum gleichzeitig" | |
10727 |
|
10870 | |||
|
10871 | msgid "uncommitted merge - use \"hg update\", see \"hg help revert\"" | |||
|
10872 | msgstr "" | |||
|
10873 | ||||
10728 | msgid "no files or directories specified; use --all to revert the whole repo" |
|
10874 | msgid "no files or directories specified; use --all to revert the whole repo" | |
10729 | msgstr "" |
|
10875 | msgstr "" | |
10730 | "keine Dateien oder Verzeichnisse angegeben; nutze --all um das gesamte " |
|
10876 | "keine Dateien oder Verzeichnisse angegeben; nutze --all um das gesamte " | |
@@ -10836,7 +10982,7 b' msgstr "Startet einen eigenst\xc3\xa4ndigen Webserver"' | |||||
10836 |
|
10982 | |||
10837 | msgid "" |
|
10983 | msgid "" | |
10838 | " Start a local HTTP repository browser and pull server. You can use\n" |
|
10984 | " Start a local HTTP repository browser and pull server. You can use\n" | |
10839 | " this for ad-hoc sharing and browing of repositories. It is\n" |
|
10985 | " this for ad-hoc sharing and browsing of repositories. It is\n" | |
10840 | " recommended to use a real web server to serve a repository for\n" |
|
10986 | " recommended to use a real web server to serve a repository for\n" | |
10841 | " longer periods of time." |
|
10987 | " longer periods of time." | |
10842 | msgstr "" |
|
10988 | msgstr "" | |
@@ -10900,11 +11046,13 b' msgstr ""' | |||||
10900 | " Dateien aus, es sei denn sie werden explizit mit -u/--unknown oder \n" |
|
11046 | " Dateien aus, es sei denn sie werden explizit mit -u/--unknown oder \n" | |
10901 | " -i/--ignored angefordert." |
|
11047 | " -i/--ignored angefordert." | |
10902 |
|
11048 | |||
10903 | msgid "" |
|
11049 | #, fuzzy | |
10904 | " NOTE: status may appear to disagree with diff if permissions have\n" |
|
11050 | msgid "" | |
10905 | " changed or a merge has occurred. The standard diff format does not\n" |
|
11051 | " .. note::\n" | |
10906 | " report permission changes and diff only reports changes relative\n" |
|
11052 | " status may appear to disagree with diff if permissions have\n" | |
10907 | " to one merge parent." |
|
11053 | " changed or a merge has occurred. The standard diff format does\n" | |
|
11054 | " not report permission changes and diff only reports changes\n" | |||
|
11055 | " relative to one merge parent." | |||
10908 | msgstr "" |
|
11056 | msgstr "" | |
10909 | " HINWEIS: Der Status kann sich vom Diff unterscheiden, wenn sich\n" |
|
11057 | " HINWEIS: Der Status kann sich vom Diff unterscheiden, wenn sich\n" | |
10910 | " Berechtigungen geändert haben oder eine Zusammenführung aufgetreten\n" |
|
11058 | " Berechtigungen geändert haben oder eine Zusammenführung aufgetreten\n" | |
@@ -11090,10 +11238,12 b' msgstr ""' | |||||
11090 | msgid " Name a particular revision using <name>." |
|
11238 | msgid " Name a particular revision using <name>." | |
11091 | msgstr " Benennt eine bestimmte Revision mit <name>." |
|
11239 | msgstr " Benennt eine bestimmte Revision mit <name>." | |
11092 |
|
11240 | |||
|
11241 | #, fuzzy | |||
11093 | msgid "" |
|
11242 | msgid "" | |
11094 | " Tags are used to name particular revisions of the repository and are\n" |
|
11243 | " Tags are used to name particular revisions of the repository and are\n" | |
11095 | " very useful to compare different revisions, to go back to significant\n" |
|
11244 | " very useful to compare different revisions, to go back to significant\n" | |
11096 | " earlier versions or to mark branch points as releases, etc." |
|
11245 | " earlier versions or to mark branch points as releases, etc. Changing\n" | |
|
11246 | " an existing tag is normally disallowed; use -f/--force to override." | |||
11097 | msgstr "" |
|
11247 | msgstr "" | |
11098 | " Etiketten sind nützlich um somit benannte Revisionen später in " |
|
11248 | " Etiketten sind nützlich um somit benannte Revisionen später in " | |
11099 | "Vergleichen\n" |
|
11249 | "Vergleichen\n" | |
@@ -11108,12 +11258,14 b' msgstr ""' | |||||
11108 | " Wenn keine Revision angegeben ist, wird der Vorgänger des Arbeits-\n" |
|
11258 | " Wenn keine Revision angegeben ist, wird der Vorgänger des Arbeits-\n" | |
11109 | " verzeichnisses (oder - falls keines existiert - die Spitze) benannt." |
|
11259 | " verzeichnisses (oder - falls keines existiert - die Spitze) benannt." | |
11110 |
|
11260 | |||
|
11261 | #, fuzzy | |||
11111 | msgid "" |
|
11262 | msgid "" | |
11112 | " To facilitate version control, distribution, and merging of tags,\n" |
|
11263 | " To facilitate version control, distribution, and merging of tags,\n" | |
11113 | " they are stored as a file named \".hgtags\" which is managed\n" |
|
11264 | " they are stored as a file named \".hgtags\" which is managed similarly\n" | |
11114 |
" |
|
11265 | " to other project files and can be hand-edited if necessary. This\n" | |
11115 | " necessary. The file '.hg/localtags' is used for local tags (not\n" |
|
11266 | " also means that tagging creates a new commit. The file\n" | |
11116 | " shared among repositories)." |
|
11267 | " \".hg/localtags\" is used for local tags (not shared among\n" | |
|
11268 | " repositories)." | |||
11117 | msgstr "" |
|
11269 | msgstr "" | |
11118 | " Um die Versionskontrolle, Verteilung und Zusammenführung von Etiketten\n" |
|
11270 | " Um die Versionskontrolle, Verteilung und Zusammenführung von Etiketten\n" | |
11119 | " möglich zu machen, werden sie in einer Datei '.hgtags' gespeichert, " |
|
11271 | " möglich zu machen, werden sie in einer Datei '.hgtags' gespeichert, " | |
@@ -11124,6 +11276,13 b' msgstr ""' | |||||
11124 | " liegen in der Datei .hg/localtags." |
|
11276 | " liegen in der Datei .hg/localtags." | |
11125 |
|
11277 | |||
11126 | msgid "" |
|
11278 | msgid "" | |
|
11279 | " Tag commits are usually made at the head of a branch. If the parent\n" | |||
|
11280 | " of the working directory is not a branch head, :hg:`tag` aborts; use\n" | |||
|
11281 | " -f/--force to force the tag commit to be based on a non-head\n" | |||
|
11282 | " changeset." | |||
|
11283 | msgstr "" | |||
|
11284 | ||||
|
11285 | msgid "" | |||
11127 | " Since tag names have priority over branch names during revision\n" |
|
11286 | " Since tag names have priority over branch names during revision\n" | |
11128 | " lookup, using an existing branch name as a tag name is discouraged." |
|
11287 | " lookup, using an existing branch name as a tag name is discouraged." | |
11129 | msgstr "" |
|
11288 | msgstr "" | |
@@ -11154,6 +11313,14 b' msgstr "Etikett \'%s\' ist nicht lokal"' | |||||
11154 | msgid "tag '%s' already exists (use -f to force)" |
|
11313 | msgid "tag '%s' already exists (use -f to force)" | |
11155 | msgstr "Etikett '%s' existiert bereits; erzwinge mit -f/--force" |
|
11314 | msgstr "Etikett '%s' existiert bereits; erzwinge mit -f/--force" | |
11156 |
|
11315 | |||
|
11316 | #, fuzzy | |||
|
11317 | msgid "uncommitted merge" | |||
|
11318 | msgstr "Ausstehende nicht versionierte Zusammenführung" | |||
|
11319 | ||||
|
11320 | #, fuzzy | |||
|
11321 | msgid "not at a branch head (use -f to force)" | |||
|
11322 | msgstr "Etikett '%s' existiert bereits; erzwinge mit -f/--force" | |||
|
11323 | ||||
11157 | msgid "list repository tags" |
|
11324 | msgid "list repository tags" | |
11158 | msgstr "Liste alle Etiketten des Archivs auf" |
|
11325 | msgstr "Liste alle Etiketten des Archivs auf" | |
11159 |
|
11326 | |||
@@ -11211,20 +11378,20 b' msgstr ""' | |||||
11211 | msgid "update working directory (or switch revisions)" |
|
11378 | msgid "update working directory (or switch revisions)" | |
11212 | msgstr "Aktualisiert das Arbeitsverzeichnis (oder wechselt die Version)" |
|
11379 | msgstr "Aktualisiert das Arbeitsverzeichnis (oder wechselt die Version)" | |
11213 |
|
11380 | |||
|
11381 | #, fuzzy | |||
11214 | msgid "" |
|
11382 | msgid "" | |
11215 | " Update the repository's working directory to the specified\n" |
|
11383 | " Update the repository's working directory to the specified\n" | |
11216 | " changeset." |
|
11384 | " changeset. If no changeset is specified, update to the tip of the\n" | |
|
11385 | " current named branch." | |||
11217 | msgstr " Hebt das Arbeitsverzeichnis auf die angegebene Revision an." |
|
11386 | msgstr " Hebt das Arbeitsverzeichnis auf die angegebene Revision an." | |
11218 |
|
11387 | |||
11219 | #, fuzzy |
|
11388 | msgid "" | |
11220 | msgid "" |
|
11389 | " If the changeset is not a descendant of the working directory's\n" | |
11221 | " If no changeset is specified, attempt to update to the tip of the\n" |
|
11390 | " parent, the update is aborted. With the -c/--check option, the\n" | |
11222 | " current branch. If this changeset is a descendant of the working\n" |
|
11391 | " working directory is checked for uncommitted changes; if none are\n" | |
11223 | " directory's parent, update to it, otherwise abort." |
|
11392 | " found, the working directory is updated to the specified\n" | |
11224 | msgstr "" |
|
11393 | " changeset." | |
11225 | " Wird keine Revision angegeben, wird zum Kopf des derzeitigen Zweigs\n" |
|
11394 | msgstr "" | |
11226 | " aktualisiert, falls dieser ein Nachfahr des direkten Vorgängers der\n" |
|
|||
11227 | " Arbeitskopie ist. Ansonsten bricht die Operation ab." |
|
|||
11228 |
|
11395 | |||
11229 | msgid "" |
|
11396 | msgid "" | |
11230 | " The following rules apply when the working directory contains\n" |
|
11397 | " The following rules apply when the working directory contains\n" | |
@@ -11274,8 +11441,8 b' msgstr ""' | |||||
11274 |
|
11441 | |||
11275 | #, fuzzy |
|
11442 | #, fuzzy | |
11276 | msgid "" |
|
11443 | msgid "" | |
11277 |
" If you want to update just one file to an older changeset, use |
|
11444 | " If you want to update just one file to an older changeset, use\n" | |
11278 | "`revert`." |
|
11445 | " :hg:`revert`." | |
11279 | msgstr "" |
|
11446 | msgstr "" | |
11280 | " Solle nur eine Datei auf eine ältere Revision gehoben werden, kann\n" |
|
11447 | " Solle nur eine Datei auf eine ältere Revision gehoben werden, kann\n" | |
11281 | " 'revert' genutzt werden." |
|
11448 | " 'revert' genutzt werden." | |
@@ -11330,9 +11497,15 b' msgstr "Gibt Version und Copyright Infor' | |||||
11330 | msgid "Mercurial Distributed SCM (version %s)\n" |
|
11497 | msgid "Mercurial Distributed SCM (version %s)\n" | |
11331 | msgstr "" |
|
11498 | msgstr "" | |
11332 |
|
11499 | |||
11333 | msgid "" |
|
11500 | #, fuzzy | |
11334 | "\n" |
|
11501 | msgid "(see http://mercurial.selenic.com for more information)" | |
11335 | "Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n" |
|
11502 | msgstr "" | |
|
11503 | " Siehe auch 'hg help urls' für das Format von Adressangaben.\n" | |||
|
11504 | " " | |||
|
11505 | ||||
|
11506 | #, fuzzy | |||
|
11507 | msgid "" | |||
|
11508 | "Copyright (C) 2005-2010 Matt Mackall and others\n" | |||
11336 | "This is free software; see the source for copying conditions. There is NO\n" |
|
11509 | "This is free software; see the source for copying conditions. There is NO\n" | |
11337 | "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
11510 | "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | |
11338 | msgstr "" |
|
11511 | msgstr "" | |
@@ -11410,6 +11583,9 b' msgstr "Spezifiziert den zu nutzenden SS' | |||||
11410 | msgid "specify hg command to run on the remote side" |
|
11583 | msgid "specify hg command to run on the remote side" | |
11411 | msgstr "Spezifiziert den hg-Befehl, der entfernt ausgeführt wird" |
|
11584 | msgstr "Spezifiziert den hg-Befehl, der entfernt ausgeführt wird" | |
11412 |
|
11585 | |||
|
11586 | msgid "do not verify server certificate (ignoring web.cacerts config)" | |||
|
11587 | msgstr "" | |||
|
11588 | ||||
11413 | msgid "PATTERN" |
|
11589 | msgid "PATTERN" | |
11414 | msgstr "" |
|
11590 | msgstr "" | |
11415 |
|
11591 | |||
@@ -11544,6 +11720,10 b' msgstr "F\xc3\xbchrt mit Vorg\xc3\xa4nger im Status vor R\xc3\xbccknahme zusammen"' | |||||
11544 | msgid "parent to choose when backing out merge" |
|
11720 | msgid "parent to choose when backing out merge" | |
11545 | msgstr "Wählt einen Vorgänger bei Rücknahme einer Zusammenführung" |
|
11721 | msgstr "Wählt einen Vorgänger bei Rücknahme einer Zusammenführung" | |
11546 |
|
11722 | |||
|
11723 | #, fuzzy | |||
|
11724 | msgid "specify merge tool" | |||
|
11725 | msgstr "gibt cvsroot an" | |||
|
11726 | ||||
11547 | msgid "revision to backout" |
|
11727 | msgid "revision to backout" | |
11548 | msgstr "Die zurückzunehmende Revision" |
|
11728 | msgstr "Die zurückzunehmende Revision" | |
11549 |
|
11729 | |||
@@ -11572,6 +11752,18 b' msgstr "F\xc3\xbchre keine Aktualisierung der Dateien durch"' | |||||
11572 | msgid "[-gbsr] [-U] [-c CMD] [REV]" |
|
11752 | msgid "[-gbsr] [-U] [-c CMD] [REV]" | |
11573 | msgstr "[-gbsr] [-c BEFEHL] [REV]" |
|
11753 | msgstr "[-gbsr] [-c BEFEHL] [REV]" | |
11574 |
|
11754 | |||
|
11755 | msgid "force" | |||
|
11756 | msgstr "erzwinge" | |||
|
11757 | ||||
|
11758 | msgid "delete a given bookmark" | |||
|
11759 | msgstr "Löscht ein gegebenes Lesezeichen" | |||
|
11760 | ||||
|
11761 | msgid "rename a given bookmark" | |||
|
11762 | msgstr "Benennt ein gegebenes Lesezeichen um" | |||
|
11763 | ||||
|
11764 | msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" | |||
|
11765 | msgstr "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" | |||
|
11766 | ||||
11575 | msgid "set branch name even if it shadows an existing branch" |
|
11767 | msgid "set branch name even if it shadows an existing branch" | |
11576 | msgstr "Setzt Branchnamen, selbst wenn es einen bestehenden Branch verdeckt" |
|
11768 | msgstr "Setzt Branchnamen, selbst wenn es einen bestehenden Branch verdeckt" | |
11577 |
|
11769 | |||
@@ -11721,6 +11913,9 b' msgstr "DATEI REV"' | |||||
11721 | msgid "[PATH]" |
|
11913 | msgid "[PATH]" | |
11722 | msgstr "[PFAD]" |
|
11914 | msgstr "[PFAD]" | |
11723 |
|
11915 | |||
|
11916 | msgid "revlog format" | |||
|
11917 | msgstr "" | |||
|
11918 | ||||
11724 | msgid "REPO NAMESPACE [KEY OLD NEW]" |
|
11919 | msgid "REPO NAMESPACE [KEY OLD NEW]" | |
11725 | msgstr "" |
|
11920 | msgstr "" | |
11726 |
|
11921 | |||
@@ -11789,9 +11984,13 b' msgstr "Sucht in gegebenem Revisionsbere' | |||||
11789 | msgid "[OPTION]... PATTERN [FILE]..." |
|
11984 | msgid "[OPTION]... PATTERN [FILE]..." | |
11790 | msgstr "[OPTION]... MUSTER [DATEI]..." |
|
11985 | msgstr "[OPTION]... MUSTER [DATEI]..." | |
11791 |
|
11986 | |||
11792 | msgid "show only heads which are descendants of REV" |
|
11987 | #, fuzzy | |
|
11988 | msgid "show only heads which are descendants of STARTREV" | |||
11793 | msgstr "Zeigt nur Köpfe, die Nachkommen dieser Revision sind" |
|
11989 | msgstr "Zeigt nur Köpfe, die Nachkommen dieser Revision sind" | |
11794 |
|
11990 | |||
|
11991 | msgid "STARTREV" | |||
|
11992 | msgstr "" | |||
|
11993 | ||||
11795 | msgid "show topological heads only" |
|
11994 | msgid "show topological heads only" | |
11796 | msgstr "" |
|
11995 | msgstr "" | |
11797 |
|
11996 | |||
@@ -11802,7 +12001,7 b' msgid "show normal and closed branch hea' | |||||
11802 | msgstr "Zeigt normale und geschlossene Branch-Köpfe" |
|
12001 | msgstr "Zeigt normale und geschlossene Branch-Köpfe" | |
11803 |
|
12002 | |||
11804 | #, fuzzy |
|
12003 | #, fuzzy | |
11805 | msgid "[-ac] [-r REV] [REV]..." |
|
12004 | msgid "[-ac] [-r STARTREV] [REV]..." | |
11806 | msgstr "[-nibt] [-r REV] [QUELLE]" |
|
12005 | msgstr "[-nibt] [-r REV] [QUELLE]" | |
11807 |
|
12006 | |||
11808 | msgid "[TOPIC]" |
|
12007 | msgid "[TOPIC]" | |
@@ -11871,6 +12070,10 b' msgid "a remote changeset intended to be' | |||||
11871 | msgstr "zeigt den aktuellen Änderungssatz in Vorgänger-Branches" |
|
12070 | msgstr "zeigt den aktuellen Änderungssatz in Vorgänger-Branches" | |
11872 |
|
12071 | |||
11873 | #, fuzzy |
|
12072 | #, fuzzy | |
|
12073 | msgid "compare bookmarks" | |||
|
12074 | msgstr "Vergleiche Lesezeichen" | |||
|
12075 | ||||
|
12076 | #, fuzzy | |||
11874 | msgid "a specific branch you would like to pull" |
|
12077 | msgid "a specific branch you would like to pull" | |
11875 | msgstr "Revision die geholt werden soll" |
|
12078 | msgstr "Revision die geholt werden soll" | |
11876 |
|
12079 | |||
@@ -11976,12 +12179,23 b' msgstr "Auf den neuen tip aktualisieren, falls \xc3\x84nderungss\xc3\xa4tze geholt wurden"' | |||||
11976 | msgid "run even when remote repository is unrelated" |
|
12179 | msgid "run even when remote repository is unrelated" | |
11977 | msgstr "Auch ausführen wenn das entfernte Projektarchiv keinen Bezug hat" |
|
12180 | msgstr "Auch ausführen wenn das entfernte Projektarchiv keinen Bezug hat" | |
11978 |
|
12181 | |||
|
12182 | msgid "BOOKMARK" | |||
|
12183 | msgstr "LESEZEICHEN" | |||
|
12184 | ||||
|
12185 | #, fuzzy | |||
|
12186 | msgid "bookmark to pull" | |||
|
12187 | msgstr "Zu importierendes Lesezeichen" | |||
|
12188 | ||||
11979 | msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" |
|
12189 | msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" | |
11980 | msgstr "[-u] [-f] [-r REV]... [-e BEFEHL] [--remotecmd BEFEHL] [QUELLE]" |
|
12190 | msgstr "[-u] [-f] [-r REV]... [-e BEFEHL] [--remotecmd BEFEHL] [QUELLE]" | |
11981 |
|
12191 | |||
11982 | msgid "force push" |
|
12192 | msgid "force push" | |
11983 | msgstr "Erzwingt Push" |
|
12193 | msgstr "Erzwingt Push" | |
11984 |
|
12194 | |||
|
12195 | #, fuzzy | |||
|
12196 | msgid "bookmark to push" | |||
|
12197 | msgstr "Zu importierendes Lesezeichen" | |||
|
12198 | ||||
11985 | msgid "allow pushing a new branch" |
|
12199 | msgid "allow pushing a new branch" | |
11986 | msgstr "" |
|
12200 | msgstr "" | |
11987 |
|
12201 | |||
@@ -12058,7 +12272,7 b' msgstr ""' | |||||
12058 | "Name der auf der Webseite angezeigt wird (Standard: Arbeitsverzeichnis)" |
|
12272 | "Name der auf der Webseite angezeigt wird (Standard: Arbeitsverzeichnis)" | |
12059 |
|
12273 | |||
12060 | #, fuzzy |
|
12274 | #, fuzzy | |
12061 |
msgid "name of the hgweb config file (se |
|
12275 | msgid "name of the hgweb config file (see \"hg help hgweb\")" | |
12062 | msgstr "" |
|
12276 | msgstr "" | |
12063 | "Name der webdir-Konfigurationsdatei (mehr als ein Projektarchiv ausliefern)" |
|
12277 | "Name der webdir-Konfigurationsdatei (mehr als ein Projektarchiv ausliefern)" | |
12064 |
|
12278 | |||
@@ -12123,8 +12337,9 b' msgstr "Zeigt die Unterschiede zu einer ' | |||||
12123 | msgid "list the changed files of a revision" |
|
12337 | msgid "list the changed files of a revision" | |
12124 | msgstr "Mindestens ein paar Revisionen sind benötigt" |
|
12338 | msgstr "Mindestens ein paar Revisionen sind benötigt" | |
12125 |
|
12339 | |||
12126 | msgid "replace existing tag" |
|
12340 | #, fuzzy | |
12127 | msgstr "Ersetzt bereits existierendes Tag" |
|
12341 | msgid "force tag" | |
|
12342 | msgstr "erzwinge" | |||
12128 |
|
12343 | |||
12129 | msgid "make the tag local" |
|
12344 | msgid "make the tag local" | |
12130 | msgstr "Tag wird nur lokal gesetzt" |
|
12345 | msgstr "Tag wird nur lokal gesetzt" | |
@@ -12155,8 +12370,9 b' msgstr "[-u] DATEI..."' | |||||
12155 | msgid "discard uncommitted changes (no backup)" |
|
12370 | msgid "discard uncommitted changes (no backup)" | |
12156 | msgstr "entferne nicht versionierte Änderungen (kein Backup)" |
|
12371 | msgstr "entferne nicht versionierte Änderungen (kein Backup)" | |
12157 |
|
12372 | |||
12158 | msgid "check for uncommitted changes" |
|
12373 | #, fuzzy | |
12159 | msgstr "prüft auf nicht versionierte Änderungen" |
|
12374 | msgid "update across branches if no uncommitted changes" | |
|
12375 | msgstr "Ausstehende nicht versionierte Änderungen" | |||
12160 |
|
12376 | |||
12161 | msgid "[-c] [-C] [-d DATE] [[-r] REV]" |
|
12377 | msgid "[-c] [-C] [-d DATE] [[-r] REV]" | |
12162 | msgstr "[-c] [-C] [-d DATUM] [[-r] REV]" |
|
12378 | msgstr "[-c] [-C] [-d DATUM] [[-r] REV]" | |
@@ -12278,6 +12494,9 b' msgstr "Verzeichnis"' | |||||
12278 | msgid "unsupported file type (type is %s)" |
|
12494 | msgid "unsupported file type (type is %s)" | |
12279 | msgstr "nicht unterstützter Dateityp (Typ %s)" |
|
12495 | msgstr "nicht unterstützter Dateityp (Typ %s)" | |
12280 |
|
12496 | |||
|
12497 | msgid "searching for changes\n" | |||
|
12498 | msgstr "Suche nach Änderungen\n" | |||
|
12499 | ||||
12281 | msgid "queries" |
|
12500 | msgid "queries" | |
12282 | msgstr "" |
|
12501 | msgstr "" | |
12283 |
|
12502 | |||
@@ -12324,6 +12543,10 b' msgstr "Hinweis: Nicht synchronisierte entfernte \xc3\x84nderungen!\\n"' | |||||
12324 | msgid "abort: %s\n" |
|
12543 | msgid "abort: %s\n" | |
12325 | msgstr "Abbruch: %s\n" |
|
12544 | msgstr "Abbruch: %s\n" | |
12326 |
|
12545 | |||
|
12546 | #, python-format | |||
|
12547 | msgid "(%s)\n" | |||
|
12548 | msgstr "" | |||
|
12549 | ||||
12327 | #, fuzzy, python-format |
|
12550 | #, fuzzy, python-format | |
12328 | msgid "hg: parse error at %s: %s\n" |
|
12551 | msgid "hg: parse error at %s: %s\n" | |
12329 | msgstr "Abbruch: Fehler: %s\n" |
|
12552 | msgstr "Abbruch: Fehler: %s\n" | |
@@ -12385,10 +12608,6 b' msgstr "get\xc3\xb6tet!\\n"' | |||||
12385 | msgid "hg: unknown command '%s'\n" |
|
12608 | msgid "hg: unknown command '%s'\n" | |
12386 | msgstr "hg: unbekannter Befehl '%s'\n" |
|
12609 | msgstr "hg: unbekannter Befehl '%s'\n" | |
12387 |
|
12610 | |||
12388 | #, python-format |
|
|||
12389 | msgid "(%s)\n" |
|
|||
12390 | msgstr "" |
|
|||
12391 |
|
||||
12392 | msgid "(did you forget to compile extensions?)\n" |
|
12611 | msgid "(did you forget to compile extensions?)\n" | |
12393 | msgstr "(Erweiterungen nicht kompiliert?)\n" |
|
12612 | msgstr "(Erweiterungen nicht kompiliert?)\n" | |
12394 |
|
12613 | |||
@@ -12415,13 +12634,12 b' msgstr ""' | |||||
12415 | msgid "abort: out of memory\n" |
|
12634 | msgid "abort: out of memory\n" | |
12416 | msgstr "Abbruch: Unzureichender Arbeitsspeicher\n" |
|
12635 | msgstr "Abbruch: Unzureichender Arbeitsspeicher\n" | |
12417 |
|
12636 | |||
12418 | msgid "** unknown exception encountered, details follow\n" |
|
12637 | #, fuzzy | |
|
12638 | msgid "** unknown exception encountered, please report by visiting\n" | |||
12419 | msgstr "** Unbekannter Fehler, Details folgen\n" |
|
12639 | msgstr "** Unbekannter Fehler, Details folgen\n" | |
12420 |
|
12640 | |||
12421 | msgid "** report bug details to http://mercurial.selenic.com/bts/\n" |
|
12641 | #, fuzzy | |
12422 | msgstr "** Problemdetails bitte bei http://www.selenic.com/mercurial/bts\n" |
|
12642 | msgid "** http://mercurial.selenic.com/wiki/BugTracker\n" | |
12423 |
|
||||
12424 | msgid "** or mercurial@selenic.com\n" |
|
|||
12425 | msgstr "** oder mercurial@selenic.com melden\n" |
|
12643 | msgstr "** oder mercurial@selenic.com melden\n" | |
12426 |
|
12644 | |||
12427 | #, python-format |
|
12645 | #, python-format | |
@@ -12442,6 +12660,11 b' msgstr ""' | |||||
12442 |
|
12660 | |||
12443 | #, python-format |
|
12661 | #, python-format | |
12444 | msgid "" |
|
12662 | msgid "" | |
|
12663 | "No argument found for substitutionof %i variable in alias '%s' definition." | |||
|
12664 | msgstr "" | |||
|
12665 | ||||
|
12666 | #, python-format | |||
|
12667 | msgid "" | |||
12445 | "error in definition for alias '%s': %s may only be given on the command " |
|
12668 | "error in definition for alias '%s': %s may only be given on the command " | |
12446 | "line\n" |
|
12669 | "line\n" | |
12447 | msgstr "" |
|
12670 | msgstr "" | |
@@ -12513,6 +12736,10 b' msgstr ""' | |||||
12513 | msgid "*** failed to import extension %s: %s\n" |
|
12736 | msgid "*** failed to import extension %s: %s\n" | |
12514 | msgstr "" |
|
12737 | msgstr "" | |
12515 |
|
12738 | |||
|
12739 | #, fuzzy, python-format | |||
|
12740 | msgid "warning: error finding commands in %s\n" | |||
|
12741 | msgstr "Führe 'notify'-Befehl aus: %s\n" | |||
|
12742 | ||||
12516 | #, python-format |
|
12743 | #, python-format | |
12517 | msgid "couldn't find merge tool %s\n" |
|
12744 | msgid "couldn't find merge tool %s\n" | |
12518 | msgstr "" |
|
12745 | msgstr "" | |
@@ -12606,6 +12833,9 b' msgstr "Angabe von \xc3\x84nderungssatzbereichen"' | |||||
12606 | msgid "Diff Formats" |
|
12833 | msgid "Diff Formats" | |
12607 | msgstr "Diff-Formate" |
|
12834 | msgstr "Diff-Formate" | |
12608 |
|
12835 | |||
|
12836 | msgid "Merge Tools" | |||
|
12837 | msgstr "" | |||
|
12838 | ||||
12609 | msgid "Template Usage" |
|
12839 | msgid "Template Usage" | |
12610 | msgstr "Nutzung von Vorlagen" |
|
12840 | msgstr "Nutzung von Vorlagen" | |
12611 |
|
12841 | |||
@@ -12615,6 +12845,10 b' msgstr "URL-Pfade"' | |||||
12615 | msgid "Using additional features" |
|
12845 | msgid "Using additional features" | |
12616 | msgstr "Benutzung erweiterter Funktionen" |
|
12846 | msgstr "Benutzung erweiterter Funktionen" | |
12617 |
|
12847 | |||
|
12848 | #, fuzzy | |||
|
12849 | msgid "Subrepositories" | |||
|
12850 | msgstr "Projektarchiv %s" | |||
|
12851 | ||||
12618 | msgid "Configuring hgweb" |
|
12852 | msgid "Configuring hgweb" | |
12619 | msgstr "hgweb-Konfiguration" |
|
12853 | msgstr "hgweb-Konfiguration" | |
12620 |
|
12854 | |||
@@ -12942,6 +13176,15 b' msgstr ""' | |||||
12942 | " Kommandozeile überschrieben werden." |
|
13176 | " Kommandozeile überschrieben werden." | |
12943 |
|
13177 | |||
12944 | msgid "" |
|
13178 | msgid "" | |
|
13179 | "HGENCODINGAMBIGUOUS\n" | |||
|
13180 | " This sets Mercurial's behavior for handling characters with\n" | |||
|
13181 | " \"ambiguous\" widths like accented Latin characters with East Asian\n" | |||
|
13182 | " fonts. By default, Mercurial assumes ambiguous characters are\n" | |||
|
13183 | " narrow, set this variable to \"wide\" if such characters cause\n" | |||
|
13184 | " formatting problems." | |||
|
13185 | msgstr "" | |||
|
13186 | ||||
|
13187 | msgid "" | |||
12945 | "HGMERGE\n" |
|
13188 | "HGMERGE\n" | |
12946 | " An executable to use for resolving merge conflicts. The program\n" |
|
13189 | " An executable to use for resolving merge conflicts. The program\n" | |
12947 | " will be executed with three arguments: local file, remote file,\n" |
|
13190 | " will be executed with three arguments: local file, remote file,\n" | |
@@ -13769,6 +14012,182 b' msgstr ""' | |||||
13769 | "Seite gefunden werden, entfernt. Daher werden ``/foo/bar`` und\n" |
|
14012 | "Seite gefunden werden, entfernt. Daher werden ``/foo/bar`` und\n" | |
13770 | "``foo/quux/baz`` als ``bar`` und ``quux/baz`` aufgelistet.\n" |
|
14013 | "``foo/quux/baz`` als ``bar`` und ``quux/baz`` aufgelistet.\n" | |
13771 |
|
14014 | |||
|
14015 | msgid "To merge files Mercurial uses merge tools." | |||
|
14016 | msgstr "" | |||
|
14017 | ||||
|
14018 | msgid "" | |||
|
14019 | "A merge tool combines two different versions of a file into a merged\n" | |||
|
14020 | "file. Merge tools are given the two files and the greatest common\n" | |||
|
14021 | "ancestor of the two file versions, so they can determine the changes\n" | |||
|
14022 | "made on both branches." | |||
|
14023 | msgstr "" | |||
|
14024 | ||||
|
14025 | msgid "" | |||
|
14026 | "Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n" | |||
|
14027 | ":hg:`backout` and in several extensions." | |||
|
14028 | msgstr "" | |||
|
14029 | ||||
|
14030 | msgid "" | |||
|
14031 | "Usually, the merge tool tries to automatically reconcile the files by\n" | |||
|
14032 | "combining all non-overlapping changes that occurred separately in\n" | |||
|
14033 | "the two different evolutions of the same initial base file. Furthermore, " | |||
|
14034 | "some\n" | |||
|
14035 | "interactive merge programs make it easier to manually resolve\n" | |||
|
14036 | "conflicting merges, either in a graphical way, or by inserting some\n" | |||
|
14037 | "conflict markers. Mercurial does not include any interactive merge\n" | |||
|
14038 | "programs but relies on external tools for that." | |||
|
14039 | msgstr "" | |||
|
14040 | ||||
|
14041 | msgid "" | |||
|
14042 | "Available merge tools\n" | |||
|
14043 | "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" | |||
|
14044 | msgstr "" | |||
|
14045 | ||||
|
14046 | msgid "" | |||
|
14047 | "External merge tools and their properties are configured in the\n" | |||
|
14048 | "merge-tools configuration section - see hgrc(5) - but they can often just\n" | |||
|
14049 | "be named by their executable." | |||
|
14050 | msgstr "" | |||
|
14051 | ||||
|
14052 | msgid "" | |||
|
14053 | "A merge tool is generally usable if its executable can be found on the\n" | |||
|
14054 | "system and if it can handle the merge. The executable is found if it\n" | |||
|
14055 | "is an absolute or relative executable path or the name of an\n" | |||
|
14056 | "application in the executable search path. The tool is assumed to be\n" | |||
|
14057 | "able to handle the merge if it can handle symlinks if the file is a\n" | |||
|
14058 | "symlink, if it can handle binary files if the file is binary, and if a\n" | |||
|
14059 | "GUI is available if the tool requires a GUI." | |||
|
14060 | msgstr "" | |||
|
14061 | ||||
|
14062 | msgid "" | |||
|
14063 | "There are some internal merge tools which can be used. The internal\n" | |||
|
14064 | "merge tools are:" | |||
|
14065 | msgstr "" | |||
|
14066 | ||||
|
14067 | msgid "" | |||
|
14068 | "``internal:merge``\n" | |||
|
14069 | " Uses the internal non-interactive simple merge algorithm for merging\n" | |||
|
14070 | " files. It will fail if there are any conflicts and leave markers in\n" | |||
|
14071 | " the partially merged file." | |||
|
14072 | msgstr "" | |||
|
14073 | ||||
|
14074 | msgid "" | |||
|
14075 | "``internal:fail``\n" | |||
|
14076 | " Rather than attempting to merge files that were modified on both\n" | |||
|
14077 | " branches, it marks them as unresolved. The resolve command must be\n" | |||
|
14078 | " used to resolve these conflicts." | |||
|
14079 | msgstr "" | |||
|
14080 | ||||
|
14081 | msgid "" | |||
|
14082 | "``internal:local``\n" | |||
|
14083 | " Uses the local version of files as the merged version." | |||
|
14084 | msgstr "" | |||
|
14085 | ||||
|
14086 | msgid "" | |||
|
14087 | "``internal:other``\n" | |||
|
14088 | " Uses the other version of files as the merged version." | |||
|
14089 | msgstr "" | |||
|
14090 | ||||
|
14091 | msgid "" | |||
|
14092 | "``internal:prompt``\n" | |||
|
14093 | " Asks the user which of the local or the other version to keep as\n" | |||
|
14094 | " the merged version." | |||
|
14095 | msgstr "" | |||
|
14096 | ||||
|
14097 | msgid "" | |||
|
14098 | "``internal:dump``\n" | |||
|
14099 | " Creates three versions of the files to merge, containing the\n" | |||
|
14100 | " contents of local, other and base. These files can then be used to\n" | |||
|
14101 | " perform a merge manually. If the file to be merged is named\n" | |||
|
14102 | " ``a.txt``, these files will accordingly be named ``a.txt.local``,\n" | |||
|
14103 | " ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" | |||
|
14104 | " same directory as ``a.txt``." | |||
|
14105 | msgstr "" | |||
|
14106 | ||||
|
14107 | msgid "" | |||
|
14108 | "Internal tools are always available and do not require a GUI but will by " | |||
|
14109 | "default\n" | |||
|
14110 | "not handle symlinks or binary files." | |||
|
14111 | msgstr "" | |||
|
14112 | ||||
|
14113 | msgid "" | |||
|
14114 | "Choosing a merge tool\n" | |||
|
14115 | "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" | |||
|
14116 | msgstr "" | |||
|
14117 | ||||
|
14118 | msgid "Mercurial uses these rules when deciding which merge tool to use:" | |||
|
14119 | msgstr "" | |||
|
14120 | ||||
|
14121 | msgid "" | |||
|
14122 | "1. If a tool has been specified with the --tool option to merge or resolve, " | |||
|
14123 | "it\n" | |||
|
14124 | " is used. If it is the name of a tool in the merge-tools configuration, " | |||
|
14125 | "its\n" | |||
|
14126 | " configuration is used. Otherwise the specified tool must be executable " | |||
|
14127 | "by\n" | |||
|
14128 | " the shell." | |||
|
14129 | msgstr "" | |||
|
14130 | ||||
|
14131 | msgid "" | |||
|
14132 | "2. If the ``HGMERGE`` environment variable is present, its value is used " | |||
|
14133 | "and\n" | |||
|
14134 | " must be executable by the shell." | |||
|
14135 | msgstr "" | |||
|
14136 | ||||
|
14137 | msgid "" | |||
|
14138 | "3. If the filename of the file to be merged matches any of the patterns in " | |||
|
14139 | "the\n" | |||
|
14140 | " merge-patterns configuration section, the first usable merge tool\n" | |||
|
14141 | " corresponding to a matching pattern is used. Here, binary capabilities of " | |||
|
14142 | "the\n" | |||
|
14143 | " merge tool are not considered." | |||
|
14144 | msgstr "" | |||
|
14145 | ||||
|
14146 | msgid "" | |||
|
14147 | "4. If ui.merge is set it will be considered next. If the value is not the " | |||
|
14148 | "name\n" | |||
|
14149 | " of a configured tool, the specified value is used and must be executable " | |||
|
14150 | "by\n" | |||
|
14151 | " the shell. Otherwise the named tool is used if it is usable." | |||
|
14152 | msgstr "" | |||
|
14153 | ||||
|
14154 | msgid "" | |||
|
14155 | "5. If any usable merge tools are present in the merge-tools configuration\n" | |||
|
14156 | " section, the one with the highest priority is used." | |||
|
14157 | msgstr "" | |||
|
14158 | ||||
|
14159 | msgid "" | |||
|
14160 | "6. If a program named ``hgmerge`` can be found on the system, it is used - " | |||
|
14161 | "but\n" | |||
|
14162 | " it will by default not be used for symlinks and binary files." | |||
|
14163 | msgstr "" | |||
|
14164 | ||||
|
14165 | msgid "" | |||
|
14166 | "7. If the file to be merged is not binary and is not a symlink, then\n" | |||
|
14167 | " ``internal:merge`` is used." | |||
|
14168 | msgstr "" | |||
|
14169 | ||||
|
14170 | msgid "8. The merge of the file fails and must be resolved before commit." | |||
|
14171 | msgstr "" | |||
|
14172 | ||||
|
14173 | msgid "" | |||
|
14174 | ".. note::\n" | |||
|
14175 | " After selecting a merge program, Mercurial will by default attempt\n" | |||
|
14176 | " to merge the files using a simple merge algorithm first. Only if it " | |||
|
14177 | "doesn't\n" | |||
|
14178 | " succeed because of conflicting changes Mercurial will actually execute " | |||
|
14179 | "the\n" | |||
|
14180 | " merge program. Whether to use the simple merge algorithm first can be\n" | |||
|
14181 | " controlled by the premerge setting of the merge tool. Premerge is enabled " | |||
|
14182 | "by\n" | |||
|
14183 | " default unless the file is binary or a symlink." | |||
|
14184 | msgstr "" | |||
|
14185 | ||||
|
14186 | msgid "" | |||
|
14187 | "See the merge-tools and ui sections of hgrc(5) for details on the\n" | |||
|
14188 | "configuration of merge tools.\n" | |||
|
14189 | msgstr "" | |||
|
14190 | ||||
13772 | msgid "" |
|
14191 | msgid "" | |
13773 | "When Mercurial accepts more than one revision, they may be specified\n" |
|
14192 | "When Mercurial accepts more than one revision, they may be specified\n" | |
13774 | "individually, or provided as a topologically continuous range,\n" |
|
14193 | "individually, or provided as a topologically continuous range,\n" | |
@@ -13855,6 +14274,13 b' msgstr ""' | |||||
13855 | "``re:``. Erkennung mit regulären Ausdrücken ist relativ zur Wurzel des\n" |
|
14274 | "``re:``. Erkennung mit regulären Ausdrücken ist relativ zur Wurzel des\n" | |
13856 | "Projektarchivs." |
|
14275 | "Projektarchivs." | |
13857 |
|
14276 | |||
|
14277 | msgid "" | |||
|
14278 | "To read name patterns from a file, use ``listfile:`` or ``listfile0:``.\n" | |||
|
14279 | "The latter expects null delimited patterns while the former expects line\n" | |||
|
14280 | "feeds. Each string read from the file is itself treated as a file\n" | |||
|
14281 | "pattern." | |||
|
14282 | msgstr "" | |||
|
14283 | ||||
13858 | msgid "Plain examples::" |
|
14284 | msgid "Plain examples::" | |
13859 | msgstr "Einfache Beispiele::" |
|
14285 | msgstr "Einfache Beispiele::" | |
13860 |
|
14286 | |||
@@ -13890,11 +14316,20 b' msgstr ""' | |||||
13890 | msgid "Regexp examples::" |
|
14316 | msgid "Regexp examples::" | |
13891 | msgstr "Beispiel mit regulärem Ausdruck::" |
|
14317 | msgstr "Beispiel mit regulärem Ausdruck::" | |
13892 |
|
14318 | |||
13893 | msgid "" |
|
14319 | #, fuzzy | |
13894 |
" re:.*\\.c$ any name ending in \".c\", anywhere in the repository |
|
14320 | msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository" | |
13895 | msgstr "" |
|
14321 | msgstr "" | |
13896 | " re:.*\\.c$ jeder Name endend mit \".c\" überall im Projektarchiv\n" |
|
14322 | " re:.*\\.c$ jeder Name endend mit \".c\" überall im Projektarchiv\n" | |
13897 |
|
14323 | |||
|
14324 | #, fuzzy | |||
|
14325 | msgid "File examples::" | |||
|
14326 | msgstr "Glob-Beispiele::" | |||
|
14327 | ||||
|
14328 | msgid "" | |||
|
14329 | " listfile:list.txt read list from list.txt with one file pattern per line\n" | |||
|
14330 | " listfile0:list.txt read list from list.txt with null byte delimiters\n" | |||
|
14331 | msgstr "" | |||
|
14332 | ||||
13898 | msgid "Mercurial supports several ways to specify individual revisions." |
|
14333 | msgid "Mercurial supports several ways to specify individual revisions." | |
13899 | msgstr "Mercurial unterstützt mehrere Arten individuelle Revisionen anzugeben." |
|
14334 | msgstr "Mercurial unterstützt mehrere Arten individuelle Revisionen anzugeben." | |
13900 |
|
14335 | |||
@@ -13974,12 +14409,12 b' msgstr ""' | |||||
13974 | "Operatoren miteinander verbunden werden. Klammern können zur\n" |
|
14409 | "Operatoren miteinander verbunden werden. Klammern können zur\n" | |
13975 | "Gruppierung verwendet werden." |
|
14410 | "Gruppierung verwendet werden." | |
13976 |
|
14411 | |||
|
14412 | #, fuzzy | |||
13977 | msgid "" |
|
14413 | msgid "" | |
13978 | "Identifiers such as branch names must be quoted with single or double\n" |
|
14414 | "Identifiers such as branch names must be quoted with single or double\n" | |
13979 | "quotes if they contain characters outside of\n" |
|
14415 | "quotes if they contain characters outside of\n" | |
13980 | "``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" |
|
14416 | "``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" | |
13981 | "predicates. Special characters can be used in quoted identifiers by\n" |
|
14417 | "predicates." | |
13982 | "escaping them, e.g., ``\\n`` is interpreted as a newline." |
|
|||
13983 | msgstr "" |
|
14418 | msgstr "" | |
13984 | "Bezeichner wie Zweignamen müssen mit einfachen oder doppelten\n" |
|
14419 | "Bezeichner wie Zweignamen müssen mit einfachen oder doppelten\n" | |
13985 | "Anführungszeichen umgeben werden, wenn sie Zeichen außerhalb von\n" |
|
14420 | "Anführungszeichen umgeben werden, wenn sie Zeichen außerhalb von\n" | |
@@ -13988,6 +14423,12 b' msgstr ""' | |||||
13988 | "Anführungszeichen verwendet werden, indem sie escaped werden, z.B.\n" |
|
14423 | "Anführungszeichen verwendet werden, indem sie escaped werden, z.B.\n" | |
13989 | "wird ``\\n`` als Zeilenumbruch interpretiert." |
|
14424 | "wird ``\\n`` als Zeilenumbruch interpretiert." | |
13990 |
|
14425 | |||
|
14426 | msgid "" | |||
|
14427 | "Special characters can be used in quoted identifiers by escaping them,\n" | |||
|
14428 | "e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n" | |||
|
14429 | "interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``." | |||
|
14430 | msgstr "" | |||
|
14431 | ||||
13991 | msgid "There is a single prefix operator:" |
|
14432 | msgid "There is a single prefix operator:" | |
13992 | msgstr "Es gibt einen einzigen Präfix-Operator:" |
|
14433 | msgstr "Es gibt einen einzigen Präfix-Operator:" | |
13993 |
|
14434 | |||
@@ -14054,265 +14495,8 b' msgstr ""' | |||||
14054 | msgid "The following predicates are supported:" |
|
14495 | msgid "The following predicates are supported:" | |
14055 | msgstr "Die folgenden Prädikate werden unterstützt:" |
|
14496 | msgstr "Die folgenden Prädikate werden unterstützt:" | |
14056 |
|
14497 | |||
14057 | msgid "" |
|
14498 | msgid ".. predicatesmarker" | |
14058 | "``adds(pattern)``\n" |
|
14499 | msgstr "" | |
14059 | " Changesets that add a file matching pattern." |
|
|||
14060 | msgstr "" |
|
|||
14061 | "``adds(muster)``\n" |
|
|||
14062 | " Änderungssätze, die Dateien hinzufügen, die auf das Muster passen." |
|
|||
14063 |
|
||||
14064 | msgid "" |
|
|||
14065 | "``all()``\n" |
|
|||
14066 | " All changesets, the same as ``0:tip``." |
|
|||
14067 | msgstr "" |
|
|||
14068 | "``all()``\n" |
|
|||
14069 | " Alle Änderungssätze, entspricht ``0:tip``." |
|
|||
14070 |
|
||||
14071 | msgid "" |
|
|||
14072 | "``ancestor(single, single)``\n" |
|
|||
14073 | " Greatest common ancestor of the two changesets." |
|
|||
14074 | msgstr "" |
|
|||
14075 | "``ancestor(single, single)``\n" |
|
|||
14076 | " Größter gemeinsamer Vorfahre der beiden Änderungssätze." |
|
|||
14077 |
|
||||
14078 | msgid "" |
|
|||
14079 | "``ancestors(set)``\n" |
|
|||
14080 | " Changesets that are ancestors of a changeset in set." |
|
|||
14081 | msgstr "" |
|
|||
14082 | "``ancestors(set)``\n" |
|
|||
14083 | " Änderungssätze, die Vorfahren der Änderungssätze aus set sind." |
|
|||
14084 |
|
||||
14085 | msgid "" |
|
|||
14086 | "``author(string)``\n" |
|
|||
14087 | " Alias for ``user(string)``." |
|
|||
14088 | msgstr "" |
|
|||
14089 | "``author(zeichenkette)``\n" |
|
|||
14090 | " Alias für ``user(zeichenkette)``." |
|
|||
14091 |
|
||||
14092 | msgid "" |
|
|||
14093 | "``branch(set)``\n" |
|
|||
14094 | " All changesets belonging to the branches of changesets in set." |
|
|||
14095 | msgstr "" |
|
|||
14096 | "``branch(set)``\n" |
|
|||
14097 | " Alle Änderungssätze, die zu den Zweigen aus den Änderungssätzen\n" |
|
|||
14098 | " aus set gehören." |
|
|||
14099 |
|
||||
14100 | msgid "" |
|
|||
14101 | "``children(set)``\n" |
|
|||
14102 | " Child changesets of changesets in set." |
|
|||
14103 | msgstr "" |
|
|||
14104 | "``children(set)``\n" |
|
|||
14105 | " Kinder-Änderungssätze der Änderungssätze in set." |
|
|||
14106 |
|
||||
14107 | msgid "" |
|
|||
14108 | "``closed()``\n" |
|
|||
14109 | " Changeset is closed." |
|
|||
14110 | msgstr "" |
|
|||
14111 | "``closed()``\n" |
|
|||
14112 | " Änderungssatz ist geschlossen." |
|
|||
14113 |
|
||||
14114 | msgid "" |
|
|||
14115 | "``contains(pattern)``\n" |
|
|||
14116 | " Revision contains pattern." |
|
|||
14117 | msgstr "" |
|
|||
14118 | "``contains(muster)``\n" |
|
|||
14119 | " Revision enthält das Muster." |
|
|||
14120 |
|
||||
14121 | msgid "" |
|
|||
14122 | "``date(interval)``\n" |
|
|||
14123 | " Changesets within the interval, see :hg:`help dates`." |
|
|||
14124 | msgstr "" |
|
|||
14125 | "``date(intervall)``\n" |
|
|||
14126 | " Änderungssätze innerhalb des Intervalls, siehe auch :hg:`help dates`." |
|
|||
14127 |
|
||||
14128 | msgid "" |
|
|||
14129 | "``descendants(set)``\n" |
|
|||
14130 | " Changesets which are descendants of changesets in set." |
|
|||
14131 | msgstr "" |
|
|||
14132 | "``descendants(set)``\n" |
|
|||
14133 | " Änderungssätze, die Nachkommen der Änderungssätze in set sind." |
|
|||
14134 |
|
||||
14135 | msgid "" |
|
|||
14136 | "``file(pattern)``\n" |
|
|||
14137 | " Changesets affecting files matched by pattern." |
|
|||
14138 | msgstr "" |
|
|||
14139 | "``file(muster)``\n" |
|
|||
14140 | " Änderungssätze, die Dateien betroffen haben, die auf das Muster passen." |
|
|||
14141 |
|
||||
14142 | msgid "" |
|
|||
14143 | "``follow()``\n" |
|
|||
14144 | " An alias for ``::.`` (ancestors of the working copy's first parent)." |
|
|||
14145 | msgstr "" |
|
|||
14146 | "``follow()``\n" |
|
|||
14147 | " Ein Alias für ``::.`` (Vorfahren in der ersten Eltern-Revision der\n" |
|
|||
14148 | " Arbeitskopie)." |
|
|||
14149 |
|
||||
14150 | msgid "" |
|
|||
14151 | "``grep(regex)``\n" |
|
|||
14152 | " Like ``keyword(string)`` but accepts a regex." |
|
|||
14153 | msgstr "" |
|
|||
14154 | "``grep(regex)``\n" |
|
|||
14155 | " Wie ``keyword(zeichenkette)``, akzeptiert aber auch einen regulären\n" |
|
|||
14156 | " Ausdruck (regex)." |
|
|||
14157 |
|
||||
14158 | msgid "" |
|
|||
14159 | "``head()``\n" |
|
|||
14160 | " Changeset is a head." |
|
|||
14161 | msgstr "" |
|
|||
14162 | "``head()``\n" |
|
|||
14163 | " Änderungssatz ist ein Kopf (hat keine Kinder)." |
|
|||
14164 |
|
||||
14165 | msgid "" |
|
|||
14166 | "``heads(set)``\n" |
|
|||
14167 | " Members of set with no children in set." |
|
|||
14168 | msgstr "" |
|
|||
14169 | "``heads(set)``\n" |
|
|||
14170 | " Elemente aus set, die keine Kinder in set haben." |
|
|||
14171 |
|
||||
14172 | msgid "" |
|
|||
14173 | "``keyword(string)``\n" |
|
|||
14174 | " Search commit message, user name, and names of changed files for\n" |
|
|||
14175 | " string." |
|
|||
14176 | msgstr "" |
|
|||
14177 | "``keyword(zeichenkette)``\n" |
|
|||
14178 | " Sucht die Zeichenketten in der Commit-Nachricht, dem Benutzernamen\n" |
|
|||
14179 | " und der Liste geänderter Dateien." |
|
|||
14180 |
|
||||
14181 | msgid "" |
|
|||
14182 | "``limit(set, n)``\n" |
|
|||
14183 | " First n members of set." |
|
|||
14184 | msgstr "" |
|
|||
14185 | "``limit(set, n)``\n" |
|
|||
14186 | " Die ersten n Elemente aus set." |
|
|||
14187 |
|
||||
14188 | msgid "" |
|
|||
14189 | "``max(set)``\n" |
|
|||
14190 | " Changeset with highest revision number in set." |
|
|||
14191 | msgstr "" |
|
|||
14192 | "``max(set)``\n" |
|
|||
14193 | " Änderungssatz mit der größten Revisionsnummer in set." |
|
|||
14194 |
|
||||
14195 | msgid "" |
|
|||
14196 | "``min(set)``\n" |
|
|||
14197 | " Changeset with lowest revision number in set." |
|
|||
14198 | msgstr "" |
|
|||
14199 | "``min(set)``\n" |
|
|||
14200 | " Änderungssatz mit der kleinsten Revisionsnummer in set." |
|
|||
14201 |
|
||||
14202 | msgid "" |
|
|||
14203 | "``merge()``\n" |
|
|||
14204 | " Changeset is a merge changeset." |
|
|||
14205 | msgstr "" |
|
|||
14206 | "``merge()``\n" |
|
|||
14207 | " Änderungssatz ist eine Zusammenführung." |
|
|||
14208 |
|
||||
14209 | msgid "" |
|
|||
14210 | "``modifies(pattern)``\n" |
|
|||
14211 | " Changesets modifying files matched by pattern." |
|
|||
14212 | msgstr "" |
|
|||
14213 | "``modifies(muster)``\n" |
|
|||
14214 | " Änderungssätze, die Dateien verändert, die auf das Muster passen." |
|
|||
14215 |
|
||||
14216 | msgid "" |
|
|||
14217 | "``outgoing([path])``\n" |
|
|||
14218 | " Changesets not found in the specified destination repository, or the\n" |
|
|||
14219 | " default push location." |
|
|||
14220 | msgstr "" |
|
|||
14221 | "``outgoing([pfad])``\n" |
|
|||
14222 | " Änderungssätze, die nicht im angegebenen Ziel-Archiv oder dem\n" |
|
|||
14223 | " Standard Push-Ziel vorhanden sind," |
|
|||
14224 |
|
||||
14225 | msgid "" |
|
|||
14226 | "``p1(set)``\n" |
|
|||
14227 | " First parent of changesets in set." |
|
|||
14228 | msgstr "" |
|
|||
14229 | "``p1(set)``\n" |
|
|||
14230 | " Erster Vorfahr der Änderungssätze in set." |
|
|||
14231 |
|
||||
14232 | msgid "" |
|
|||
14233 | "``p2(set)``\n" |
|
|||
14234 | " Second parent of changesets in set." |
|
|||
14235 | msgstr "" |
|
|||
14236 | "``p2(set)``\n" |
|
|||
14237 | " Zweiter Vorfahr der Änderungssätze in set." |
|
|||
14238 |
|
||||
14239 | msgid "" |
|
|||
14240 | "``parents(set)``\n" |
|
|||
14241 | " The set of all parents for all changesets in set." |
|
|||
14242 | msgstr "" |
|
|||
14243 | "``parents(set)``\n" |
|
|||
14244 | " Die Menge aller Eltern für die Änderungssätze in set." |
|
|||
14245 |
|
||||
14246 | msgid "" |
|
|||
14247 | "``present(set)``\n" |
|
|||
14248 | " An empty set, if any revision in set isn't found; otherwise,\n" |
|
|||
14249 | " all revisions in set." |
|
|||
14250 | msgstr "" |
|
|||
14251 | "``present(set)``\n" |
|
|||
14252 | " Ein leeres Set, wenn keine Revision in set gefunden wurde, ansonsten\n" |
|
|||
14253 | " alle Revisionen aus dem angegebenen Set." |
|
|||
14254 |
|
||||
14255 | msgid "" |
|
|||
14256 | "``removes(pattern)``\n" |
|
|||
14257 | " Changesets which remove files matching pattern." |
|
|||
14258 | msgstr "" |
|
|||
14259 | "``removes(muster)``\n" |
|
|||
14260 | " Änderungssätze, die Dateien entfernten, die auf das Muster passen." |
|
|||
14261 |
|
||||
14262 | msgid "" |
|
|||
14263 | "``reverse(set)``\n" |
|
|||
14264 | " Reverse order of set." |
|
|||
14265 | msgstr "" |
|
|||
14266 | "``reverse(set)``\n" |
|
|||
14267 | " Kehrt die Reihenfolge von set um." |
|
|||
14268 |
|
||||
14269 | msgid "" |
|
|||
14270 | "``roots(set)``\n" |
|
|||
14271 | " Changesets with no parent changeset in set." |
|
|||
14272 | msgstr "" |
|
|||
14273 | "``roots(set)``\n" |
|
|||
14274 | " Änderungssätze ohne Eltern in set." |
|
|||
14275 |
|
||||
14276 | msgid "" |
|
|||
14277 | "``sort(set[, [-]key...])``\n" |
|
|||
14278 | " Sort set by keys. The default sort order is ascending, specify a key\n" |
|
|||
14279 | " as ``-key`` to sort in descending order." |
|
|||
14280 | msgstr "" |
|
|||
14281 | "``sort(set[, [-]key...])``\n" |
|
|||
14282 | " Sortiert set anhand des Schlüssels key. Die Standard-Reihenfolge\n" |
|
|||
14283 | " ist aufsteigend, geben Sie einen Schlüssel in der Form ``-key`` an,\n" |
|
|||
14284 | " um absteigend zu sortieren." |
|
|||
14285 |
|
||||
14286 | msgid " The keys can be:" |
|
|||
14287 | msgstr " Der key kann einer der folgenden sein:" |
|
|||
14288 |
|
||||
14289 | msgid "" |
|
|||
14290 | " - ``rev`` for the revision number,\n" |
|
|||
14291 | " - ``branch`` for the branch name,\n" |
|
|||
14292 | " - ``desc`` for the commit message (description),\n" |
|
|||
14293 | " - ``user`` for user name (``author`` can be used as an alias),\n" |
|
|||
14294 | " - ``date`` for the commit date" |
|
|||
14295 | msgstr "" |
|
|||
14296 | " - ``rev`` für die Revisionsnummer,\n" |
|
|||
14297 | " - ``branch`` für den Zweignamen,\n" |
|
|||
14298 | " - ``desc`` für die Commit-Nachricht (description),\n" |
|
|||
14299 | " - ``user`` für den Benutzernamen (``author`` kann als Alias\n" |
|
|||
14300 | " genutzt werden),\n" |
|
|||
14301 | " - ``date`` für das Datum des Commits" |
|
|||
14302 |
|
||||
14303 | msgid "" |
|
|||
14304 | "``tagged()``\n" |
|
|||
14305 | " Changeset is tagged." |
|
|||
14306 | msgstr "" |
|
|||
14307 | "``tagged()``\n" |
|
|||
14308 | " Der Änderungssatz wurde mit einem Tag versehen." |
|
|||
14309 |
|
||||
14310 | msgid "" |
|
|||
14311 | "``user(string)``\n" |
|
|||
14312 | " User name is string." |
|
|||
14313 | msgstr "" |
|
|||
14314 | "``user(string)``\n" |
|
|||
14315 | " Der Benutzername ist eine Zeichenkette." |
|
|||
14316 |
|
14500 | |||
14317 | msgid "Command line equivalents for :hg:`log`::" |
|
14501 | msgid "Command line equivalents for :hg:`log`::" | |
14318 | msgstr "Äquivalente Kommandozeilen-Befehle für :hg:`log`::" |
|
14502 | msgstr "Äquivalente Kommandozeilen-Befehle für :hg:`log`::" | |
@@ -14336,21 +14520,255 b' msgstr ""' | |||||
14336 | " -P x -> !::x\n" |
|
14520 | " -P x -> !::x\n" | |
14337 | " -l x -> limit(expr, x)" |
|
14521 | " -l x -> limit(expr, x)" | |
14338 |
|
14522 | |||
14339 | msgid "Some sample queries::" |
|
14523 | #, fuzzy | |
|
14524 | msgid "Some sample queries:" | |||
14340 | msgstr "Einige Beispiel-Anfragen::" |
|
14525 | msgstr "Einige Beispiel-Anfragen::" | |
14341 |
|
14526 | |||
14342 | msgid "" |
|
14527 | #, fuzzy | |
14343 | " hg log -r 'branch(default)'\n" |
|
14528 | msgid "- Changesets on the default branch::" | |
14344 | " hg log -r 'branch(default) and 1.5:: and not merge()'\n" |
|
14529 | msgstr "Zeigt nur Änderungssätze innerhalb des angegebenen Branches" | |
14345 | " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" |
|
14530 | ||
14346 | " hg log -r 'sort(date(\"May 2008\"), user)'\n" |
|
14531 | msgid " hg log -r \"branch(default)\"" | |
14347 | " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" |
|
14532 | msgstr "" | |
14348 | msgstr "" |
|
14533 | ||
14349 | " hg log -r 'branch(default)'\n" |
|
14534 | msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::" | |
14350 | " hg log -r 'branch(default) and 1.5:: and not merge()'\n" |
|
14535 | msgstr "" | |
14351 | " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" |
|
14536 | ||
14352 | " hg log -r 'sort(date(\"May 2008\"), user)'\n" |
|
14537 | msgid " hg log -r \"branch(default) and 1.5:: and not merge()\"" | |
14353 | " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" |
|
14538 | msgstr "" | |
|
14539 | ||||
|
14540 | #, fuzzy | |||
|
14541 | msgid "- Open branch heads::" | |||
|
14542 | msgstr "Zeigt normale und geschlossene Branch-Köpfe" | |||
|
14543 | ||||
|
14544 | msgid " hg log -r \"head() and not closed()\"" | |||
|
14545 | msgstr "" | |||
|
14546 | ||||
|
14547 | msgid "" | |||
|
14548 | "- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n" | |||
|
14549 | " ``hgext/*``::" | |||
|
14550 | msgstr "" | |||
|
14551 | ||||
|
14552 | msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\"" | |||
|
14553 | msgstr "" | |||
|
14554 | ||||
|
14555 | msgid "- Changesets in committed May 2008, sorted by user::" | |||
|
14556 | msgstr "" | |||
|
14557 | ||||
|
14558 | msgid " hg log -r \"sort(date('May 2008'), user)\"" | |||
|
14559 | msgstr "" | |||
|
14560 | ||||
|
14561 | msgid "" | |||
|
14562 | "- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n" | |||
|
14563 | " release::" | |||
|
14564 | msgstr "" | |||
|
14565 | ||||
|
14566 | msgid "" | |||
|
14567 | " hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged" | |||
|
14568 | "())\"\n" | |||
|
14569 | msgstr "" | |||
|
14570 | ||||
|
14571 | msgid "" | |||
|
14572 | "Subrepositories let you nest external repositories or projects into a\n" | |||
|
14573 | "parent Mercurial repository, and make commands operate on them as a\n" | |||
|
14574 | "group. External Mercurial and Subversion projects are currently\n" | |||
|
14575 | "supported." | |||
|
14576 | msgstr "" | |||
|
14577 | ||||
|
14578 | msgid "Subrepositories are made of three components:" | |||
|
14579 | msgstr "" | |||
|
14580 | ||||
|
14581 | msgid "" | |||
|
14582 | "1. Nested repository checkouts. They can appear anywhere in the\n" | |||
|
14583 | " parent working directory, and are Mercurial clones or Subversion\n" | |||
|
14584 | " checkouts." | |||
|
14585 | msgstr "" | |||
|
14586 | ||||
|
14587 | msgid "" | |||
|
14588 | "2. Nested repository references. They are defined in ``.hgsub`` and\n" | |||
|
14589 | " tell where the subrepository checkouts come from. Mercurial\n" | |||
|
14590 | " subrepositories are referenced like:" | |||
|
14591 | msgstr "" | |||
|
14592 | ||||
|
14593 | msgid " path/to/nested = https://example.com/nested/repo/path" | |||
|
14594 | msgstr "" | |||
|
14595 | ||||
|
14596 | msgid "" | |||
|
14597 | " where ``path/to/nested`` is the checkout location relatively to the\n" | |||
|
14598 | " parent Mercurial root, and ``https://example.com/nested/repo/path``\n" | |||
|
14599 | " is the source repository path. The source can also reference a\n" | |||
|
14600 | " filesystem path. Subversion repositories are defined with:" | |||
|
14601 | msgstr "" | |||
|
14602 | ||||
|
14603 | msgid " path/to/nested = [svn]https://example.com/nested/trunk/path" | |||
|
14604 | msgstr "" | |||
|
14605 | ||||
|
14606 | msgid "" | |||
|
14607 | " Note that ``.hgsub`` does not exist by default in Mercurial\n" | |||
|
14608 | " repositories, you have to create and add it to the parent\n" | |||
|
14609 | " repository before using subrepositories." | |||
|
14610 | msgstr "" | |||
|
14611 | ||||
|
14612 | msgid "" | |||
|
14613 | "3. Nested repository states. They are defined in ``.hgsubstate`` and\n" | |||
|
14614 | " capture whatever information is required to restore the\n" | |||
|
14615 | " subrepositories to the state they were committed in a parent\n" | |||
|
14616 | " repository changeset. Mercurial automatically record the nested\n" | |||
|
14617 | " repositories states when committing in the parent repository." | |||
|
14618 | msgstr "" | |||
|
14619 | ||||
|
14620 | msgid "" | |||
|
14621 | " .. note::\n" | |||
|
14622 | " The ``.hgsubstate`` file should not be edited manually." | |||
|
14623 | msgstr "" | |||
|
14624 | ||||
|
14625 | #, fuzzy | |||
|
14626 | msgid "" | |||
|
14627 | "\n" | |||
|
14628 | "Adding a Subrepository\n" | |||
|
14629 | "----------------------" | |||
|
14630 | msgstr "" | |||
|
14631 | " Mercurial als Ziel\n" | |||
|
14632 | " ------------------" | |||
|
14633 | ||||
|
14634 | msgid "" | |||
|
14635 | "If ``.hgsub`` does not exist, create it and add it to the parent\n" | |||
|
14636 | "repository. Clone or checkout the external projects where you want it\n" | |||
|
14637 | "to live in the parent repository. Edit ``.hgsub`` and add the\n" | |||
|
14638 | "subrepository entry as described above. At this point, the\n" | |||
|
14639 | "subrepository is tracked and the next commit will record its state in\n" | |||
|
14640 | "``.hgsubstate`` and bind it to the committed changeset." | |||
|
14641 | msgstr "" | |||
|
14642 | ||||
|
14643 | #, fuzzy | |||
|
14644 | msgid "" | |||
|
14645 | "Synchronizing a Subrepository\n" | |||
|
14646 | "-----------------------------" | |||
|
14647 | msgstr "" | |||
|
14648 | "Zweigbasierte Zugriffskontrolle\n" | |||
|
14649 | "-------------------------------" | |||
|
14650 | ||||
|
14651 | msgid "" | |||
|
14652 | "Subrepos do not automatically track the latest changeset of their\n" | |||
|
14653 | "sources. Instead, they are updated to the changeset that corresponds\n" | |||
|
14654 | "with the changeset checked out in the top-level changeset. This is so\n" | |||
|
14655 | "developers always get a consistent set of compatible code and\n" | |||
|
14656 | "libraries when they update." | |||
|
14657 | msgstr "" | |||
|
14658 | ||||
|
14659 | msgid "" | |||
|
14660 | "Thus, updating subrepos is a manual process. Simply check out target\n" | |||
|
14661 | "subrepo at the desired revision, test in the top-level repo, then\n" | |||
|
14662 | "commit in the parent repository to record the new combination." | |||
|
14663 | msgstr "" | |||
|
14664 | ||||
|
14665 | #, fuzzy | |||
|
14666 | msgid "" | |||
|
14667 | "Deleting a Subrepository\n" | |||
|
14668 | "------------------------" | |||
|
14669 | msgstr "" | |||
|
14670 | "Beispiel-Konfiguration\n" | |||
|
14671 | "----------------------" | |||
|
14672 | ||||
|
14673 | msgid "" | |||
|
14674 | "To remove a subrepository from the parent repository, delete its\n" | |||
|
14675 | "reference from ``.hgsub``, then remove its files." | |||
|
14676 | msgstr "" | |||
|
14677 | ||||
|
14678 | #, fuzzy | |||
|
14679 | msgid "" | |||
|
14680 | "Interaction with Mercurial Commands\n" | |||
|
14681 | "-----------------------------------" | |||
|
14682 | msgstr "" | |||
|
14683 | "Zweigbasierte Zugriffskontrolle\n" | |||
|
14684 | "-------------------------------" | |||
|
14685 | ||||
|
14686 | msgid "" | |||
|
14687 | ":add: add does not recurse in subrepos unless -S/--subrepos is\n" | |||
|
14688 | " specified. Subversion subrepositories are currently silently\n" | |||
|
14689 | " ignored." | |||
|
14690 | msgstr "" | |||
|
14691 | ||||
|
14692 | msgid "" | |||
|
14693 | ":archive: archive does not recurse in subrepositories unless\n" | |||
|
14694 | " -S/--subrepos is specified." | |||
|
14695 | msgstr "" | |||
|
14696 | ||||
|
14697 | msgid "" | |||
|
14698 | ":commit: commit creates a consistent snapshot of the state of the\n" | |||
|
14699 | " entire project and its subrepositories. It does this by first\n" | |||
|
14700 | " attempting to commit all modified subrepositories, then recording\n" | |||
|
14701 | " their state and finally committing it in the parent\n" | |||
|
14702 | " repository. Mercurial can be made to abort if any subrepository\n" | |||
|
14703 | " content is modified by setting \"ui.commitsubrepos=no\" in a\n" | |||
|
14704 | " configuration file (see :hg:`help config`)." | |||
|
14705 | msgstr "" | |||
|
14706 | ||||
|
14707 | msgid "" | |||
|
14708 | ":diff: diff does not recurse in subrepos unless -S/--subrepos is\n" | |||
|
14709 | " specified. Changes are displayed as usual, on the subrepositories\n" | |||
|
14710 | " elements. Subversion subrepositories are currently silently\n" | |||
|
14711 | " ignored." | |||
|
14712 | msgstr "" | |||
|
14713 | ||||
|
14714 | msgid "" | |||
|
14715 | ":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n" | |||
|
14716 | " is specified. Subversion subrepositories are currently silently\n" | |||
|
14717 | " ignored." | |||
|
14718 | msgstr "" | |||
|
14719 | ||||
|
14720 | msgid "" | |||
|
14721 | ":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n" | |||
|
14722 | " is specified. Subversion subrepositories are currently silently\n" | |||
|
14723 | " ignored." | |||
|
14724 | msgstr "" | |||
|
14725 | ||||
|
14726 | msgid "" | |||
|
14727 | ":pull: pull is not recursive since it is not clear what to pull prior\n" | |||
|
14728 | " to running :hg:`update`. Listing and retrieving all\n" | |||
|
14729 | " subrepositories changes referenced by the parent repository pulled\n" | |||
|
14730 | " changesets is expensive at best, impossible in the Subversion\n" | |||
|
14731 | " case." | |||
|
14732 | msgstr "" | |||
|
14733 | ||||
|
14734 | msgid "" | |||
|
14735 | ":push: Mercurial will automatically push all subrepositories first\n" | |||
|
14736 | " when the parent repository is being pushed. This ensures new\n" | |||
|
14737 | " subrepository changes are available when referenced by top-level\n" | |||
|
14738 | " repositories." | |||
|
14739 | msgstr "" | |||
|
14740 | ||||
|
14741 | msgid "" | |||
|
14742 | ":status: status does not recurse into subrepositories unless\n" | |||
|
14743 | " -S/--subrepos is specified. Subrepository changes are displayed as\n" | |||
|
14744 | " regular Mercurial changes on the subrepository\n" | |||
|
14745 | " elements. Subversion subrepositories are currently silently\n" | |||
|
14746 | " ignored." | |||
|
14747 | msgstr "" | |||
|
14748 | ||||
|
14749 | msgid "" | |||
|
14750 | ":update: update restores the subrepos in the state they were\n" | |||
|
14751 | " originally committed in target changeset. If the recorded\n" | |||
|
14752 | " changeset is not available in the current subrepository, Mercurial\n" | |||
|
14753 | " will pull it in first before updating. This means that updating\n" | |||
|
14754 | " can require network access when using subrepositories." | |||
|
14755 | msgstr "" | |||
|
14756 | ||||
|
14757 | #, fuzzy | |||
|
14758 | msgid "" | |||
|
14759 | "Remapping Subrepositories Sources\n" | |||
|
14760 | "---------------------------------" | |||
|
14761 | msgstr "" | |||
|
14762 | "Zweigbasierte Zugriffskontrolle\n" | |||
|
14763 | "-------------------------------" | |||
|
14764 | ||||
|
14765 | msgid "" | |||
|
14766 | "A subrepository source location may change during a project life,\n" | |||
|
14767 | "invalidating references stored in the parent repository history. To\n" | |||
|
14768 | "fix this, rewriting rules can be defined in parent repository ``hgrc``\n" | |||
|
14769 | "file or in Mercurial configuration. See the ``[subpaths]`` section in\n" | |||
|
14770 | "hgrc(5) for more details." | |||
|
14771 | msgstr "" | |||
14354 |
|
14772 | |||
14355 | msgid "" |
|
14773 | msgid "" | |
14356 | "Mercurial allows you to customize output of commands through\n" |
|
14774 | "Mercurial allows you to customize output of commands through\n" | |
@@ -14410,9 +14828,11 b' msgstr ""' | |||||
14410 | msgid ":author: String. The unmodified author of the changeset." |
|
14828 | msgid ":author: String. The unmodified author of the changeset." | |
14411 | msgstr ":author: Zeichenkette. Der unveränderte Autor eines Änderungssatzes." |
|
14829 | msgstr ":author: Zeichenkette. Der unveränderte Autor eines Änderungssatzes." | |
14412 |
|
14830 | |||
14413 | msgid "" |
|
14831 | #, fuzzy | |
14414 | ":branches: String. The name of the branch on which the changeset was\n" |
|
14832 | msgid "" | |
14415 | " committed. Will be empty if the branch name was default." |
|
14833 | ":branches: List of strings. The name of the branch on which the\n" | |
|
14834 | " changeset was committed. Will be empty if the branch name was\n" | |||
|
14835 | " default." | |||
14416 | msgstr "" |
|
14836 | msgstr "" | |
14417 | ":branches: Zeichenkette. Der Name des Zweiges, in dem der Änderungssatz\n" |
|
14837 | ":branches: Zeichenkette. Der Name des Zweiges, in dem der Änderungssatz\n" | |
14418 | " versioniert wurde. Ist leer, wenn der Zweig-Name default ist." |
|
14838 | " versioniert wurde. Ist leer, wenn der Zweig-Name default ist." | |
@@ -14588,6 +15008,11 b' msgstr ""' | |||||
14588 | ":escape: Beliebiger Text. Ersetzt die besonderen XML/XHTML-Zeichen\n" |
|
15008 | ":escape: Beliebiger Text. Ersetzt die besonderen XML/XHTML-Zeichen\n" | |
14589 | " \"&\", \"<\" und \">\" mit XML-Entitäten." |
|
15009 | " \"&\", \"<\" und \">\" mit XML-Entitäten." | |
14590 |
|
15010 | |||
|
15011 | msgid "" | |||
|
15012 | ":hex: Any text. Convert a binary Mercurial node identifier into\n" | |||
|
15013 | " its long hexadecimal representation." | |||
|
15014 | msgstr "" | |||
|
15015 | ||||
14591 | msgid ":fill68: Any text. Wraps the text to fit in 68 columns." |
|
15016 | msgid ":fill68: Any text. Wraps the text to fit in 68 columns." | |
14592 | msgstr ":fill68: Beliebiger Text. Umbricht den Text bei 68 Zeichen." |
|
15017 | msgstr ":fill68: Beliebiger Text. Umbricht den Text bei 68 Zeichen." | |
14593 |
|
15018 | |||
@@ -14699,12 +15124,13 b' msgstr ""' | |||||
14699 | msgid "Valid URLs are of the form::" |
|
15124 | msgid "Valid URLs are of the form::" | |
14700 | msgstr "Gültige URLs haben folgende Form::" |
|
15125 | msgstr "Gültige URLs haben folgende Form::" | |
14701 |
|
15126 | |||
|
15127 | #, fuzzy | |||
14702 | msgid "" |
|
15128 | msgid "" | |
14703 | " local/filesystem/path[#revision]\n" |
|
15129 | " local/filesystem/path[#revision]\n" | |
14704 | " file://local/filesystem/path[#revision]\n" |
|
15130 | " file://local/filesystem/path[#revision]\n" | |
14705 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
15131 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" | |
14706 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
15132 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" | |
14707 |
" ssh://[user |
|
15133 | " ssh://[user@]host[:port]/[path][#revision]" | |
14708 | msgstr "" |
|
15134 | msgstr "" | |
14709 | " lokaler/dateisystem/pfad[#revision]\n" |
|
15135 | " lokaler/dateisystem/pfad[#revision]\n" | |
14710 | " file://lokales/dateisystem/pfad[#revision]\n" |
|
15136 | " file://lokales/dateisystem/pfad[#revision]\n" | |
@@ -14712,10 +15138,11 b' msgstr ""' | |||||
14712 | " https://[nutzer[:pass]@]host[:port]/[pfad][#revision]\n" |
|
15138 | " https://[nutzer[:pass]@]host[:port]/[pfad][#revision]\n" | |
14713 | " ssh://[nutzer[:pass]@]host[:port]/[pfad][#revision]" |
|
15139 | " ssh://[nutzer[:pass]@]host[:port]/[pfad][#revision]" | |
14714 |
|
15140 | |||
|
15141 | #, fuzzy | |||
14715 | msgid "" |
|
15142 | msgid "" | |
14716 | "Paths in the local filesystem can either point to Mercurial\n" |
|
15143 | "Paths in the local filesystem can either point to Mercurial\n" | |
14717 | "repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n" |
|
15144 | "repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n" | |
14718 | "incoming --bundle`)." |
|
15145 | "incoming --bundle`). See also :hg:`help paths`." | |
14719 | msgstr "" |
|
15146 | msgstr "" | |
14720 | "Pfade im lokalen Dateisystem können auf ein Mercurial-Archiv oder Bündel-\n" |
|
15147 | "Pfade im lokalen Dateisystem können auf ein Mercurial-Archiv oder Bündel-\n" | |
14721 | "dateien verweisen (wie sie von :hg:`bundle` oder :hg: `incoming --bundle`\n" |
|
15148 | "dateien verweisen (wie sie von :hg:`bundle` oder :hg: `incoming --bundle`\n" | |
@@ -14739,6 +15166,11 b' msgstr ""' | |||||
14739 | "nur dann möglich, wenn diese Funktionen explizit auf dem entfernten\n" |
|
15166 | "nur dann möglich, wenn diese Funktionen explizit auf dem entfernten\n" | |
14740 | "Mercurial-Server aktiviert sind." |
|
15167 | "Mercurial-Server aktiviert sind." | |
14741 |
|
15168 | |||
|
15169 | msgid "" | |||
|
15170 | "Note that the security of HTTPS URLs depends on proper configuration of\n" | |||
|
15171 | "web.cacerts." | |||
|
15172 | msgstr "" | |||
|
15173 | ||||
14742 | msgid "Some notes about using SSH with Mercurial:" |
|
15174 | msgid "Some notes about using SSH with Mercurial:" | |
14743 | msgstr "Einige Hinweise zur Nutzung von SSH mit Mercurial:" |
|
15175 | msgstr "Einige Hinweise zur Nutzung von SSH mit Mercurial:" | |
14744 |
|
15176 | |||
@@ -14905,6 +15337,10 b' msgstr ""' | |||||
14905 | msgid "(branch merge, don't forget to commit)\n" |
|
15337 | msgid "(branch merge, don't forget to commit)\n" | |
14906 | msgstr "(Zusammenführen von Zweigen, vergiss nicht 'hg commit' auszuführen)\n" |
|
15338 | msgstr "(Zusammenführen von Zweigen, vergiss nicht 'hg commit' auszuführen)\n" | |
14907 |
|
15339 | |||
|
15340 | #, fuzzy, python-format | |||
|
15341 | msgid "config file %s not found!" | |||
|
15342 | msgstr "Datei nicht gefunden!" | |||
|
15343 | ||||
14908 | #, python-format |
|
15344 | #, python-format | |
14909 | msgid "error reading %s/.hg/hgrc: %s\n" |
|
15345 | msgid "error reading %s/.hg/hgrc: %s\n" | |
14910 | msgstr "Fehler beim Lesen von %s/.hg/hgrc: %s\n" |
|
15346 | msgstr "Fehler beim Lesen von %s/.hg/hgrc: %s\n" | |
@@ -15051,6 +15487,10 b' msgstr "Anforderung \'%s\' nicht unterst\xc3\xbctzt"' | |||||
15051 | msgid ".hg/sharedpath points to nonexistent directory %s" |
|
15487 | msgid ".hg/sharedpath points to nonexistent directory %s" | |
15052 | msgstr ".hg/sharedpath zeigt auf nicht existierendes Verzeichnis %s" |
|
15488 | msgstr ".hg/sharedpath zeigt auf nicht existierendes Verzeichnis %s" | |
15053 |
|
15489 | |||
|
15490 | #, fuzzy, python-format | |||
|
15491 | msgid "warning: ignoring unknown working parent %s!\n" | |||
|
15492 | msgstr "Arbeitsverzeichnis hat unbekannte Vaterversion '%s'!" | |||
|
15493 | ||||
15054 | #, python-format |
|
15494 | #, python-format | |
15055 | msgid "%r cannot be used in a tag name" |
|
15495 | msgid "%r cannot be used in a tag name" | |
15056 | msgstr "%r kann nicht in einem Tagnamen genutzt werden" |
|
15496 | msgstr "%r kann nicht in einem Tagnamen genutzt werden" | |
@@ -15112,6 +15552,10 b' msgstr "Projektarchiv %s"' | |||||
15112 | msgid "working directory of %s" |
|
15552 | msgid "working directory of %s" | |
15113 | msgstr "Arbeitsverzeichnis von %s" |
|
15553 | msgstr "Arbeitsverzeichnis von %s" | |
15114 |
|
15554 | |||
|
15555 | #, python-format | |||
|
15556 | msgid "warning: can't find ancestor for '%s' copied from '%s'!\n" | |||
|
15557 | msgstr "" | |||
|
15558 | ||||
15115 | msgid "cannot partially commit a merge (do not specify files or patterns)" |
|
15559 | msgid "cannot partially commit a merge (do not specify files or patterns)" | |
15116 | msgstr "" |
|
15560 | msgstr "" | |
15117 | "Das Zusammenführen kann nicht teilweise gespeichert werden (gib keine " |
|
15561 | "Das Zusammenführen kann nicht teilweise gespeichert werden (gib keine " | |
@@ -15120,6 +15564,10 b' msgstr ""' | |||||
15120 | msgid "can't commit subrepos without .hgsub" |
|
15564 | msgid "can't commit subrepos without .hgsub" | |
15121 | msgstr "Kann Unterarchiv nicht ohne .hgsub speichern" |
|
15565 | msgstr "Kann Unterarchiv nicht ohne .hgsub speichern" | |
15122 |
|
15566 | |||
|
15567 | #, fuzzy, python-format | |||
|
15568 | msgid "uncommitted changes in subrepo %s" | |||
|
15569 | msgstr "Änderungssatz %d erzeugt:%s\n" | |||
|
15570 | ||||
15123 | msgid "file not found!" |
|
15571 | msgid "file not found!" | |
15124 | msgstr "Datei nicht gefunden!" |
|
15572 | msgstr "Datei nicht gefunden!" | |
15125 |
|
15573 | |||
@@ -15155,30 +15603,33 b' msgstr ""' | |||||
15155 | "changegroupsubset nicht unterstützt." |
|
15603 | "changegroupsubset nicht unterstützt." | |
15156 |
|
15604 | |||
15157 | #, python-format |
|
15605 | #, python-format | |
|
15606 | msgid "updating bookmark %s\n" | |||
|
15607 | msgstr "Aktualisiere Lesezeichen %s\n" | |||
|
15608 | ||||
|
15609 | #, python-format | |||
|
15610 | msgid "not updating divergent bookmark %s\n" | |||
|
15611 | msgstr "Aktualisiere nicht divergierendes Lesezeichen %s\n" | |||
|
15612 | ||||
|
15613 | #, python-format | |||
15158 | msgid "%d changesets found\n" |
|
15614 | msgid "%d changesets found\n" | |
15159 | msgstr "%d Änderungssätze gefunden\n" |
|
15615 | msgstr "%d Änderungssätze gefunden\n" | |
15160 |
|
15616 | |||
15161 | msgid "bundling changes" |
|
15617 | #, fuzzy | |
15162 | msgstr "Bündle Änderungen" |
|
15618 | msgid "bundling" | |
15163 |
|
15619 | msgstr "Bündle Dateien" | ||
15164 | msgid "chunks" |
|
15620 | ||
15165 | msgstr "Blöcke" |
|
15621 | msgid "manifests" | |
15166 |
|
15622 | msgstr "Manifeste" | ||
15167 | msgid "bundling manifests" |
|
|||
15168 | msgstr "Bündle Manifeste" |
|
|||
15169 |
|
15623 | |||
15170 | #, python-format |
|
15624 | #, python-format | |
15171 | msgid "empty or missing revlog for %s" |
|
15625 | msgid "empty or missing revlog for %s" | |
15172 | msgstr "Leeres oder fehlendes Revlog für %s" |
|
15626 | msgstr "Leeres oder fehlendes Revlog für %s" | |
15173 |
|
15627 | |||
15174 | msgid "bundling files" |
|
|||
15175 | msgstr "Bündle Dateien" |
|
|||
15176 |
|
||||
15177 | msgid "adding changesets\n" |
|
15628 | msgid "adding changesets\n" | |
15178 | msgstr "Füge Änderungssätze hinzu\n" |
|
15629 | msgstr "Füge Änderungssätze hinzu\n" | |
15179 |
|
15630 | |||
15180 |
msgid "ch |
|
15631 | msgid "chunks" | |
15181 | msgstr "Änderungssätze" |
|
15632 | msgstr "Blöcke" | |
15182 |
|
15633 | |||
15183 | msgid "received changelog group is empty" |
|
15634 | msgid "received changelog group is empty" | |
15184 | msgstr "Erhaltene Changelog-Gruppe ist leer" |
|
15635 | msgstr "Erhaltene Changelog-Gruppe ist leer" | |
@@ -15186,9 +15637,6 b' msgstr "Erhaltene Changelog-Gruppe ist l' | |||||
15186 | msgid "adding manifests\n" |
|
15637 | msgid "adding manifests\n" | |
15187 | msgstr "Füge Manifeste hinzu\n" |
|
15638 | msgstr "Füge Manifeste hinzu\n" | |
15188 |
|
15639 | |||
15189 | msgid "manifests" |
|
|||
15190 | msgstr "Manifeste" |
|
|||
15191 |
|
||||
15192 | msgid "adding file changes\n" |
|
15640 | msgid "adding file changes\n" | |
15193 | msgstr "Füge Dateiänderungen hinzu\n" |
|
15641 | msgstr "Füge Dateiänderungen hinzu\n" | |
15194 |
|
15642 | |||
@@ -15230,6 +15678,13 b' msgstr "%d Dateien zum \xc3\x9cbertragen, %s an Daten\\n"' | |||||
15230 | msgid "transferred %s in %.1f seconds (%s/sec)\n" |
|
15678 | msgid "transferred %s in %.1f seconds (%s/sec)\n" | |
15231 | msgstr "%s in %.1f Sekunden übertragen (%s/Sek)\n" |
|
15679 | msgstr "%s in %.1f Sekunden übertragen (%s/Sek)\n" | |
15232 |
|
15680 | |||
|
15681 | msgid "can't use TLS: Python SSL support not installed" | |||
|
15682 | msgstr "Kann TLS nicht benutzen: SSL-Unterstützung nicht in Python installiert" | |||
|
15683 | ||||
|
15684 | #, fuzzy | |||
|
15685 | msgid "(using smtps)\n" | |||
|
15686 | msgstr "(benutze TLS)\n" | |||
|
15687 | ||||
15233 | msgid "smtp.host not configured - cannot send mail" |
|
15688 | msgid "smtp.host not configured - cannot send mail" | |
15234 | msgstr "smtp.host nicht konfiguriert -- kann keine E-Mail versenden" |
|
15689 | msgstr "smtp.host nicht konfiguriert -- kann keine E-Mail versenden" | |
15235 |
|
15690 | |||
@@ -15237,10 +15692,8 b' msgstr "smtp.host nicht konfiguriert -- ' | |||||
15237 | msgid "sending mail: smtp host %s, port %s\n" |
|
15692 | msgid "sending mail: smtp host %s, port %s\n" | |
15238 | msgstr "Sende E-Mail: SMTP-Host %s, Port %s\n" |
|
15693 | msgstr "Sende E-Mail: SMTP-Host %s, Port %s\n" | |
15239 |
|
15694 | |||
15240 | msgid "can't use TLS: Python SSL support not installed" |
|
15695 | #, fuzzy | |
15241 | msgstr "Kann TLS nicht benutzen: SSL-Unterstützung nicht in Python installiert" |
|
15696 | msgid "(using starttls)\n" | |
15242 |
|
||||
15243 | msgid "(using tls)\n" |
|
|||
15244 | msgstr "(benutze TLS)\n" |
|
15697 | msgstr "(benutze TLS)\n" | |
15245 |
|
15698 | |||
15246 | #, python-format |
|
15699 | #, python-format | |
@@ -15284,6 +15737,10 b' msgstr "Ung\xc3\xbcltiges Muster (%s): %s"' | |||||
15284 | msgid "invalid pattern" |
|
15737 | msgid "invalid pattern" | |
15285 | msgstr "Ungültiges Muster" |
|
15738 | msgstr "Ungültiges Muster" | |
15286 |
|
15739 | |||
|
15740 | #, fuzzy, python-format | |||
|
15741 | msgid "unable to read file list (%s)" | |||
|
15742 | msgstr "Fehler beim Lesen der Datei %s" | |||
|
15743 | ||||
15287 | #, python-format |
|
15744 | #, python-format | |
15288 | msgid "diff context lines count must be an integer, not %r" |
|
15745 | msgid "diff context lines count must be an integer, not %r" | |
15289 | msgstr "Zeilenangaben im Diff-Kontext müssen Zahlen sein, nicht %r" |
|
15746 | msgstr "Zeilenangaben im Diff-Kontext müssen Zahlen sein, nicht %r" | |
@@ -15359,8 +15816,8 b' msgid "getting %s to %s\\n"' | |||||
15359 | msgstr "" |
|
15816 | msgstr "" | |
15360 |
|
15817 | |||
15361 | #, python-format |
|
15818 | #, python-format | |
15362 | msgid "warning: detected divergent renames of %s to:\n" |
|
15819 | msgid "note: possible conflict - %s was renamed multiple times to:\n" | |
15363 | msgstr "Warnung: abweichende Umbenennungen von %s entdeckt:\n" |
|
15820 | msgstr "" | |
15364 |
|
15821 | |||
15365 | #, python-format |
|
15822 | #, python-format | |
15366 | msgid "branch %s not found" |
|
15823 | msgid "branch %s not found" | |
@@ -15379,16 +15836,46 b' msgstr ""' | |||||
15379 | "Ausstehende nicht versionierte Änderungen (nutze 'hg status' zur Auflistung " |
|
15836 | "Ausstehende nicht versionierte Änderungen (nutze 'hg status' zur Auflistung " | |
15380 | "der Änderungen)" |
|
15837 | "der Änderungen)" | |
15381 |
|
15838 | |||
15382 | msgid "" |
|
15839 | #, fuzzy | |
15383 |
"crosses branches ( |
|
15840 | msgid "crosses branches (merge branches or use --clean to discard changes)" | |
15384 | "changes)" |
|
|||
15385 | msgstr "" |
|
15841 | msgstr "" | |
15386 | "kreuzt Zweige (nutze 'hg merge' zum Zusammenführen oder 'hg update -C' um " |
|
15842 | "kreuzt Zweige (nutze 'hg merge' zum Zusammenführen oder 'hg update -C' um " | |
15387 | "die Änderungen zu verwerfen)" |
|
15843 | "die Änderungen zu verwerfen)" | |
15388 |
|
15844 | |||
15389 | msgid "crosses branches (use 'hg merge' or use 'hg update -c')" |
|
15845 | #, fuzzy | |
|
15846 | msgid "crosses branches (merge branches or use --check to force update)" | |||
15390 | msgstr "kreuzt Zweige (nutze 'hg merge' oder 'hg update -c')" |
|
15847 | msgstr "kreuzt Zweige (nutze 'hg merge' oder 'hg update -c')" | |
15391 |
|
15848 | |||
|
15849 | msgid "Attention:" | |||
|
15850 | msgstr "" | |||
|
15851 | ||||
|
15852 | msgid "Caution:" | |||
|
15853 | msgstr "" | |||
|
15854 | ||||
|
15855 | msgid "!Danger!" | |||
|
15856 | msgstr "" | |||
|
15857 | ||||
|
15858 | #, fuzzy | |||
|
15859 | msgid "Error:" | |||
|
15860 | msgstr "%s-Fehler:\n" | |||
|
15861 | ||||
|
15862 | msgid "Hint:" | |||
|
15863 | msgstr "" | |||
|
15864 | ||||
|
15865 | msgid "Important:" | |||
|
15866 | msgstr "" | |||
|
15867 | ||||
|
15868 | #, fuzzy | |||
|
15869 | msgid "Note:" | |||
|
15870 | msgstr "Entfernt: " | |||
|
15871 | ||||
|
15872 | msgid "Tip:" | |||
|
15873 | msgstr "" | |||
|
15874 | ||||
|
15875 | #, fuzzy | |||
|
15876 | msgid "Warning!" | |||
|
15877 | msgstr "Führe aus: %s\n" | |||
|
15878 | ||||
15392 | #, python-format |
|
15879 | #, python-format | |
15393 | msgid "cannot create %s: destination already exists" |
|
15880 | msgid "cannot create %s: destination already exists" | |
15394 | msgstr "Kann %s nicht anlegen: Zielverzeichnis existiert bereits" |
|
15881 | msgstr "Kann %s nicht anlegen: Zielverzeichnis existiert bereits" | |
@@ -15409,8 +15896,8 b' msgstr "Wende Patch auf Datei %s an\\n"' | |||||
15409 | #, python-format |
|
15896 | #, python-format | |
15410 | msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" |
|
15897 | msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" | |
15411 | msgstr "" |
|
15898 | msgstr "" | |
15412 |
"%d von %d Teilstücken sind FEHLGESCHLAGEN -- speichere Ausschuss in Datei |
|
15899 | "%d von %d Teilstücken sind FEHLGESCHLAGEN -- speichere Ausschuss in Datei " | |
15413 | "s\n" |
|
15900 | "%s\n" | |
15414 |
|
15901 | |||
15415 | #, python-format |
|
15902 | #, python-format | |
15416 | msgid "bad hunk #%d %s (%d %d %d %d)" |
|
15903 | msgid "bad hunk #%d %s (%d %d %d %d)" | |
@@ -15475,14 +15962,8 b' msgstr "patch-Befehl fehlgeschlagen: %s"' | |||||
15475 | msgid "unsupported line endings type: %s" |
|
15962 | msgid "unsupported line endings type: %s" | |
15476 | msgstr "Nicht unterstütztes Zeilenende: %s" |
|
15963 | msgstr "Nicht unterstütztes Zeilenende: %s" | |
15477 |
|
15964 | |||
15478 | msgid "" |
|
15965 | msgid "patch failed to apply" | |
15479 | "internal patcher failed\n" |
|
15966 | msgstr "Patch schlug fehl" | |
15480 | "please report details to http://mercurial.selenic.com/bts/\n" |
|
|||
15481 | "or mercurial@selenic.com\n" |
|
|||
15482 | msgstr "" |
|
|||
15483 | "Fehlschlag des internen patch-Werkzeugs.\n" |
|
|||
15484 | "Bitte melden Sie diesen Fehler bei http://mercurial.selenic.com/bts/\n" |
|
|||
15485 | "oder mercurial@selenic.com\n" |
|
|||
15486 |
|
15967 | |||
15487 | #, python-format |
|
15968 | #, python-format | |
15488 | msgid " %d files changed, %d insertions(+), %d deletions(-)\n" |
|
15969 | msgid " %d files changed, %d insertions(+), %d deletions(-)\n" | |
@@ -15557,12 +16038,13 b' msgstr "Inkompatibler Revisions-Schalter' | |||||
15557 | msgid "%s not found in the transaction" |
|
16038 | msgid "%s not found in the transaction" | |
15558 | msgstr "%s nicht in Transaktion gefunden" |
|
16039 | msgstr "%s nicht in Transaktion gefunden" | |
15559 |
|
16040 | |||
|
16041 | #, fuzzy | |||
|
16042 | msgid "consistency error in delta" | |||
|
16043 | msgstr "Konsistenzfehler beim Hinzufügen der Gruppe" | |||
|
16044 | ||||
15560 | msgid "unknown base" |
|
16045 | msgid "unknown base" | |
15561 | msgstr "unbekannte Basis" |
|
16046 | msgstr "unbekannte Basis" | |
15562 |
|
16047 | |||
15563 | msgid "consistency error adding group" |
|
|||
15564 | msgstr "Konsistenzfehler beim Hinzufügen der Gruppe" |
|
|||
15565 |
|
||||
15566 | msgid "unterminated string" |
|
16048 | msgid "unterminated string" | |
15567 | msgstr "nicht abgeschlossene Zeichenkette" |
|
16049 | msgstr "nicht abgeschlossene Zeichenkette" | |
15568 |
|
16050 | |||
@@ -15583,65 +16065,383 b' msgstr "In diesem Kontext kann keine Lis' | |||||
15583 | msgid "not a function: %s" |
|
16065 | msgid "not a function: %s" | |
15584 | msgstr "keine Funktion: %s" |
|
16066 | msgstr "keine Funktion: %s" | |
15585 |
|
16067 | |||
15586 | msgid "limit wants two arguments" |
|
16068 | msgid "" | |
|
16069 | "``id(string)``\n" | |||
|
16070 | " Revision non-ambiguously specified by the given hex string prefix." | |||
|
16071 | msgstr "" | |||
|
16072 | ||||
|
16073 | #. i18n: "id" is a keyword | |||
|
16074 | #, fuzzy | |||
|
16075 | msgid "id requires one argument" | |||
|
16076 | msgstr "head erwartet keine Argumente" | |||
|
16077 | ||||
|
16078 | #. i18n: "id" is a keyword | |||
|
16079 | #, fuzzy | |||
|
16080 | msgid "id requires a string" | |||
|
16081 | msgstr "date erwartet eine Zeichenkette" | |||
|
16082 | ||||
|
16083 | msgid "" | |||
|
16084 | "``rev(number)``\n" | |||
|
16085 | " Revision with the given numeric identifier." | |||
|
16086 | msgstr "" | |||
|
16087 | ||||
|
16088 | #. i18n: "rev" is a keyword | |||
|
16089 | #, fuzzy | |||
|
16090 | msgid "rev requires one argument" | |||
|
16091 | msgstr "merge erwartet keine Argumente" | |||
|
16092 | ||||
|
16093 | #. i18n: "rev" is a keyword | |||
|
16094 | #, fuzzy | |||
|
16095 | msgid "rev requires a number" | |||
|
16096 | msgstr "limit erwartet eine Zahl" | |||
|
16097 | ||||
|
16098 | #. i18n: "rev" is a keyword | |||
|
16099 | #, fuzzy | |||
|
16100 | msgid "rev expects a number" | |||
|
16101 | msgstr "limit erwartet eine Zahl" | |||
|
16102 | ||||
|
16103 | #, fuzzy | |||
|
16104 | msgid "" | |||
|
16105 | "``p1([set])``\n" | |||
|
16106 | " First parent of changesets in set, or the working directory." | |||
|
16107 | msgstr "" | |||
|
16108 | "``p1(set)``\n" | |||
|
16109 | " Erster Vorfahr der Änderungssätze in set." | |||
|
16110 | ||||
|
16111 | #, fuzzy | |||
|
16112 | msgid "" | |||
|
16113 | "``p2([set])``\n" | |||
|
16114 | " Second parent of changesets in set, or the working directory." | |||
|
16115 | msgstr "" | |||
|
16116 | "``p2(set)``\n" | |||
|
16117 | " Zweiter Vorfahr der Änderungssätze in set." | |||
|
16118 | ||||
|
16119 | #, fuzzy | |||
|
16120 | msgid "" | |||
|
16121 | "``parents([set])``\n" | |||
|
16122 | " The set of all parents for all changesets in set, or the working " | |||
|
16123 | "directory." | |||
|
16124 | msgstr "" | |||
|
16125 | "``parents(set)``\n" | |||
|
16126 | " Die Menge aller Eltern für die Änderungssätze in set." | |||
|
16127 | ||||
|
16128 | #, fuzzy | |||
|
16129 | msgid "" | |||
|
16130 | "``max(set)``\n" | |||
|
16131 | " Changeset with highest revision number in set." | |||
|
16132 | msgstr "" | |||
|
16133 | "``max(set)``\n" | |||
|
16134 | " Änderungssatz mit der größten Revisionsnummer in set." | |||
|
16135 | ||||
|
16136 | #, fuzzy | |||
|
16137 | msgid "" | |||
|
16138 | "``min(set)``\n" | |||
|
16139 | " Changeset with lowest revision number in set." | |||
|
16140 | msgstr "" | |||
|
16141 | "``min(set)``\n" | |||
|
16142 | " Änderungssatz mit der kleinsten Revisionsnummer in set." | |||
|
16143 | ||||
|
16144 | #, fuzzy | |||
|
16145 | msgid "" | |||
|
16146 | "``limit(set, n)``\n" | |||
|
16147 | " First n members of set." | |||
|
16148 | msgstr "" | |||
|
16149 | "``limit(set, n)``\n" | |||
|
16150 | " Die ersten n Elemente aus set." | |||
|
16151 | ||||
|
16152 | #. i18n: "limit" is a keyword | |||
|
16153 | #, fuzzy | |||
|
16154 | msgid "limit requires two arguments" | |||
15587 | msgstr "limit erwartet zwei Argumente" |
|
16155 | msgstr "limit erwartet zwei Argumente" | |
15588 |
|
16156 | |||
15589 | msgid "limit wants a number" |
|
16157 | #. i18n: "limit" is a keyword | |
15590 | msgstr "limit verlangt eine Zahl" |
|
16158 | #, fuzzy | |
15591 |
|
16159 | msgid "limit requires a number" | ||
|
16160 | msgstr "limit erwartet eine Zahl" | |||
|
16161 | ||||
|
16162 | #. i18n: "limit" is a keyword | |||
15592 | msgid "limit expects a number" |
|
16163 | msgid "limit expects a number" | |
15593 | msgstr "limit erwartet eine Zahl" |
|
16164 | msgstr "limit erwartet eine Zahl" | |
15594 |
|
16165 | |||
15595 | msgid "ancestor wants two arguments" |
|
16166 | #, fuzzy | |
|
16167 | msgid "" | |||
|
16168 | "``children(set)``\n" | |||
|
16169 | " Child changesets of changesets in set." | |||
|
16170 | msgstr "" | |||
|
16171 | "``children(set)``\n" | |||
|
16172 | " Kinder-Änderungssätze der Änderungssätze in set." | |||
|
16173 | ||||
|
16174 | #, fuzzy | |||
|
16175 | msgid "" | |||
|
16176 | "``branch(set)``\n" | |||
|
16177 | " All changesets belonging to the branches of changesets in set." | |||
|
16178 | msgstr "" | |||
|
16179 | "``branch(set)``\n" | |||
|
16180 | " Alle Änderungssätze, die zu den Zweigen aus den Änderungssätzen\n" | |||
|
16181 | " aus set gehören." | |||
|
16182 | ||||
|
16183 | #, fuzzy | |||
|
16184 | msgid "" | |||
|
16185 | "``ancestor(single, single)``\n" | |||
|
16186 | " Greatest common ancestor of the two changesets." | |||
|
16187 | msgstr "" | |||
|
16188 | "``ancestor(single, single)``\n" | |||
|
16189 | " Größter gemeinsamer Vorfahre der beiden Änderungssätze." | |||
|
16190 | ||||
|
16191 | #. i18n: "ancestor" is a keyword | |||
|
16192 | #, fuzzy | |||
|
16193 | msgid "ancestor requires two arguments" | |||
15596 | msgstr "ancestor erwartet zwei Argumente" |
|
16194 | msgstr "ancestor erwartet zwei Argumente" | |
15597 |
|
16195 | |||
|
16196 | #. i18n: "ancestor" is a keyword | |||
15598 | msgid "ancestor arguments must be single revisions" |
|
16197 | msgid "ancestor arguments must be single revisions" | |
15599 | msgstr "ancestors erwartet einzelne Revisionen als Argumente" |
|
16198 | msgstr "ancestors erwartet einzelne Revisionen als Argumente" | |
15600 |
|
16199 | |||
|
16200 | #, fuzzy | |||
|
16201 | msgid "" | |||
|
16202 | "``ancestors(set)``\n" | |||
|
16203 | " Changesets that are ancestors of a changeset in set." | |||
|
16204 | msgstr "" | |||
|
16205 | "``ancestors(set)``\n" | |||
|
16206 | " Änderungssätze, die Vorfahren der Änderungssätze aus set sind." | |||
|
16207 | ||||
|
16208 | #, fuzzy | |||
|
16209 | msgid "" | |||
|
16210 | "``descendants(set)``\n" | |||
|
16211 | " Changesets which are descendants of changesets in set." | |||
|
16212 | msgstr "" | |||
|
16213 | "``descendants(set)``\n" | |||
|
16214 | " Änderungssätze, die Nachkommen der Änderungssätze in set sind." | |||
|
16215 | ||||
|
16216 | #, fuzzy | |||
|
16217 | msgid "" | |||
|
16218 | "``follow()``\n" | |||
|
16219 | " An alias for ``::.`` (ancestors of the working copy's first parent)." | |||
|
16220 | msgstr "" | |||
|
16221 | "``follow()``\n" | |||
|
16222 | " Ein Alias für ``::.`` (Vorfahren in der ersten Eltern-Revision der\n" | |||
|
16223 | " Arbeitskopie)." | |||
|
16224 | ||||
|
16225 | #. i18n: "follow" is a keyword | |||
15601 | msgid "follow takes no arguments" |
|
16226 | msgid "follow takes no arguments" | |
15602 | msgstr "follow erwartet keine Argumente" |
|
16227 | msgstr "follow erwartet keine Argumente" | |
15603 |
|
16228 | |||
15604 | msgid "date wants a string" |
|
16229 | #, fuzzy | |
|
16230 | msgid "" | |||
|
16231 | "``date(interval)``\n" | |||
|
16232 | " Changesets within the interval, see :hg:`help dates`." | |||
|
16233 | msgstr "" | |||
|
16234 | "``date(intervall)``\n" | |||
|
16235 | " Änderungssätze innerhalb des Intervalls, siehe auch :hg:`help dates`." | |||
|
16236 | ||||
|
16237 | #. i18n: "date" is a keyword | |||
|
16238 | #, fuzzy | |||
|
16239 | msgid "date requires a string" | |||
15605 | msgstr "date erwartet eine Zeichenkette" |
|
16240 | msgstr "date erwartet eine Zeichenkette" | |
15606 |
|
16241 | |||
15607 | msgid "keyword wants a string" |
|
16242 | #, fuzzy | |
|
16243 | msgid "" | |||
|
16244 | "``keyword(string)``\n" | |||
|
16245 | " Search commit message, user name, and names of changed files for\n" | |||
|
16246 | " string." | |||
|
16247 | msgstr "" | |||
|
16248 | "``keyword(zeichenkette)``\n" | |||
|
16249 | " Sucht die Zeichenketten in der Commit-Nachricht, dem Benutzernamen\n" | |||
|
16250 | " und der Liste geänderter Dateien." | |||
|
16251 | ||||
|
16252 | #. i18n: "keyword" is a keyword | |||
|
16253 | #, fuzzy | |||
|
16254 | msgid "keyword requires a string" | |||
15608 | msgstr "keyword erwartet eine Zeichenkette" |
|
16255 | msgstr "keyword erwartet eine Zeichenkette" | |
15609 |
|
16256 | |||
15610 | msgid "grep wants a string" |
|
16257 | msgid "" | |
|
16258 | "``grep(regex)``\n" | |||
|
16259 | " Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n" | |||
|
16260 | " to ensure special escape characters are handled correctly." | |||
|
16261 | msgstr "" | |||
|
16262 | ||||
|
16263 | #. i18n: "grep" is a keyword | |||
|
16264 | #, fuzzy | |||
|
16265 | msgid "grep requires a string" | |||
15611 | msgstr "grep erwartet eine Zeichenkette" |
|
16266 | msgstr "grep erwartet eine Zeichenkette" | |
15612 |
|
16267 | |||
15613 | #, fuzzy, python-format |
|
16268 | #, fuzzy, python-format | |
15614 | msgid "invalid match pattern: %s" |
|
16269 | msgid "invalid match pattern: %s" | |
15615 | msgstr "grep: Ungültiges Suchmuster: %s\n" |
|
16270 | msgstr "grep: Ungültiges Suchmuster: %s\n" | |
15616 |
|
16271 | |||
15617 | msgid "author wants a string" |
|
16272 | #, fuzzy | |
|
16273 | msgid "" | |||
|
16274 | "``author(string)``\n" | |||
|
16275 | " Alias for ``user(string)``." | |||
|
16276 | msgstr "" | |||
|
16277 | "``author(zeichenkette)``\n" | |||
|
16278 | " Alias für ``user(zeichenkette)``." | |||
|
16279 | ||||
|
16280 | #. i18n: "author" is a keyword | |||
|
16281 | #, fuzzy | |||
|
16282 | msgid "author requires a string" | |||
15618 | msgstr "author erwartet eine Zeichenkette" |
|
16283 | msgstr "author erwartet eine Zeichenkette" | |
15619 |
|
16284 | |||
15620 | msgid "file wants a pattern" |
|
16285 | #, fuzzy | |
|
16286 | msgid "" | |||
|
16287 | "``user(string)``\n" | |||
|
16288 | " User name is string." | |||
|
16289 | msgstr "" | |||
|
16290 | "``user(string)``\n" | |||
|
16291 | " Der Benutzername ist eine Zeichenkette." | |||
|
16292 | ||||
|
16293 | #, fuzzy | |||
|
16294 | msgid "" | |||
|
16295 | "``file(pattern)``\n" | |||
|
16296 | " Changesets affecting files matched by pattern." | |||
|
16297 | msgstr "" | |||
|
16298 | "``file(muster)``\n" | |||
|
16299 | " Änderungssätze, die Dateien betroffen haben, die auf das Muster passen." | |||
|
16300 | ||||
|
16301 | #. i18n: "file" is a keyword | |||
|
16302 | #, fuzzy | |||
|
16303 | msgid "file requires a pattern" | |||
15621 | msgstr "file erwartet ein Muster" |
|
16304 | msgstr "file erwartet ein Muster" | |
15622 |
|
16305 | |||
15623 | msgid "contains wants a pattern" |
|
16306 | #, fuzzy | |
|
16307 | msgid "" | |||
|
16308 | "``contains(pattern)``\n" | |||
|
16309 | " Revision contains pattern." | |||
|
16310 | msgstr "" | |||
|
16311 | "``contains(muster)``\n" | |||
|
16312 | " Revision enthält das Muster." | |||
|
16313 | ||||
|
16314 | #. i18n: "contains" is a keyword | |||
|
16315 | #, fuzzy | |||
|
16316 | msgid "contains requires a pattern" | |||
15624 | msgstr "contains erwartet ein Muster" |
|
16317 | msgstr "contains erwartet ein Muster" | |
15625 |
|
16318 | |||
15626 | msgid "modifies wants a pattern" |
|
16319 | #, fuzzy | |
|
16320 | msgid "" | |||
|
16321 | "``modifies(pattern)``\n" | |||
|
16322 | " Changesets modifying files matched by pattern." | |||
|
16323 | msgstr "" | |||
|
16324 | "``modifies(muster)``\n" | |||
|
16325 | " Änderungssätze, die Dateien verändert, die auf das Muster passen." | |||
|
16326 | ||||
|
16327 | #. i18n: "modifies" is a keyword | |||
|
16328 | #, fuzzy | |||
|
16329 | msgid "modifies requires a pattern" | |||
15627 | msgstr "modifies erwartet ein Muster" |
|
16330 | msgstr "modifies erwartet ein Muster" | |
15628 |
|
16331 | |||
15629 | msgid "adds wants a pattern" |
|
16332 | #, fuzzy | |
|
16333 | msgid "" | |||
|
16334 | "``adds(pattern)``\n" | |||
|
16335 | " Changesets that add a file matching pattern." | |||
|
16336 | msgstr "" | |||
|
16337 | "``adds(muster)``\n" | |||
|
16338 | " Änderungssätze, die Dateien hinzufügen, die auf das Muster passen." | |||
|
16339 | ||||
|
16340 | #. i18n: "adds" is a keyword | |||
|
16341 | #, fuzzy | |||
|
16342 | msgid "adds requires a pattern" | |||
15630 | msgstr "adds erwartet ein Muster" |
|
16343 | msgstr "adds erwartet ein Muster" | |
15631 |
|
16344 | |||
15632 | msgid "removes wants a pattern" |
|
16345 | #, fuzzy | |
|
16346 | msgid "" | |||
|
16347 | "``removes(pattern)``\n" | |||
|
16348 | " Changesets which remove files matching pattern." | |||
|
16349 | msgstr "" | |||
|
16350 | "``removes(muster)``\n" | |||
|
16351 | " Änderungssätze, die Dateien entfernten, die auf das Muster passen." | |||
|
16352 | ||||
|
16353 | #. i18n: "removes" is a keyword | |||
|
16354 | #, fuzzy | |||
|
16355 | msgid "removes requires a pattern" | |||
15633 | msgstr "removes erwartet ein Muster" |
|
16356 | msgstr "removes erwartet ein Muster" | |
15634 |
|
16357 | |||
|
16358 | #, fuzzy | |||
|
16359 | msgid "" | |||
|
16360 | "``merge()``\n" | |||
|
16361 | " Changeset is a merge changeset." | |||
|
16362 | msgstr "" | |||
|
16363 | "``merge()``\n" | |||
|
16364 | " Änderungssatz ist eine Zusammenführung." | |||
|
16365 | ||||
|
16366 | #. i18n: "merge" is a keyword | |||
15635 | msgid "merge takes no arguments" |
|
16367 | msgid "merge takes no arguments" | |
15636 | msgstr "merge erwartet keine Argumente" |
|
16368 | msgstr "merge erwartet keine Argumente" | |
15637 |
|
16369 | |||
|
16370 | #, fuzzy | |||
|
16371 | msgid "" | |||
|
16372 | "``closed()``\n" | |||
|
16373 | " Changeset is closed." | |||
|
16374 | msgstr "" | |||
|
16375 | "``closed()``\n" | |||
|
16376 | " Änderungssatz ist geschlossen." | |||
|
16377 | ||||
|
16378 | #. i18n: "closed" is a keyword | |||
15638 | msgid "closed takes no arguments" |
|
16379 | msgid "closed takes no arguments" | |
15639 | msgstr "closed erwartet keine Argumente" |
|
16380 | msgstr "closed erwartet keine Argumente" | |
15640 |
|
16381 | |||
|
16382 | #, fuzzy | |||
|
16383 | msgid "" | |||
|
16384 | "``head()``\n" | |||
|
16385 | " Changeset is a named branch head." | |||
|
16386 | msgstr "" | |||
|
16387 | "``head()``\n" | |||
|
16388 | " Änderungssatz ist ein Kopf (hat keine Kinder)." | |||
|
16389 | ||||
|
16390 | #. i18n: "head" is a keyword | |||
15641 | msgid "head takes no arguments" |
|
16391 | msgid "head takes no arguments" | |
15642 | msgstr "head erwartet keine Argumente" |
|
16392 | msgstr "head erwartet keine Argumente" | |
15643 |
|
16393 | |||
15644 | msgid "sort wants one or two arguments" |
|
16394 | #, fuzzy | |
|
16395 | msgid "" | |||
|
16396 | "``reverse(set)``\n" | |||
|
16397 | " Reverse order of set." | |||
|
16398 | msgstr "" | |||
|
16399 | "``reverse(set)``\n" | |||
|
16400 | " Kehrt die Reihenfolge von set um." | |||
|
16401 | ||||
|
16402 | #, fuzzy | |||
|
16403 | msgid "" | |||
|
16404 | "``present(set)``\n" | |||
|
16405 | " An empty set, if any revision in set isn't found; otherwise,\n" | |||
|
16406 | " all revisions in set." | |||
|
16407 | msgstr "" | |||
|
16408 | "``present(set)``\n" | |||
|
16409 | " Ein leeres Set, wenn keine Revision in set gefunden wurde, ansonsten\n" | |||
|
16410 | " alle Revisionen aus dem angegebenen Set." | |||
|
16411 | ||||
|
16412 | #, fuzzy | |||
|
16413 | msgid "" | |||
|
16414 | "``sort(set[, [-]key...])``\n" | |||
|
16415 | " Sort set by keys. The default sort order is ascending, specify a key\n" | |||
|
16416 | " as ``-key`` to sort in descending order." | |||
|
16417 | msgstr "" | |||
|
16418 | "``sort(set[, [-]key...])``\n" | |||
|
16419 | " Sortiert set anhand des Schlüssels key. Die Standard-Reihenfolge\n" | |||
|
16420 | " ist aufsteigend, geben Sie einen Schlüssel in der Form ``-key`` an,\n" | |||
|
16421 | " um absteigend zu sortieren." | |||
|
16422 | ||||
|
16423 | #, fuzzy | |||
|
16424 | msgid " The keys can be:" | |||
|
16425 | msgstr " Der key kann einer der folgenden sein:" | |||
|
16426 | ||||
|
16427 | #, fuzzy | |||
|
16428 | msgid "" | |||
|
16429 | " - ``rev`` for the revision number,\n" | |||
|
16430 | " - ``branch`` for the branch name,\n" | |||
|
16431 | " - ``desc`` for the commit message (description),\n" | |||
|
16432 | " - ``user`` for user name (``author`` can be used as an alias),\n" | |||
|
16433 | " - ``date`` for the commit date" | |||
|
16434 | msgstr "" | |||
|
16435 | " - ``rev`` für die Revisionsnummer,\n" | |||
|
16436 | " - ``branch`` für den Zweignamen,\n" | |||
|
16437 | " - ``desc`` für die Commit-Nachricht (description),\n" | |||
|
16438 | " - ``user`` für den Benutzernamen (``author`` kann als Alias\n" | |||
|
16439 | " genutzt werden),\n" | |||
|
16440 | " - ``date`` für das Datum des Commits" | |||
|
16441 | ||||
|
16442 | #. i18n: "sort" is a keyword | |||
|
16443 | #, fuzzy | |||
|
16444 | msgid "sort requires one or two arguments" | |||
15645 | msgstr "sort verlangt ein oder zwei Argumente" |
|
16445 | msgstr "sort verlangt ein oder zwei Argumente" | |
15646 |
|
16446 | |||
15647 | msgid "sort spec must be a string" |
|
16447 | msgid "sort spec must be a string" | |
@@ -15651,15 +16451,78 b' msgstr "Sortiermodus muss eine Zeichenke' | |||||
15651 | msgid "unknown sort key %r" |
|
16451 | msgid "unknown sort key %r" | |
15652 | msgstr "Unbekannter Sortiermodus: %r" |
|
16452 | msgstr "Unbekannter Sortiermodus: %r" | |
15653 |
|
16453 | |||
|
16454 | #, fuzzy | |||
|
16455 | msgid "" | |||
|
16456 | "``all()``\n" | |||
|
16457 | " All changesets, the same as ``0:tip``." | |||
|
16458 | msgstr "" | |||
|
16459 | "``all()``\n" | |||
|
16460 | " Alle Änderungssätze, entspricht ``0:tip``." | |||
|
16461 | ||||
|
16462 | #. i18n: "all" is a keyword | |||
15654 | msgid "all takes no arguments" |
|
16463 | msgid "all takes no arguments" | |
15655 | msgstr "all erwartet keine Argumente" |
|
16464 | msgstr "all erwartet keine Argumente" | |
15656 |
|
16465 | |||
15657 | msgid "outgoing wants a repository path" |
|
16466 | #, fuzzy | |
|
16467 | msgid "" | |||
|
16468 | "``heads(set)``\n" | |||
|
16469 | " Members of set with no children in set." | |||
|
16470 | msgstr "" | |||
|
16471 | "``heads(set)``\n" | |||
|
16472 | " Elemente aus set, die keine Kinder in set haben." | |||
|
16473 | ||||
|
16474 | #, fuzzy | |||
|
16475 | msgid "" | |||
|
16476 | "``roots(set)``\n" | |||
|
16477 | " Changesets with no parent changeset in set." | |||
|
16478 | msgstr "" | |||
|
16479 | "``roots(set)``\n" | |||
|
16480 | " Änderungssätze ohne Eltern in set." | |||
|
16481 | ||||
|
16482 | #, fuzzy | |||
|
16483 | msgid "" | |||
|
16484 | "``outgoing([path])``\n" | |||
|
16485 | " Changesets not found in the specified destination repository, or the\n" | |||
|
16486 | " default push location." | |||
|
16487 | msgstr "" | |||
|
16488 | "``outgoing([pfad])``\n" | |||
|
16489 | " Änderungssätze, die nicht im angegebenen Ziel-Archiv oder dem\n" | |||
|
16490 | " Standard Push-Ziel vorhanden sind," | |||
|
16491 | ||||
|
16492 | #. i18n: "outgoing" is a keyword | |||
|
16493 | #, fuzzy | |||
|
16494 | msgid "outgoing requires a repository path" | |||
15658 | msgstr "outgoing verlangt einen Projektarchivpfad" |
|
16495 | msgstr "outgoing verlangt einen Projektarchivpfad" | |
15659 |
|
16496 | |||
15660 | msgid "tagged takes no arguments" |
|
16497 | msgid "" | |
|
16498 | "``tag(name)``\n" | |||
|
16499 | " The specified tag by name, or all tagged revisions if no name is given." | |||
|
16500 | msgstr "" | |||
|
16501 | ||||
|
16502 | #. i18n: "tag" is a keyword | |||
|
16503 | #, fuzzy | |||
|
16504 | msgid "tag takes one or no arguments" | |||
15661 | msgstr "tagged erwartet keine Argumente" |
|
16505 | msgstr "tagged erwartet keine Argumente" | |
15662 |
|
16506 | |||
|
16507 | #. i18n: "tag" is a keyword | |||
|
16508 | #, fuzzy | |||
|
16509 | msgid "the argument to tag must be a string" | |||
|
16510 | msgstr "Sortiermodus muss eine Zeichenkette sein" | |||
|
16511 | ||||
|
16512 | msgid "" | |||
|
16513 | "``bookmark([name])``\n" | |||
|
16514 | " The named bookmark or all bookmarks." | |||
|
16515 | msgstr "" | |||
|
16516 | ||||
|
16517 | #. i18n: "bookmark" is a keyword | |||
|
16518 | #, fuzzy | |||
|
16519 | msgid "bookmark takes one or no arguments" | |||
|
16520 | msgstr "sort verlangt ein oder zwei Argumente" | |||
|
16521 | ||||
|
16522 | #. i18n: "bookmark" is a keyword | |||
|
16523 | msgid "the argument to bookmark must be a string" | |||
|
16524 | msgstr "'bookmark' erwartet eine Zeichenkette als Parameter" | |||
|
16525 | ||||
15663 | msgid "can't negate that" |
|
16526 | msgid "can't negate that" | |
15664 | msgstr "kann dies nicht negieren" |
|
16527 | msgstr "kann dies nicht negieren" | |
15665 |
|
16528 | |||
@@ -15719,6 +16582,10 b' msgstr "Kann kein neues, static-http Pro' | |||||
15719 | msgid "invalid entry in fncache, line %s" |
|
16582 | msgid "invalid entry in fncache, line %s" | |
15720 | msgstr "Ungültiger Eintrag in fncache, Zeile %s" |
|
16583 | msgstr "Ungültiger Eintrag in fncache, Zeile %s" | |
15721 |
|
16584 | |||
|
16585 | #, fuzzy, python-format | |||
|
16586 | msgid "warning: subrepo spec file %s not found\n" | |||
|
16587 | msgstr "Konfigurationsdatei %s für das Unterarchiv nicht gefunden" | |||
|
16588 | ||||
15722 | #, python-format |
|
16589 | #, python-format | |
15723 | msgid "subrepo spec file %s not found" |
|
16590 | msgid "subrepo spec file %s not found" | |
15724 | msgstr "Konfigurationsdatei %s für das Unterarchiv nicht gefunden" |
|
16591 | msgstr "Konfigurationsdatei %s für das Unterarchiv nicht gefunden" | |
@@ -15757,13 +16624,37 b' msgstr ""' | |||||
15757 | " Entferntes Unterarchiv ändert %s, aber lokales löscht.\n" |
|
16624 | " Entferntes Unterarchiv ändert %s, aber lokales löscht.\n" | |
15758 | "Nutze (c) geänderte Version oder (d) lösche?" |
|
16625 | "Nutze (c) geänderte Version oder (d) lösche?" | |
15759 |
|
16626 | |||
|
16627 | #, fuzzy, python-format | |||
|
16628 | msgid "" | |||
|
16629 | " subrepository sources for %s differ\n" | |||
|
16630 | "use (l)ocal source (%s) or (r)emote source (%s)?\n" | |||
|
16631 | msgstr "" | |||
|
16632 | " Unterarchivquellen für %s sind verschieden.\n" | |||
|
16633 | "Nutze (l)okale Quelle (%s) oder entfe(r)nte Quelle (%s)?" | |||
|
16634 | ||||
|
16635 | #, fuzzy, python-format | |||
|
16636 | msgid "" | |||
|
16637 | " subrepository sources for %s differ (in checked out version)\n" | |||
|
16638 | "use (l)ocal source (%s) or (r)emote source (%s)?\n" | |||
|
16639 | msgstr "" | |||
|
16640 | " Unterarchivquellen für %s sind verschieden.\n" | |||
|
16641 | "Nutze (l)okale Quelle (%s) oder entfe(r)nte Quelle (%s)?" | |||
|
16642 | ||||
|
16643 | #, fuzzy, python-format | |||
|
16644 | msgid "default path for subrepository %s not found" | |||
|
16645 | msgstr "Projektarchiv %s nicht gefunden" | |||
|
16646 | ||||
15760 | #, python-format |
|
16647 | #, python-format | |
15761 | msgid "unknown subrepo type %s" |
|
16648 | msgid "unknown subrepo type %s" | |
15762 | msgstr "Unbekannter Unterarchivtyp %s" |
|
16649 | msgstr "Unbekannter Unterarchivtyp %s" | |
15763 |
|
16650 | |||
15764 | #, python-format |
|
16651 | #, fuzzy, python-format | |
15765 |
msgid " |
|
16652 | msgid "archiving (%s)" | |
15766 |
msgstr " |
|
16653 | msgstr "Entferne %s\n" | |
|
16654 | ||||
|
16655 | #, fuzzy, python-format | |||
|
16656 | msgid "warning: error \"%s\" in subrepository \"%s\"\n" | |||
|
16657 | msgstr "Übernehme Unterarchiv %s\n" | |||
15767 |
|
16658 | |||
15768 | #, python-format |
|
16659 | #, python-format | |
15769 | msgid "removing subrepo %s\n" |
|
16660 | msgid "removing subrepo %s\n" | |
@@ -15784,6 +16675,39 b' msgstr "Kann SVN-Externals nicht speiche' | |||||
15784 | msgid "not removing repo %s because it has changes.\n" |
|
16675 | msgid "not removing repo %s because it has changes.\n" | |
15785 | msgstr "Entferne Projektarchiv %s nicht, da es Änderungen enthält.\n" |
|
16676 | msgstr "Entferne Projektarchiv %s nicht, da es Änderungen enthält.\n" | |
15786 |
|
16677 | |||
|
16678 | #, fuzzy, python-format | |||
|
16679 | msgid "cloning subrepo %s\n" | |||
|
16680 | msgstr "Entferne Unterarchiv %s\n" | |||
|
16681 | ||||
|
16682 | #, fuzzy, python-format | |||
|
16683 | msgid "pulling subrepo %s\n" | |||
|
16684 | msgstr "Rufe Unterarchiv %s von %s ab\n" | |||
|
16685 | ||||
|
16686 | #, fuzzy, python-format | |||
|
16687 | msgid "revision %s does not exist in subrepo %s\n" | |||
|
16688 | msgstr "Revision %s ist keine Patchsatz-Nummer" | |||
|
16689 | ||||
|
16690 | #, python-format | |||
|
16691 | msgid "checking out detached HEAD in subrepo %s\n" | |||
|
16692 | msgstr "" | |||
|
16693 | ||||
|
16694 | msgid "check out a git branch if you intend to make changes\n" | |||
|
16695 | msgstr "" | |||
|
16696 | ||||
|
16697 | #, python-format | |||
|
16698 | msgid "unrelated git branch checked out in subrepo %s\n" | |||
|
16699 | msgstr "" | |||
|
16700 | ||||
|
16701 | #, fuzzy, python-format | |||
|
16702 | msgid "pushing branch %s of subrepo %s\n" | |||
|
16703 | msgstr "Übertrage Unterarchiv %s zu %s\n" | |||
|
16704 | ||||
|
16705 | #, python-format | |||
|
16706 | msgid "" | |||
|
16707 | "no branch checked out in subrepo %s\n" | |||
|
16708 | "cannot push revision %s" | |||
|
16709 | msgstr "" | |||
|
16710 | ||||
15787 | #, python-format |
|
16711 | #, python-format | |
15788 | msgid "%s, line %s: %s\n" |
|
16712 | msgid "%s, line %s: %s\n" | |
15789 | msgstr "%s, Zeile %s: %s\n" |
|
16713 | msgstr "%s, Zeile %s: %s\n" | |
@@ -15795,21 +16719,39 b' msgstr "Kann Eintrag nicht parsen"' | |||||
15795 | msgid "node '%s' is not well formed" |
|
16719 | msgid "node '%s' is not well formed" | |
15796 | msgstr "Knoten '%s' ist nicht wohlgeformt" |
|
16720 | msgstr "Knoten '%s' ist nicht wohlgeformt" | |
15797 |
|
16721 | |||
|
16722 | msgid ".hg/cache/tags is corrupt, rebuilding it\n" | |||
|
16723 | msgstr "" | |||
|
16724 | ||||
|
16725 | #, fuzzy, python-format | |||
|
16726 | msgid "unknown method '%s'" | |||
|
16727 | msgstr "Unbekannte Revision '%s'" | |||
|
16728 | ||||
|
16729 | #, fuzzy | |||
|
16730 | msgid "expected a symbol" | |||
|
16731 | msgstr "kein Symbol" | |||
|
16732 | ||||
|
16733 | #, fuzzy, python-format | |||
|
16734 | msgid "unknown function '%s'" | |||
|
16735 | msgstr "Unbekannte Revision '%s'" | |||
|
16736 | ||||
|
16737 | msgid "expected template specifier" | |||
|
16738 | msgstr "" | |||
|
16739 | ||||
|
16740 | #, python-format | |||
|
16741 | msgid "filter %s expects one argument" | |||
|
16742 | msgstr "" | |||
|
16743 | ||||
15798 | msgid "unmatched quotes" |
|
16744 | msgid "unmatched quotes" | |
15799 | msgstr "unpassende Anführungszeichen" |
|
16745 | msgstr "unpassende Anführungszeichen" | |
15800 |
|
16746 | |||
15801 | #, python-format |
|
16747 | #, python-format | |
15802 | msgid "error expanding '%s%%%s'" |
|
|||
15803 | msgstr "Fehler beim Auflösen von '%s%%%s'" |
|
|||
15804 |
|
||||
15805 | #, python-format |
|
|||
15806 | msgid "unknown filter '%s'" |
|
|||
15807 | msgstr "Unbekannter Filter '%s'" |
|
|||
15808 |
|
||||
15809 | #, python-format |
|
|||
15810 | msgid "style not found: %s" |
|
16748 | msgid "style not found: %s" | |
15811 | msgstr "Stil nicht gefunden: %s" |
|
16749 | msgstr "Stil nicht gefunden: %s" | |
15812 |
|
16750 | |||
|
16751 | #, fuzzy, python-format | |||
|
16752 | msgid "\"%s\" not in template map" | |||
|
16753 | msgstr "Anzeige unter Nutzung der Vorlagenzuordnungsdatei" | |||
|
16754 | ||||
15813 | #, python-format |
|
16755 | #, python-format | |
15814 | msgid "template file %s: %s" |
|
16756 | msgid "template file %s: %s" | |
15815 | msgstr "Vorlagendatei %s: %s" |
|
16757 | msgstr "Vorlagendatei %s: %s" | |
@@ -15840,6 +16782,10 b' msgid "Ignored: %s\\n"' | |||||
15840 | msgstr "Ignoriert: %s\n" |
|
16782 | msgstr "Ignoriert: %s\n" | |
15841 |
|
16783 | |||
15842 | #, python-format |
|
16784 | #, python-format | |
|
16785 | msgid "(deprecated '%%' in path %s=%s from %s)\n" | |||
|
16786 | msgstr "(veraltete Angabe '%%' im Pfad %s=%s aus %s)\n" | |||
|
16787 | ||||
|
16788 | #, python-format | |||
15843 | msgid "ignoring untrusted configuration option %s.%s = %s\n" |
|
16789 | msgid "ignoring untrusted configuration option %s.%s = %s\n" | |
15844 | msgstr "Ignoriere nicht vertrauenswürdige Einstellung %s.%s = %s\n" |
|
16790 | msgstr "Ignoriere nicht vertrauenswürdige Einstellung %s.%s = %s\n" | |
15845 |
|
16791 | |||
@@ -15861,10 +16807,6 b' msgstr "kein Benutzername angegeben (sie' | |||||
15861 | msgid "username %s contains a newline\n" |
|
16807 | msgid "username %s contains a newline\n" | |
15862 | msgstr "Benutzername %s enthält einen Zeilenumbruch\n" |
|
16808 | msgstr "Benutzername %s enthält einen Zeilenumbruch\n" | |
15863 |
|
16809 | |||
15864 | #, python-format |
|
|||
15865 | msgid "(deprecated '%%' in path %s=%s from %s)\n" |
|
|||
15866 | msgstr "(veraltete Angabe '%%' im Pfad %s=%s aus %s)\n" |
|
|||
15867 |
|
||||
15868 | msgid "response expected" |
|
16810 | msgid "response expected" | |
15869 | msgstr "Antwort erwartet" |
|
16811 | msgstr "Antwort erwartet" | |
15870 |
|
16812 | |||
@@ -15877,6 +16819,10 b' msgstr "Passwort: "' | |||||
15877 | msgid "edit failed" |
|
16819 | msgid "edit failed" | |
15878 | msgstr "Bearbeiten fehlgeschlagen" |
|
16820 | msgstr "Bearbeiten fehlgeschlagen" | |
15879 |
|
16821 | |||
|
16822 | #, python-format | |||
|
16823 | msgid "ignoring invalid [auth] key '%s'\n" | |||
|
16824 | msgstr "Ignoriere ungültige [auth] Schlüssel '%s'\n" | |||
|
16825 | ||||
15880 | msgid "http authorization required" |
|
16826 | msgid "http authorization required" | |
15881 | msgstr "HTTP-Autorisierung erforderlich" |
|
16827 | msgstr "HTTP-Autorisierung erforderlich" | |
15882 |
|
16828 | |||
@@ -15898,20 +16844,57 b' msgstr "Benutzer:"' | |||||
15898 | msgid "http auth: user %s, password %s\n" |
|
16844 | msgid "http auth: user %s, password %s\n" | |
15899 | msgstr "HTTP-Auth: Benutzer %s, Passwort %s\n" |
|
16845 | msgstr "HTTP-Auth: Benutzer %s, Passwort %s\n" | |
15900 |
|
16846 | |||
15901 | #, python-format |
|
16847 | msgid "kb" | |
15902 | msgid "ignoring invalid [auth] key '%s'\n" |
|
16848 | msgstr "" | |
15903 | msgstr "Ignoriere ungültige [auth] Schlüssel '%s'\n" |
|
|||
15904 |
|
16849 | |||
15905 | msgid "certificate checking requires Python 2.6" |
|
16850 | msgid "certificate checking requires Python 2.6" | |
15906 | msgstr "Zur Überprüfung von Zertifikaten wird Python 2.6 benötigt" |
|
16851 | msgstr "Zur Überprüfung von Zertifikaten wird Python 2.6 benötigt" | |
15907 |
|
16852 | |||
15908 | msgid "server identity verification succeeded\n" |
|
16853 | #, fuzzy | |
15909 | msgstr "Identität des Servers wurde erfolgreich verifiziert\n" |
|
16854 | msgid "no certificate received" | |
|
16855 | msgstr "SSL-Zertifikatsdatei" | |||
|
16856 | ||||
|
16857 | #, fuzzy, python-format | |||
|
16858 | msgid "certificate is for %s" | |||
|
16859 | msgstr "SSL-Zertifikatsdatei" | |||
|
16860 | ||||
|
16861 | msgid "IDN in certificate not supported" | |||
|
16862 | msgstr "" | |||
|
16863 | ||||
|
16864 | msgid "no commonName or subjectAltName found in certificate" | |||
|
16865 | msgstr "" | |||
|
16866 | ||||
|
16867 | #, python-format | |||
|
16868 | msgid "%s certificate error: %s (use --insecure to connect insecurely)" | |||
|
16869 | msgstr "" | |||
|
16870 | ||||
|
16871 | #, python-format | |||
|
16872 | msgid "invalid certificate for %s with fingerprint %s" | |||
|
16873 | msgstr "" | |||
|
16874 | ||||
|
16875 | #, python-format | |||
|
16876 | msgid "" | |||
|
16877 | "warning: %s certificate with fingerprint %s not verified (check " | |||
|
16878 | "hostfingerprints or web.cacerts config setting)\n" | |||
|
16879 | msgstr "" | |||
|
16880 | ||||
|
16881 | #, python-format | |||
|
16882 | msgid "no certificate for %s with configured hostfingerprint" | |||
|
16883 | msgstr "" | |||
|
16884 | ||||
|
16885 | #, python-format | |||
|
16886 | msgid "" | |||
|
16887 | "warning: %s certificate not verified (check web.cacerts config setting)\n" | |||
|
16888 | msgstr "" | |||
15910 |
|
16889 | |||
15911 | #, python-format |
|
16890 | #, python-format | |
15912 | msgid "command '%s' failed: %s" |
|
16891 | msgid "command '%s' failed: %s" | |
15913 | msgstr "Befehl '%s' fehlgeschlagen: %s" |
|
16892 | msgstr "Befehl '%s' fehlgeschlagen: %s" | |
15914 |
|
16893 | |||
|
16894 | #, fuzzy, python-format | |||
|
16895 | msgid "path ends in directory separator: %s" | |||
|
16896 | msgstr "Arbeitsverzeichnis wurde als Zweig %s markiert\n" | |||
|
16897 | ||||
15915 | #, python-format |
|
16898 | #, python-format | |
15916 | msgid "path contains illegal component: %s" |
|
16899 | msgid "path contains illegal component: %s" | |
15917 | msgstr "Pfad enthält ungültige Komponente: %s" |
|
16900 | msgstr "Pfad enthält ungültige Komponente: %s" | |
@@ -15924,13 +16907,17 b' msgstr "Pfad %r ist innerhalb des Archiv' | |||||
15924 | msgid "path %r traverses symbolic link %r" |
|
16907 | msgid "path %r traverses symbolic link %r" | |
15925 | msgstr "Pfad %r überschreitet symbolische Verknüpfung %r" |
|
16908 | msgstr "Pfad %r überschreitet symbolische Verknüpfung %r" | |
15926 |
|
16909 | |||
15927 | msgid "Hardlinks not supported" |
|
|||
15928 | msgstr "Hardlinks nicht unterstützt" |
|
|||
15929 |
|
||||
15930 | #, python-format |
|
16910 | #, python-format | |
15931 | msgid "could not symlink to %r: %s" |
|
16911 | msgid "could not symlink to %r: %s" | |
15932 | msgstr "Konnte symbolische Verknüpfung auf %r nicht erzeugen: %s" |
|
16912 | msgstr "Konnte symbolische Verknüpfung auf %r nicht erzeugen: %s" | |
15933 |
|
16913 | |||
|
16914 | msgid "check your clock" | |||
|
16915 | msgstr "" | |||
|
16916 | ||||
|
16917 | #, python-format | |||
|
16918 | msgid "negative timestamp: %d" | |||
|
16919 | msgstr "" | |||
|
16920 | ||||
15934 | #, python-format |
|
16921 | #, python-format | |
15935 | msgid "invalid date: %r" |
|
16922 | msgid "invalid date: %r" | |
15936 | msgstr "Ungültiges Datum: %r" |
|
16923 | msgstr "Ungültiges Datum: %r" | |
@@ -15940,6 +16927,10 b' msgid "date exceeds 32 bits: %d"' | |||||
15940 | msgstr "Datum überschreitet 32 Bit: %d" |
|
16927 | msgstr "Datum überschreitet 32 Bit: %d" | |
15941 |
|
16928 | |||
15942 | #, python-format |
|
16929 | #, python-format | |
|
16930 | msgid "negative date value: %d" | |||
|
16931 | msgstr "" | |||
|
16932 | ||||
|
16933 | #, python-format | |||
15943 | msgid "impossible time zone offset: %d" |
|
16934 | msgid "impossible time zone offset: %d" | |
15944 | msgstr "Unmögliche Zeitzonen-Verschiebung: %d" |
|
16935 | msgstr "Unmögliche Zeitzonen-Verschiebung: %d" | |
15945 |
|
16936 | |||
@@ -16056,6 +17047,9 b' msgstr "Archiv verwendet Revlogformat %d' | |||||
16056 | msgid "checking changesets\n" |
|
17047 | msgid "checking changesets\n" | |
16057 | msgstr "Prüfe Änderungssätze\n" |
|
17048 | msgstr "Prüfe Änderungssätze\n" | |
16058 |
|
17049 | |||
|
17050 | msgid "checking" | |||
|
17051 | msgstr "Prüfe" | |||
|
17052 | ||||
16059 | #, python-format |
|
17053 | #, python-format | |
16060 | msgid "unpacking changeset %s" |
|
17054 | msgid "unpacking changeset %s" | |
16061 | msgstr "Entpacke Änderungssatz %s" |
|
17055 | msgstr "Entpacke Änderungssatz %s" | |
@@ -16097,9 +17091,6 b' msgstr "Pr\xc3\xbcfe Dateien\\n"' | |||||
16097 | msgid "cannot decode filename '%s'" |
|
17091 | msgid "cannot decode filename '%s'" | |
16098 | msgstr "Kann Dateinamen '%s' nicht dekodieren" |
|
17092 | msgstr "Kann Dateinamen '%s' nicht dekodieren" | |
16099 |
|
17093 | |||
16100 | msgid "checking" |
|
|||
16101 | msgstr "Prüfe" |
|
|||
16102 |
|
||||
16103 | #, python-format |
|
17094 | #, python-format | |
16104 | msgid "broken revlog! (%s)" |
|
17095 | msgid "broken revlog! (%s)" | |
16105 | msgstr "Beschädigtes Revlog! (%s)" |
|
17096 | msgstr "Beschädigtes Revlog! (%s)" | |
@@ -16159,18 +17150,401 b' msgstr "%d Integrit\xc3\xa4tsfehler gefunden!\\n"' | |||||
16159 | msgid "(first damaged changeset appears to be %d)\n" |
|
17150 | msgid "(first damaged changeset appears to be %d)\n" | |
16160 | msgstr "(erster beschädigter Änderungssatz scheint %d zu sein)\n" |
|
17151 | msgstr "(erster beschädigter Änderungssatz scheint %d zu sein)\n" | |
16161 |
|
17152 | |||
16162 | msgid "user name not available - set USERNAME environment variable" |
|
|||
16163 | msgstr "" |
|
|||
16164 | "Benutzername nicht verfügbar - bitte setze die USERNAME Umgebungsvariable" |
|
|||
16165 |
|
||||
16166 | msgid "look up remote revision" |
|
17153 | msgid "look up remote revision" | |
16167 | msgstr "entfernte Revision abrufen" |
|
17154 | msgstr "entfernte Revision abrufen" | |
16168 |
|
17155 | |||
|
17156 | msgid "push failed (unexpected response):" | |||
|
17157 | msgstr "Übertragen fehlgeschlagen (unerwartete Antwort)" | |||
|
17158 | ||||
16169 | msgid "look up remote changes" |
|
17159 | msgid "look up remote changes" | |
16170 | msgstr "entfernte Änderungen abrufen" |
|
17160 | msgstr "entfernte Änderungen abrufen" | |
16171 |
|
17161 | |||
16172 | msgid "push failed:" |
|
17162 | msgid "push failed:" | |
16173 | msgstr "Übertragen fehlgeschlagen: %s" |
|
17163 | msgstr "Übertragen fehlgeschlagen: %s" | |
16174 |
|
17164 | |||
16175 | msgid "push failed (unexpected response):" |
|
17165 | #~ msgid " options:" | |
16176 | msgstr "Übertragen fehlgeschlagen (unerwartete Antwort)" |
|
17166 | #~ msgstr " Optionen:" | |
|
17167 | ||||
|
17168 | #~ msgid "" | |||
|
17169 | #~ "Path-based Access Control\n" | |||
|
17170 | #~ "-------------------------" | |||
|
17171 | #~ msgstr "" | |||
|
17172 | #~ "Pfadbasierte Zugriffskontrolle\n" | |||
|
17173 | #~ "------------------------------" | |||
|
17174 | ||||
|
17175 | #~ msgid "" | |||
|
17176 | #~ "Groups\n" | |||
|
17177 | #~ "------" | |||
|
17178 | #~ msgstr "" | |||
|
17179 | #~ "Gruppen\n" | |||
|
17180 | #~ "-------" | |||
|
17181 | ||||
|
17182 | #~ msgid "" | |||
|
17183 | #~ "Bookmarks are local movable markers to changesets. Every bookmark\n" | |||
|
17184 | #~ "points to a changeset identified by its hash. If you commit a\n" | |||
|
17185 | #~ "changeset that is based on a changeset that has a bookmark on it, the\n" | |||
|
17186 | #~ "bookmark shifts to the new changeset." | |||
|
17187 | #~ msgstr "" | |||
|
17188 | #~ "Lesezeichen sind lokale, bewegliche Markierungen für Änderungssätze. " | |||
|
17189 | #~ "Jedes\n" | |||
|
17190 | #~ "Lesezeichen zeigt auf einen Änderungssatz, angegeben durch dessen\n" | |||
|
17191 | #~ "Prüfsumme. Wenn Sie einen Commit ausführen, der auf einem Änderungssatz\n" | |||
|
17192 | #~ "mit einem Lesezeichen basiert, bewegt sich das Lesezeichen zum neuen\n" | |||
|
17193 | #~ "Änderungssatz." | |||
|
17194 | ||||
|
17195 | #~ msgid "" | |||
|
17196 | #~ "It is possible to use bookmark names in every revision lookup (e.g.\n" | |||
|
17197 | #~ ":hg:`merge`, :hg:`update`)." | |||
|
17198 | #~ msgstr "" | |||
|
17199 | #~ "Es ist möglich, Lesezeichen in jeder Revisionsabfrage zu verwenden\n" | |||
|
17200 | #~ "(z.B. :hg:`merge`, :hg:`update`)." | |||
|
17201 | ||||
|
17202 | #~ msgid "" | |||
|
17203 | #~ "By default, when several bookmarks point to the same changeset, they\n" | |||
|
17204 | #~ "will all move forward together. It is possible to obtain a more\n" | |||
|
17205 | #~ "git-like experience by adding the following configuration option to\n" | |||
|
17206 | #~ "your configuration file::" | |||
|
17207 | #~ msgstr "" | |||
|
17208 | #~ "Standardmäßig werden, wenn mehrere Lesezeichen auf einen Änderungssatz\n" | |||
|
17209 | #~ "zeigen, alle aktualisiert. Ist es möglich, ein Git-ähnliches Verhalten\n" | |||
|
17210 | #~ "zu erzeugen, indem die folgenden Einstellungen in die " | |||
|
17211 | #~ "Konfigurationsdatei\n" | |||
|
17212 | #~ "eingefügt werden::" | |||
|
17213 | ||||
|
17214 | #~ msgid "" | |||
|
17215 | #~ " [bookmarks]\n" | |||
|
17216 | #~ " track.current = True" | |||
|
17217 | #~ msgstr "" | |||
|
17218 | #~ " [bookmarks]\n" | |||
|
17219 | #~ " track.current = True" | |||
|
17220 | ||||
|
17221 | #~ msgid "" | |||
|
17222 | #~ "This will cause Mercurial to track the bookmark that you are currently\n" | |||
|
17223 | #~ "using, and only update it. This is similar to git's approach to\n" | |||
|
17224 | #~ "branching.\n" | |||
|
17225 | #~ msgstr "" | |||
|
17226 | #~ "Dies wird Mercurial dazu bringen, das Lesezeichen, das Sie im Moment\n" | |||
|
17227 | #~ "nutzen, zu verfolgen und nur dies zu aktualisieren. Dies ist ähnlich zur\n" | |||
|
17228 | #~ "Vorgehensweise von Git bei Verzweigungen.\n" | |||
|
17229 | ||||
|
17230 | #~ msgid "bookmark to export" | |||
|
17231 | #~ msgstr "Zu exportierendes Lesezeichen" | |||
|
17232 | ||||
|
17233 | #~ msgid "" | |||
|
17234 | #~ " --config convert.hg.ignoreerrors=False (boolean)\n" | |||
|
17235 | #~ " ignore integrity errors when reading. Use it to fix Mercurial\n" | |||
|
17236 | #~ " repositories with missing revlogs, by converting from and to\n" | |||
|
17237 | #~ " Mercurial.\n" | |||
|
17238 | #~ " --config convert.hg.saverev=False (boolean)\n" | |||
|
17239 | #~ " store original revision ID in changeset (forces target IDs to\n" | |||
|
17240 | #~ " change)\n" | |||
|
17241 | #~ " --config convert.hg.startrev=0 (hg revision identifier)\n" | |||
|
17242 | #~ " convert start revision and its descendants" | |||
|
17243 | #~ msgstr "" | |||
|
17244 | #~ " --config convert.hg.ignoreerrors=False (boolescher Wert)\n" | |||
|
17245 | #~ " Ignoriert Integritätsfehler beim Lesen. Wird benutzt um " | |||
|
17246 | #~ "Mercurial-\n" | |||
|
17247 | #~ " Archive ohne Revlog zu korrigieren, wenn von hg in hg " | |||
|
17248 | #~ "konvertiert\n" | |||
|
17249 | #~ " wird.\n" | |||
|
17250 | #~ " --config convert.hg.saverev=False (boolescher Wert)\n" | |||
|
17251 | #~ " Speichert die Original-Revisions-ID im Änderunsgsatz (erzwingt\n" | |||
|
17252 | #~ " Änderung der Ziel-IDs)\n" | |||
|
17253 | #~ " --config convert.hg.startrev=0 (hg Revisions-ID)\n" | |||
|
17254 | #~ " Konvertiert alle Nachfahren ab Startrevision" | |||
|
17255 | ||||
|
17256 | #~ msgid " The options shown are the defaults." | |||
|
17257 | #~ msgstr " Die folgenden Argumente zeigen die Standardwerte." | |||
|
17258 | ||||
|
17259 | #~ msgid "" | |||
|
17260 | #~ " --config convert.cvsps.cache=True (boolean)\n" | |||
|
17261 | #~ " Set to False to disable remote log caching, for testing and\n" | |||
|
17262 | #~ " debugging purposes.\n" | |||
|
17263 | #~ " --config convert.cvsps.fuzz=60 (integer)\n" | |||
|
17264 | #~ " Specify the maximum time (in seconds) that is allowed between\n" | |||
|
17265 | #~ " commits with identical user and log message in a single\n" | |||
|
17266 | #~ " changeset. When very large files were checked in as part of a\n" | |||
|
17267 | #~ " changeset then the default may not be long enough.\n" | |||
|
17268 | #~ " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" | |||
|
17269 | #~ " Specify a regular expression to which commit log messages are\n" | |||
|
17270 | #~ " matched. If a match occurs, then the conversion process will\n" | |||
|
17271 | #~ " insert a dummy revision merging the branch on which this log\n" | |||
|
17272 | #~ " message occurs to the branch indicated in the regex.\n" | |||
|
17273 | #~ " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" | |||
|
17274 | #~ " Specify a regular expression to which commit log messages are\n" | |||
|
17275 | #~ " matched. If a match occurs, then the conversion process will\n" | |||
|
17276 | #~ " add the most recent revision on the branch indicated in the\n" | |||
|
17277 | #~ " regex as the second parent of the changeset.\n" | |||
|
17278 | #~ " --config hook.cvslog\n" | |||
|
17279 | #~ " Specify a Python function to be called at the end of gathering\n" | |||
|
17280 | #~ " the CVS log. The function is passed a list with the log entries,\n" | |||
|
17281 | #~ " and can modify the entries in-place, or add or delete them.\n" | |||
|
17282 | #~ " --config hook.cvschangesets\n" | |||
|
17283 | #~ " Specify a Python function to be called after the changesets\n" | |||
|
17284 | #~ " are calculated from the the CVS log. The function is passed\n" | |||
|
17285 | #~ " a list with the changeset entries, and can modify the changesets\n" | |||
|
17286 | #~ " in-place, or add or delete them." | |||
|
17287 | #~ msgstr "" | |||
|
17288 | #~ " --config convert.cvsps.cache=True (boolescher Wert)\n" | |||
|
17289 | #~ " Kann für Tests oder zur Fehlersuche deaktiviert werden, um das\n" | |||
|
17290 | #~ " Zwischenspeichern des Quell-Logbuchs zu unterbinden.\n" | |||
|
17291 | #~ " --config convert.cvsps.fuzz=60 (Ganzzahl)\n" | |||
|
17292 | #~ " Spezifiziert die maximale Zeit (in Sekunden) die zwischen\n" | |||
|
17293 | #~ " einzelnen Änderungssätzen mit selbem Benutzer und Meldung " | |||
|
17294 | #~ "erlaubt\n" | |||
|
17295 | #~ " ist, damit sie in den gleichen Änderungssatz übernommen werden.\n" | |||
|
17296 | #~ " Wenn sehr große Dateien übernommen wurden, ist der Standardwert\n" | |||
|
17297 | #~ " vielleicht zu klein.\n" | |||
|
17298 | #~ " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" | |||
|
17299 | #~ " Spezifiziert einen Regulären Ausdruck, auf den Versionsmeldungen\n" | |||
|
17300 | #~ " geprüft werden. Wenn ein Treffer gefunden wird, wird eine\n" | |||
|
17301 | #~ " künstliche Revision als Zusammenführung des aktuellen mit dem\n" | |||
|
17302 | #~ " gefunden Zweig eingefügt.\n" | |||
|
17303 | #~ " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" | |||
|
17304 | #~ " Spezifiziert einen Regulären Ausdruck, auf den Versionsmeldungen\n" | |||
|
17305 | #~ " geprüft werden. Wenn ein Treffer gefunden wird, wird die\n" | |||
|
17306 | #~ " jüngste Revision des angegebenen Zweigs als zweiter Vorfahr der\n" | |||
|
17307 | #~ " aktuellen Revision angenommen.\n" | |||
|
17308 | #~ " --config hook.cvslog\n" | |||
|
17309 | #~ " Spezifiziert eine Python-Funktion, die nach dem Abrufen des\n" | |||
|
17310 | #~ " CVS-Logs ausgeführt wird. Der Funktion wird eine Liste von\n" | |||
|
17311 | #~ " Log-Einträgen übergeben, in der in-place Einträge bearbeitet, \n" | |||
|
17312 | #~ " ergänzt oder gelöscht werden können.\n" | |||
|
17313 | #~ " --config hook.cvschangesets\n" | |||
|
17314 | #~ " Spezifiziert eine Python-Funktion, die aufgerufen wird, nachdem\n" | |||
|
17315 | #~ " die Änderungssätze aus dem CVS-Log berechnet wurden. Der " | |||
|
17316 | #~ "Funktion\n" | |||
|
17317 | #~ " wird eine Liste von Änderungssätzen übergeben, in der in-place\n" | |||
|
17318 | #~ " Einträge bearbeitet, ergänzt oder gelöscht werden können." | |||
|
17319 | ||||
|
17320 | #~ msgid "" | |||
|
17321 | #~ " --config convert.svn.branches=branches (directory name)\n" | |||
|
17322 | #~ " specify the directory containing branches\n" | |||
|
17323 | #~ " --config convert.svn.tags=tags (directory name)\n" | |||
|
17324 | #~ " specify the directory containing tags\n" | |||
|
17325 | #~ " --config convert.svn.trunk=trunk (directory name)\n" | |||
|
17326 | #~ " specify the name of the trunk branch" | |||
|
17327 | #~ msgstr "" | |||
|
17328 | #~ " --config convert.svn.branches=branches (Verzeichnisname)\n" | |||
|
17329 | #~ " Spezifiziert das Verzeichnis für die Zweige\n" | |||
|
17330 | #~ " --config convert.svn.tags=tags (Verzeichnisname)\n" | |||
|
17331 | #~ " Spezifiziert das Verzeichnis für Tags\n" | |||
|
17332 | #~ " --config convert.svn.trunk=trunk (Verzeichnisname)\n" | |||
|
17333 | #~ " Spezifiziert den Namen des Hauptzweigs" | |||
|
17334 | ||||
|
17335 | #~ msgid "" | |||
|
17336 | #~ " --config convert.p4.startrev=0 (perforce changelist " | |||
|
17337 | #~ "number)\n" | |||
|
17338 | #~ " specify initial Perforce revision." | |||
|
17339 | #~ msgstr "" | |||
|
17340 | #~ " --config convert.p4.startrev=0 (Perforce Changelist-" | |||
|
17341 | #~ "Nummer)\n" | |||
|
17342 | #~ " Spezifiziert die Startrevision" | |||
|
17343 | ||||
|
17344 | #~ msgid "" | |||
|
17345 | #~ " --config convert.hg.clonebranches=False (boolean)\n" | |||
|
17346 | #~ " dispatch source branches in separate clones.\n" | |||
|
17347 | #~ " --config convert.hg.tagsbranch=default (branch name)\n" | |||
|
17348 | #~ " tag revisions branch name\n" | |||
|
17349 | #~ " --config convert.hg.usebranchnames=True (boolean)\n" | |||
|
17350 | #~ " preserve branch names" | |||
|
17351 | #~ msgstr "" | |||
|
17352 | #~ " --config convert.hg.clonebranches=False (boolescher Wert)\n" | |||
|
17353 | #~ " Lagert Quellzweige in separaten Klonen ab.\n" | |||
|
17354 | #~ " --config convert.hg.tagsbranch=default (Zweigname)\n" | |||
|
17355 | #~ " Name des Zweigs, der die Tags enthalten soll.\n" | |||
|
17356 | #~ " --config convert.hg.usebranchnames=True (boolescher Wert)\n" | |||
|
17357 | #~ " Erhält die Zweignamen" | |||
|
17358 | ||||
|
17359 | #~ msgid " " | |||
|
17360 | #~ msgstr " " | |||
|
17361 | ||||
|
17362 | #~ msgid "" | |||
|
17363 | #~ " Run before changing/disabling active keywords or if you experience\n" | |||
|
17364 | #~ " problems with :hg:`import` or :hg:`merge`." | |||
|
17365 | #~ msgstr "" | |||
|
17366 | #~ " Führen Sie dies aus, bevor Platzhalter geändert/deaktiviert werden\n" | |||
|
17367 | #~ " oder wenn Sie Probleme bei :hg:`import` oder :hg:`merge` haben." | |||
|
17368 | ||||
|
17369 | #~ msgid "queue directory updating\n" | |||
|
17370 | #~ msgstr "Aktualisiere Reihenverzeichnis\n" | |||
|
17371 | ||||
|
17372 | #~ msgid "" | |||
|
17373 | #~ " With no arguments, print the currently active guards.\n" | |||
|
17374 | #~ " With arguments, set guards for the named patch.\n" | |||
|
17375 | #~ " NOTE: Specifying negative guards now requires '--'." | |||
|
17376 | #~ msgstr "" | |||
|
17377 | #~ " Ohne Argumente werden die aktuell aktiven Wächter ausgegeben. Mit\n" | |||
|
17378 | #~ " Argumenten werden die Wächter für den angegebenen Patch gesetzt. " | |||
|
17379 | #~ "HINWEIS:\n" | |||
|
17380 | #~ " Die Angabe negativer Wächter erfordert jetzt '--'." | |||
|
17381 | ||||
|
17382 | #~ msgid "apply if the patch has rejects" | |||
|
17383 | #~ msgstr "Wendet Patch trotz Fehlerabschnitten an" | |||
|
17384 | ||||
|
17385 | #~ msgid "" | |||
|
17386 | #~ "When you are previewing the patchbomb messages, you can use ``formail``\n" | |||
|
17387 | #~ "(a utility that is commonly installed as part of the procmail\n" | |||
|
17388 | #~ "package), to send each message out::" | |||
|
17389 | #~ msgstr "" | |||
|
17390 | #~ "Mit ``formail`` (häufig durch das procmail-Paket installiert) können die\n" | |||
|
17391 | #~ "Nachrichten dann aus der mbox-Datei versendet werden::" | |||
|
17392 | ||||
|
17393 | #~ msgid "That should be all. Now your patchbomb is on its way out." | |||
|
17394 | #~ msgstr "" | |||
|
17395 | #~ "Das sollte es gewesen sein. Nun ist ihre Patchbombe in die Welt gesetzt." | |||
|
17396 | ||||
|
17397 | #, fuzzy | |||
|
17398 | #~ msgid "" | |||
|
17399 | #~ " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" | |||
|
17400 | #~ " the first line of the changeset description as the subject text.\n" | |||
|
17401 | #~ " The message contains two or three parts. First, the changeset\n" | |||
|
17402 | #~ " description. Next, (optionally) if the diffstat program is\n" | |||
|
17403 | #~ " installed and -d/--diffstat is used, the result of running\n" | |||
|
17404 | #~ " diffstat on the patch. Finally, the patch itself, as generated by\n" | |||
|
17405 | #~ " :hg:`export`." | |||
|
17406 | #~ msgstr "" | |||
|
17407 | #~ " Die Betreffzeile jeder Patch-Email ist \"[PATCH M of N]\", gefolgt " | |||
|
17408 | #~ "von\n" | |||
|
17409 | #~ " der ersten Zeile der Versionsmeldung. Im Körper folgen zwei oder " | |||
|
17410 | #~ "drei\n" | |||
|
17411 | #~ " drei Teilen: Eine Beschreibung des Änderungssatzes, dann optional\n" | |||
|
17412 | #~ " das Ergebnis von diffstat des Patches (wenn das Programm diffstat\n" | |||
|
17413 | #~ " installiert ist und der Schalter -d/--diffstat angegeben ist) und\n" | |||
|
17414 | #~ " schliesslich der Patch selber, wie durch \"hg export\" generiert." | |||
|
17415 | ||||
|
17416 | #, fuzzy | |||
|
17417 | #~ msgid " changesets" | |||
|
17418 | #~ msgstr "Füge Änderungssätze hinzu\n" | |||
|
17419 | ||||
|
17420 | #~ msgid " files" | |||
|
17421 | #~ msgstr " Dateien" | |||
|
17422 | ||||
|
17423 | #~ msgid "too many revisions specified" | |||
|
17424 | #~ msgstr "Zu viele Revisionen angegeben" | |||
|
17425 | ||||
|
17426 | #~ msgid "" | |||
|
17427 | #~ " Commit the backed out changes as a new changeset. The new\n" | |||
|
17428 | #~ " changeset is a child of the backed out changeset." | |||
|
17429 | #~ msgstr "" | |||
|
17430 | #~ " Bereits vollzogene Änderungen werden noch einmal rückwärts " | |||
|
17431 | #~ "angewendet\n" | |||
|
17432 | #~ " und als neuer Änderungssatz (als Kind des rückgängig gemachten) " | |||
|
17433 | #~ "übernommen." | |||
|
17434 | ||||
|
17435 | #~ msgid "" | |||
|
17436 | #~ " If you backout a changeset other than the tip, a new head is\n" | |||
|
17437 | #~ " created. This head will be the new tip and you should merge this\n" | |||
|
17438 | #~ " backout changeset with another head." | |||
|
17439 | #~ msgstr "" | |||
|
17440 | #~ " Soll ein anderer Änderungssatz als die Spitze (tip) zurückgezogen " | |||
|
17441 | #~ "werden,\n" | |||
|
17442 | #~ " so wird ein neuer Kopf erzeugt und dieser ist die neue Spitze." | |||
|
17443 | ||||
|
17444 | #~ msgid "" | |||
|
17445 | #~ " The --merge option remembers the parent of the working directory\n" | |||
|
17446 | #~ " before starting the backout, then merges the new head with that\n" | |||
|
17447 | #~ " changeset afterwards. This saves you from doing the merge by hand.\n" | |||
|
17448 | #~ " The result of this merge is not committed, as with a normal merge." | |||
|
17449 | #~ msgstr "" | |||
|
17450 | #~ " Die dadurch notwendige Zusammenführung kann durch die Option --merge\n" | |||
|
17451 | #~ " automatisch mit der Vorgängerversion des Arbeitsverzeichnisses " | |||
|
17452 | #~ "durchgeführt\n" | |||
|
17453 | #~ " werden. Das Resultat dieser Zusammenführung wird wie üblich nicht " | |||
|
17454 | #~ "sofort\n" | |||
|
17455 | #~ " übernommen, sondern existiert als lokale Änderung." | |||
|
17456 | ||||
|
17457 | #~ msgid "the backout changeset is a new head - do not forget to merge\n" | |||
|
17458 | #~ msgstr "Neuen Kopf erstellt - Zusammenführung nicht vergessen\n" | |||
|
17459 | ||||
|
17460 | #~ msgid "(use \"backout --merge\" if you want to auto-merge)\n" | |||
|
17461 | #~ msgstr "(nutze \"backout --merge\" für eine automatische Zusammenführung)\n" | |||
|
17462 | ||||
|
17463 | #, fuzzy | |||
|
17464 | #~ msgid "" | |||
|
17465 | #~ " If no changeset is specified, attempt to update to the tip of the\n" | |||
|
17466 | #~ " current branch. If this changeset is a descendant of the working\n" | |||
|
17467 | #~ " directory's parent, update to it, otherwise abort." | |||
|
17468 | #~ msgstr "" | |||
|
17469 | #~ " Wird keine Revision angegeben, wird zum Kopf des derzeitigen Zweigs\n" | |||
|
17470 | #~ " aktualisiert, falls dieser ein Nachfahr des direkten Vorgängers der\n" | |||
|
17471 | #~ " Arbeitskopie ist. Ansonsten bricht die Operation ab." | |||
|
17472 | ||||
|
17473 | #~ msgid "replace existing tag" | |||
|
17474 | #~ msgstr "Ersetzt bereits existierendes Tag" | |||
|
17475 | ||||
|
17476 | #~ msgid "check for uncommitted changes" | |||
|
17477 | #~ msgstr "prüft auf nicht versionierte Änderungen" | |||
|
17478 | ||||
|
17479 | #~ msgid "** report bug details to http://mercurial.selenic.com/bts/\n" | |||
|
17480 | #~ msgstr "** Problemdetails bitte bei http://www.selenic.com/mercurial/bts\n" | |||
|
17481 | ||||
|
17482 | #~ msgid "" | |||
|
17483 | #~ "``grep(regex)``\n" | |||
|
17484 | #~ " Like ``keyword(string)`` but accepts a regex." | |||
|
17485 | #~ msgstr "" | |||
|
17486 | #~ "``grep(regex)``\n" | |||
|
17487 | #~ " Wie ``keyword(zeichenkette)``, akzeptiert aber auch einen regulären\n" | |||
|
17488 | #~ " Ausdruck (regex)." | |||
|
17489 | ||||
|
17490 | #~ msgid "" | |||
|
17491 | #~ "``tagged()``\n" | |||
|
17492 | #~ " Changeset is tagged." | |||
|
17493 | #~ msgstr "" | |||
|
17494 | #~ "``tagged()``\n" | |||
|
17495 | #~ " Der Änderungssatz wurde mit einem Tag versehen." | |||
|
17496 | ||||
|
17497 | #~ msgid "" | |||
|
17498 | #~ " hg log -r 'branch(default)'\n" | |||
|
17499 | #~ " hg log -r 'branch(default) and 1.5:: and not merge()'\n" | |||
|
17500 | #~ " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" | |||
|
17501 | #~ " hg log -r 'sort(date(\"May 2008\"), user)'\n" | |||
|
17502 | #~ " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged" | |||
|
17503 | #~ "())'\n" | |||
|
17504 | #~ msgstr "" | |||
|
17505 | #~ " hg log -r 'branch(default)'\n" | |||
|
17506 | #~ " hg log -r 'branch(default) and 1.5:: and not merge()'\n" | |||
|
17507 | #~ " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" | |||
|
17508 | #~ " hg log -r 'sort(date(\"May 2008\"), user)'\n" | |||
|
17509 | #~ " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged" | |||
|
17510 | #~ "())'\n" | |||
|
17511 | ||||
|
17512 | #~ msgid "bundling changes" | |||
|
17513 | #~ msgstr "Bündle Änderungen" | |||
|
17514 | ||||
|
17515 | #~ msgid "bundling manifests" | |||
|
17516 | #~ msgstr "Bündle Manifeste" | |||
|
17517 | ||||
|
17518 | #~ msgid "warning: detected divergent renames of %s to:\n" | |||
|
17519 | #~ msgstr "Warnung: abweichende Umbenennungen von %s entdeckt:\n" | |||
|
17520 | ||||
|
17521 | #~ msgid "" | |||
|
17522 | #~ "internal patcher failed\n" | |||
|
17523 | #~ "please report details to http://mercurial.selenic.com/bts/\n" | |||
|
17524 | #~ "or mercurial@selenic.com\n" | |||
|
17525 | #~ msgstr "" | |||
|
17526 | #~ "Fehlschlag des internen patch-Werkzeugs.\n" | |||
|
17527 | #~ "Bitte melden Sie diesen Fehler bei http://mercurial.selenic.com/bts/\n" | |||
|
17528 | #~ "oder mercurial@selenic.com\n" | |||
|
17529 | ||||
|
17530 | #~ msgid "limit wants a number" | |||
|
17531 | #~ msgstr "limit verlangt eine Zahl" | |||
|
17532 | ||||
|
17533 | #~ msgid "warning: %s in %s\n" | |||
|
17534 | #~ msgstr "Warnung: %s in %s\n" | |||
|
17535 | ||||
|
17536 | #~ msgid "error expanding '%s%%%s'" | |||
|
17537 | #~ msgstr "Fehler beim Auflösen von '%s%%%s'" | |||
|
17538 | ||||
|
17539 | #~ msgid "unknown filter '%s'" | |||
|
17540 | #~ msgstr "Unbekannter Filter '%s'" | |||
|
17541 | ||||
|
17542 | #~ msgid "server identity verification succeeded\n" | |||
|
17543 | #~ msgstr "Identität des Servers wurde erfolgreich verifiziert\n" | |||
|
17544 | ||||
|
17545 | #~ msgid "Hardlinks not supported" | |||
|
17546 | #~ msgstr "Hardlinks nicht unterstützt" | |||
|
17547 | ||||
|
17548 | #~ msgid "user name not available - set USERNAME environment variable" | |||
|
17549 | #~ msgstr "" | |||
|
17550 | #~ "Benutzername nicht verfügbar - bitte setze die USERNAME Umgebungsvariable" |
This diff has been collapsed as it changes many lines, (1823 lines changed) Show them Hide them | |||||
@@ -1,7 +1,7 b'' | |||||
1 | # Japanese translation for Mercurial |
|
1 | # Japanese translation for Mercurial | |
2 | # Mercurial 日本語翻訳 |
|
2 | # Mercurial 日本語翻訳 | |
3 | # |
|
3 | # | |
4 |
# Copyright (C) 2009-201 |
|
4 | # Copyright (C) 2009-2011 the Mercurial team | |
5 | # |
|
5 | # | |
6 | # ======================================== |
|
6 | # ======================================== | |
7 | # 【翻訳用語集】 |
|
7 | # 【翻訳用語集】 | |
@@ -15,6 +15,7 b'' | |||||
15 | # XXXX failed XXXX が(or に)失敗 |
|
15 | # XXXX failed XXXX が(or に)失敗 | |
16 | # error XXXX-ing XXXX が(or に)失敗 |
|
16 | # error XXXX-ing XXXX が(or に)失敗 | |
17 | # error while XXXX XXXX が(or に)失敗 |
|
17 | # error while XXXX XXXX が(or に)失敗 | |
|
18 | # cannot XXXX XXXX が(or に)失敗 | |||
18 | # XXXX-ing YYYY YYYY を XXXX 中 ※ メッセージ冒頭から始まる場合 |
|
19 | # XXXX-ing YYYY YYYY を XXXX 中 ※ メッセージ冒頭から始まる場合 | |
19 | # YYYY を XXXX ※ 「以後の処理は YYYY を XXXX とする」 |
|
20 | # YYYY を XXXX ※ 「以後の処理は YYYY を XXXX とする」 | |
20 | # というニュアンスン場合 |
|
21 | # というニュアンスン場合 | |
@@ -48,6 +49,7 b'' | |||||
48 | # command(, this) (本)コマンド |
|
49 | # command(, this) (本)コマンド | |
49 | # commit コミット |
|
50 | # commit コミット | |
50 | # commit comment コミットログ |
|
51 | # commit comment コミットログ | |
|
52 | # copy(of file, repo) 複製 | |||
51 | # default(, by) 指定が無い場合/通常は |
|
53 | # default(, by) 指定が無い場合/通常は | |
52 | # delete/remove (構成管理からの)登録除外 |
|
54 | # delete/remove (構成管理からの)登録除外 | |
53 | # diff 差分 |
|
55 | # diff 差分 | |
@@ -75,6 +77,7 b'' | |||||
75 | # pull (追加リビジョンの)取り込み |
|
77 | # pull (追加リビジョンの)取り込み | |
76 | # push (追加リビジョンの)反映 |
|
78 | # push (追加リビジョンの)反映 | |
77 | # push(patch) (パッチの)適用 |
|
79 | # push(patch) (パッチの)適用 | |
|
80 | # raise(of exception) (例外の)発生 | |||
78 | # remote(repo) 連携先(リポジトリ) |
|
81 | # remote(repo) 連携先(リポジトリ) | |
79 | # rename 改名 |
|
82 | # rename 改名 | |
80 | # repo(sitory) リポジトリ/(.hg を指す場合は)管理領域 |
|
83 | # repo(sitory) リポジトリ/(.hg を指す場合は)管理領域 | |
@@ -86,6 +89,8 b'' | |||||
86 | # server サーバ |
|
89 | # server サーバ | |
87 | # subrepo 副リポジトリ |
|
90 | # subrepo 副リポジトリ | |
88 | # summary 要約(情報) |
|
91 | # summary 要約(情報) | |
|
92 | # support(, not) (未)サポート | |||
|
93 | # support(, un) (未)サポート | |||
89 | # tag タグ |
|
94 | # tag タグ | |
90 | # tracked xxxx 構成管理対象の xxxx |
|
95 | # tracked xxxx 構成管理対象の xxxx | |
91 | # xxxxx type xxxx 種別 |
|
96 | # xxxxx type xxxx 種別 | |
@@ -99,7 +104,7 b' msgid ""' | |||||
99 | msgstr "" |
|
104 | msgstr "" | |
100 | "Project-Id-Version: Mercurial\n" |
|
105 | "Project-Id-Version: Mercurial\n" | |
101 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
106 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" | |
102 |
"POT-Creation-Date: 201 |
|
107 | "POT-Creation-Date: 2011-02-24 11:19+0900\n" | |
103 | "PO-Revision-Date: 2009-11-16 21:24+0100\n" |
|
108 | "PO-Revision-Date: 2009-11-16 21:24+0100\n" | |
104 | "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" |
|
109 | "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" | |
105 | "Language-Team: Japanese\n" |
|
110 | "Language-Team: Japanese\n" | |
@@ -130,7 +135,7 b' msgstr ""' | |||||
130 | "外のエクステンションに関しては、 各コマンドのオンラインヘルプを参照してくださ" |
|
135 | "外のエクステンションに関しては、 各コマンドのオンラインヘルプを参照してくださ" | |
131 | "い。" |
|
136 | "い。" | |
132 |
|
137 | |||
133 |
msgid " |
|
138 | msgid "Options:" | |
134 | msgstr "オプション:" |
|
139 | msgstr "オプション:" | |
135 |
|
140 | |||
136 | #, python-format |
|
141 | #, python-format | |
@@ -146,7 +151,7 b' msgid ""' | |||||
146 | "via pretxnchangegroup and pretxncommit." |
|
151 | "via pretxnchangegroup and pretxncommit." | |
147 | msgstr "" |
|
152 | msgstr "" | |
148 | "アクセス制御用フックを使用することで、 pretxnchangegroup や pretxncommit\n" |
|
153 | "アクセス制御用フックを使用することで、 pretxnchangegroup や pretxncommit\n" | |
149 |
"契機で更新反映を受理した際に、 指定されたブランチやパスに対して、 |
|
154 | "契機で更新反映を受理した際に、 指定されたブランチやパスに対して、\n" | |
150 | "書き込みの可否を制御できます。" |
|
155 | "書き込みの可否を制御できます。" | |
151 |
|
156 | |||
152 | msgid "" |
|
157 | msgid "" | |
@@ -376,172 +381,6 b' msgstr ""' | |||||
376 | msgid "acl: access denied for changeset %s" |
|
381 | msgid "acl: access denied for changeset %s" | |
377 | msgstr "acl: チェンジセット %s のアクセスは拒否されました" |
|
382 | msgstr "acl: チェンジセット %s のアクセスは拒否されました" | |
378 |
|
383 | |||
379 | msgid "track a line of development with movable markers" |
|
|||
380 | msgstr "" |
|
|||
381 |
|
||||
382 | msgid "" |
|
|||
383 | "Bookmarks are local movable markers to changesets. Every bookmark\n" |
|
|||
384 | "points to a changeset identified by its hash. If you commit a\n" |
|
|||
385 | "changeset that is based on a changeset that has a bookmark on it, the\n" |
|
|||
386 | "bookmark shifts to the new changeset." |
|
|||
387 | msgstr "" |
|
|||
388 |
|
||||
389 | msgid "" |
|
|||
390 | "It is possible to use bookmark names in every revision lookup (e.g.\n" |
|
|||
391 | ":hg:`merge`, :hg:`update`)." |
|
|||
392 | msgstr "" |
|
|||
393 |
|
||||
394 | msgid "" |
|
|||
395 | "By default, when several bookmarks point to the same changeset, they\n" |
|
|||
396 | "will all move forward together. It is possible to obtain a more\n" |
|
|||
397 | "git-like experience by adding the following configuration option to\n" |
|
|||
398 | "your configuration file::" |
|
|||
399 | msgstr "" |
|
|||
400 |
|
||||
401 | msgid "" |
|
|||
402 | " [bookmarks]\n" |
|
|||
403 | " track.current = True" |
|
|||
404 | msgstr "" |
|
|||
405 |
|
||||
406 | msgid "" |
|
|||
407 | "This will cause Mercurial to track the bookmark that you are currently\n" |
|
|||
408 | "using, and only update it. This is similar to git's approach to\n" |
|
|||
409 | "branching.\n" |
|
|||
410 | msgstr "" |
|
|||
411 |
|
||||
412 | msgid "" |
|
|||
413 | " Bookmarks are pointers to certain commits that move when\n" |
|
|||
414 | " committing. Bookmarks are local. They can be renamed, copied and\n" |
|
|||
415 | " deleted. It is possible to use bookmark names in :hg:`merge` and\n" |
|
|||
416 | " :hg:`update` to merge and update respectively to a given bookmark." |
|
|||
417 | msgstr "" |
|
|||
418 |
|
||||
419 | msgid "" |
|
|||
420 | " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" |
|
|||
421 | " directory's parent revision with the given name. If you specify\n" |
|
|||
422 | " a revision using -r REV (where REV may be an existing bookmark),\n" |
|
|||
423 | " the bookmark is assigned to that revision." |
|
|||
424 | msgstr "" |
|
|||
425 |
|
||||
426 | msgid "" |
|
|||
427 | " Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" |
|
|||
428 | " push` and :hg:`help pull`). This requires the bookmark extension to be\n" |
|
|||
429 | " enabled for both the local and remote repositories.\n" |
|
|||
430 | " " |
|
|||
431 | msgstr "" |
|
|||
432 |
|
||||
433 | msgid "a bookmark of this name does not exist" |
|
|||
434 | msgstr "この名前のブックマークは存在しません" |
|
|||
435 |
|
||||
436 | msgid "a bookmark of the same name already exists" |
|
|||
437 | msgstr "同じ名前のブックマークがすでに存在します" |
|
|||
438 |
|
||||
439 | msgid "new bookmark name required" |
|
|||
440 | msgstr "新しいブックマーク名を要求しました" |
|
|||
441 |
|
||||
442 | msgid "bookmark name required" |
|
|||
443 | msgstr "ブックマーク名を要求しました" |
|
|||
444 |
|
||||
445 | msgid "bookmark name cannot contain newlines" |
|
|||
446 | msgstr "ブックマーク名に改行を含めません" |
|
|||
447 |
|
||||
448 | msgid "bookmark names cannot consist entirely of whitespace" |
|
|||
449 | msgstr "空白文字だけで構成されたタグ名は不正です" |
|
|||
450 |
|
||||
451 | msgid "a bookmark cannot have the name of an existing branch" |
|
|||
452 | msgstr "既存ブランチと同名のブックマークは作成できません" |
|
|||
453 |
|
||||
454 | msgid "no bookmarks set\n" |
|
|||
455 | msgstr "ブックマークは存在しません\n" |
|
|||
456 |
|
||||
457 | #, python-format |
|
|||
458 | msgid "updating bookmark %s\n" |
|
|||
459 | msgstr "ブックマーク %s の更新中\n" |
|
|||
460 |
|
||||
461 | #, python-format |
|
|||
462 | msgid "not updating divergent bookmark %s\n" |
|
|||
463 | msgstr "" |
|
|||
464 |
|
||||
465 | #, python-format |
|
|||
466 | msgid "updating bookmark %s failed!\n" |
|
|||
467 | msgstr "ブックマーク %s の更新に失敗!\n" |
|
|||
468 |
|
||||
469 | #, python-format |
|
|||
470 | msgid "remote bookmark %s not found!" |
|
|||
471 | msgstr "連携先にはブックマーク %s がありません!" |
|
|||
472 |
|
||||
473 | #, python-format |
|
|||
474 | msgid "importing bookmark %s\n" |
|
|||
475 | msgstr "ブックマーク %s の取り込み中\n" |
|
|||
476 |
|
||||
477 | #, python-format |
|
|||
478 | msgid "exporting bookmark %s\n" |
|
|||
479 | msgstr "ブックマーク %s の反映中\n" |
|
|||
480 |
|
||||
481 | #, python-format |
|
|||
482 | msgid "deleting remote bookmark %s\n" |
|
|||
483 | msgstr "連携先のブックマーク %s の削除中\n" |
|
|||
484 |
|
||||
485 | #, python-format |
|
|||
486 | msgid "bookmark %s does not exist on the local or remote repository!\n" |
|
|||
487 | msgstr "" |
|
|||
488 |
|
||||
489 | msgid "searching for changed bookmarks\n" |
|
|||
490 | msgstr "変更されたブックマークを探索中\n" |
|
|||
491 |
|
||||
492 | msgid "no changed bookmarks found\n" |
|
|||
493 | msgstr "変更されたブックマークはありません\n" |
|
|||
494 |
|
||||
495 | #, python-format |
|
|||
496 | msgid "comparing with %s\n" |
|
|||
497 | msgstr "%s と比較中\n" |
|
|||
498 |
|
||||
499 | msgid "bookmark to import" |
|
|||
500 | msgstr "ブックマークの取り込み" |
|
|||
501 |
|
||||
502 | msgid "BOOKMARK" |
|
|||
503 | msgstr "" |
|
|||
504 |
|
||||
505 | msgid "bookmark to export" |
|
|||
506 | msgstr "ブックマークの反映" |
|
|||
507 |
|
||||
508 | msgid "compare bookmark" |
|
|||
509 | msgstr "ブックマークの比較" |
|
|||
510 |
|
||||
511 | msgid "" |
|
|||
512 | "``bookmark([name])``\n" |
|
|||
513 | " The named bookmark or all bookmarks." |
|
|||
514 | msgstr "" |
|
|||
515 |
|
||||
516 | #. i18n: "bookmark" is a keyword |
|
|||
517 | msgid "bookmark takes one or no arguments" |
|
|||
518 | msgstr "bookmark 指定には1個ないし2個の引数が必要です" |
|
|||
519 |
|
||||
520 | #. i18n: "bookmark" is a keyword |
|
|||
521 | msgid "the argument to bookmark must be a string" |
|
|||
522 | msgstr "" |
|
|||
523 |
|
||||
524 | msgid "force" |
|
|||
525 | msgstr "強制実施" |
|
|||
526 |
|
||||
527 | msgid "REV" |
|
|||
528 | msgstr "リビジョン" |
|
|||
529 |
|
||||
530 | msgid "revision" |
|
|||
531 | msgstr "リビジョン" |
|
|||
532 |
|
||||
533 | msgid "delete a given bookmark" |
|
|||
534 | msgstr "指定ブックマークの削除" |
|
|||
535 |
|
||||
536 | msgid "NAME" |
|
|||
537 | msgstr "名前" |
|
|||
538 |
|
||||
539 | msgid "rename a given bookmark" |
|
|||
540 | msgstr "指定ブックマークの改名" |
|
|||
541 |
|
||||
542 | msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" |
|
|||
543 | msgstr "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" |
|
|||
544 |
|
||||
545 | msgid "hooks for integrating with the Bugzilla bug tracker" |
|
384 | msgid "hooks for integrating with the Bugzilla bug tracker" | |
546 | msgstr "" |
|
385 | msgstr "" | |
547 |
|
386 | |||
@@ -791,14 +630,14 b' msgstr "%s \xe3\x81\x8b %s \xe3\x81\xae buzilla \xe3\x83\xa6\xe3\x83\xbc\xe3\x82\xb6 ID \xe3\x82\x92\xe8\xa6\x8b\xe3\x81\xa4\xe3\x81\x91\xe3\x82\x8b\xe3\x81\x93\xe3\x81\xa8\xe3\x81\x8c\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
791 |
|
630 | |||
792 | #, python-format |
|
631 | #, python-format | |
793 | msgid "bugzilla version %s not supported" |
|
632 | msgid "bugzilla version %s not supported" | |
794 |
msgstr "bugzilla のバージョン %s |
|
633 | msgstr "bugzilla のバージョン %s は未サポートです" | |
795 |
|
634 | |||
796 | msgid "" |
|
635 | msgid "" | |
797 | "changeset {node|short} in repo {root} refers to bug {bug}.\n" |
|
636 | "changeset {node|short} in repo {root} refers to bug {bug}.\n" | |
798 | "details:\n" |
|
637 | "details:\n" | |
799 | "\t{desc|tabindent}" |
|
638 | "\t{desc|tabindent}" | |
800 | msgstr "" |
|
639 | msgstr "" | |
801 |
"リポジトリ {root} のリビジョン {node|short} がバグ {bug} に関連。 |
|
640 | "リポジトリ {root} のリビジョン {node|short} がバグ {bug} に関連。\n" | |
802 | "詳細:\n" |
|
641 | "詳細:\n" | |
803 | "\t{desc|tabindent}" |
|
642 | "\t{desc|tabindent}" | |
804 |
|
643 | |||
@@ -835,6 +674,9 b' msgstr ""' | |||||
835 | " します。\n" |
|
674 | " します。\n" | |
836 | " " |
|
675 | " " | |
837 |
|
676 | |||
|
677 | msgid "REV" | |||
|
678 | msgstr "リビジョン" | |||
|
679 | ||||
838 | msgid "show children of the specified revision" |
|
680 | msgid "show children of the specified revision" | |
839 | msgstr "指定リビジョンの子リビジョンの表示" |
|
681 | msgstr "指定リビジョンの子リビジョンの表示" | |
840 |
|
682 | |||
@@ -862,18 +704,18 b' msgid ""' | |||||
862 | " date instead." |
|
704 | " date instead." | |
863 | msgstr "" |
|
705 | msgstr "" | |
864 | " 本コマンドは、 変更行数ないしリビジョン数の度数分布を、 テンプレート\n" |
|
706 | " 本コマンドは、 変更行数ないしリビジョン数の度数分布を、 テンプレート\n" | |
865 |
" 指定によってグループ化してグラフ表示します。 |
|
707 | " 指定によってグループ化してグラフ表示します。\n" | |
866 |
" 特に指定の無い場合、 リビジョン作成者毎に変更行数をグループ化します。 |
|
708 | " 特に指定の無い場合、 リビジョン作成者毎に変更行数をグループ化します。\n" | |
867 |
" --dateformat が指定された場合、 度数分布は日時でグループ化されます。 |
|
709 | " --dateformat が指定された場合、 度数分布は日時でグループ化されます。" | |
868 |
|
710 | |||
869 | msgid "" |
|
711 | msgid "" | |
870 | " Statistics are based on the number of changed lines, or\n" |
|
712 | " Statistics are based on the number of changed lines, or\n" | |
871 | " alternatively the number of matching revisions if the\n" |
|
713 | " alternatively the number of matching revisions if the\n" | |
872 | " --changesets option is specified." |
|
714 | " --changesets option is specified." | |
873 | msgstr "" |
|
715 | msgstr "" | |
874 |
" 特に指定の無い場合、 度数分布の統計対象は変更行数となりますが、 |
|
716 | " 特に指定の無い場合、 度数分布の統計対象は変更行数となりますが、\n" | |
875 | " --changesets が指定された場合は、 対象リビジョンの数が統計対象と\n" |
|
717 | " --changesets が指定された場合は、 対象リビジョンの数が統計対象と\n" | |
876 |
" なります。 |
|
718 | " なります。" | |
877 |
|
719 | |||
878 | msgid " Examples::" |
|
720 | msgid " Examples::" | |
879 | msgstr " 例::" |
|
721 | msgstr " 例::" | |
@@ -1135,10 +977,10 b' msgid ""' | |||||
1135 | msgstr "" |
|
977 | msgstr "" | |
1136 |
|
978 | |||
1137 | msgid "" |
|
979 | msgid "" | |
1138 |
" If |
|
980 | " If ``REVMAP`` isn't given, it will be put in a default location\n" | |
1139 |
" (<dest>/.hg/shamap by default). The |
|
981 | " (``<dest>/.hg/shamap`` by default). The ``REVMAP`` is a simple\n" | |
1140 |
" that maps each source commit ID to the destination ID |
|
982 | " text file that maps each source commit ID to the destination ID\n" | |
1141 | " revision, like so::" |
|
983 | " for that revision, like so::" | |
1142 | msgstr "" |
|
984 | msgstr "" | |
1143 |
|
985 | |||
1144 | msgid " <source ID> <destination ID>" |
|
986 | msgid " <source ID> <destination ID>" | |
@@ -1244,15 +1086,25 b' msgid ""' | |||||
1244 | msgstr "" |
|
1086 | msgstr "" | |
1245 |
|
1087 | |||
1246 | msgid "" |
|
1088 | msgid "" | |
1247 | " --config convert.hg.ignoreerrors=False (boolean)\n" |
|
1089 | " The Mercurial source recognizes the following configuration\n" | |
1248 | " ignore integrity errors when reading. Use it to fix Mercurial\n" |
|
1090 | " options, which you can set on the command line with ``--config``:" | |
1249 | " repositories with missing revlogs, by converting from and to\n" |
|
1091 | msgstr "" | |
1250 | " Mercurial.\n" |
|
1092 | ||
1251 | " --config convert.hg.saverev=False (boolean)\n" |
|
1093 | msgid "" | |
1252 | " store original revision ID in changeset (forces target IDs to\n" |
|
1094 | " :convert.hg.ignoreerrors: ignore integrity errors when reading.\n" | |
1253 | " change)\n" |
|
1095 | " Use it to fix Mercurial repositories with missing revlogs, by\n" | |
1254 | " --config convert.hg.startrev=0 (hg revision identifier)\n" |
|
1096 | " converting from and to Mercurial. Default is False." | |
1255 | " convert start revision and its descendants" |
|
1097 | msgstr "" | |
|
1098 | ||||
|
1099 | msgid "" | |||
|
1100 | " :convert.hg.saverev: store original revision ID in changeset\n" | |||
|
1101 | " (forces target IDs to change). It takes and boolean argument\n" | |||
|
1102 | " and defaults to False." | |||
|
1103 | msgstr "" | |||
|
1104 | ||||
|
1105 | msgid "" | |||
|
1106 | " :convert.hg.startrev: convert start revision and its descendants.\n" | |||
|
1107 | " It takes a hg revision identifier and defaults to 0." | |||
1256 | msgstr "" |
|
1108 | msgstr "" | |
1257 |
|
1109 | |||
1258 | msgid "" |
|
1110 | msgid "" | |
@@ -1264,45 +1116,59 b' msgid ""' | |||||
1264 | " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" |
|
1116 | " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" | |
1265 | " to indicate the starting point of what will be converted. Direct\n" |
|
1117 | " to indicate the starting point of what will be converted. Direct\n" | |
1266 | " access to the repository files is not needed, unless of course the\n" |
|
1118 | " access to the repository files is not needed, unless of course the\n" | |
1267 |
" repository is :local:. The conversion uses the top level |
|
1119 | " repository is ``:local:``. The conversion uses the top level\n" | |
1268 |
" in the sandbox to find the CVS repository, and then uses |
|
1120 | " directory in the sandbox to find the CVS repository, and then uses\n" | |
1269 |
" commands to find files to convert. This means that unless |
|
1121 | " CVS rlog commands to find files to convert. This means that unless\n" | |
1270 | " filemap is given, all files under the starting directory will be\n" |
|
1122 | " a filemap is given, all files under the starting directory will be\n" | |
1271 | " converted, and that any directory reorganization in the CVS\n" |
|
1123 | " converted, and that any directory reorganization in the CVS\n" | |
1272 | " sandbox is ignored." |
|
1124 | " sandbox is ignored." | |
1273 | msgstr "" |
|
1125 | msgstr "" | |
1274 |
|
1126 | |||
1275 | msgid " The options shown are the defaults." |
|
1127 | msgid " The following options can be used with ``--config``:" | |
1276 | msgstr "" |
|
1128 | msgstr "" | |
1277 |
|
1129 | |||
1278 | msgid "" |
|
1130 | msgid "" | |
1279 | " --config convert.cvsps.cache=True (boolean)\n" |
|
1131 | " :convert.cvsps.cache: Set to False to disable remote log caching,\n" | |
1280 | " Set to False to disable remote log caching, for testing and\n" |
|
1132 | " for testing and debugging purposes. Default is True." | |
1281 | " debugging purposes.\n" |
|
1133 | msgstr "" | |
1282 | " --config convert.cvsps.fuzz=60 (integer)\n" |
|
1134 | ||
1283 | " Specify the maximum time (in seconds) that is allowed between\n" |
|
1135 | msgid "" | |
1284 | " commits with identical user and log message in a single\n" |
|
1136 | " :convert.cvsps.fuzz: Specify the maximum time (in seconds) that is\n" | |
1285 | " changeset. When very large files were checked in as part of a\n" |
|
1137 | " allowed between commits with identical user and log message in\n" | |
1286 | " changeset then the default may not be long enough.\n" |
|
1138 | " a single changeset. When very large files were checked in as\n" | |
1287 | " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" |
|
1139 | " part of a changeset then the default may not be long enough.\n" | |
1288 | " Specify a regular expression to which commit log messages are\n" |
|
1140 | " The default is 60." | |
1289 | " matched. If a match occurs, then the conversion process will\n" |
|
1141 | msgstr "" | |
1290 | " insert a dummy revision merging the branch on which this log\n" |
|
1142 | ||
1291 | " message occurs to the branch indicated in the regex.\n" |
|
1143 | msgid "" | |
1292 | " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" |
|
1144 | " :convert.cvsps.mergeto: Specify a regular expression to which\n" | |
1293 | " Specify a regular expression to which commit log messages are\n" |
|
1145 | " commit log messages are matched. If a match occurs, then the\n" | |
1294 | " matched. If a match occurs, then the conversion process will\n" |
|
1146 | " conversion process will insert a dummy revision merging the\n" | |
1295 | " add the most recent revision on the branch indicated in the\n" |
|
1147 | " branch on which this log message occurs to the branch\n" | |
1296 | " regex as the second parent of the changeset.\n" |
|
1148 | " indicated in the regex. Default is ``{{mergetobranch\n" | |
1297 | " --config hook.cvslog\n" |
|
1149 | " ([-\\w]+)}}``" | |
1298 | " Specify a Python function to be called at the end of gathering\n" |
|
1150 | msgstr "" | |
1299 | " the CVS log. The function is passed a list with the log entries,\n" |
|
1151 | ||
1300 | " and can modify the entries in-place, or add or delete them.\n" |
|
1152 | msgid "" | |
1301 | " --config hook.cvschangesets\n" |
|
1153 | " :convert.cvsps.mergefrom: Specify a regular expression to which\n" | |
1302 | " Specify a Python function to be called after the changesets\n" |
|
1154 | " commit log messages are matched. If a match occurs, then the\n" | |
1303 | " are calculated from the the CVS log. The function is passed\n" |
|
1155 | " conversion process will add the most recent revision on the\n" | |
1304 | " a list with the changeset entries, and can modify the changesets\n" |
|
1156 | " branch indicated in the regex as the second parent of the\n" | |
1305 | " in-place, or add or delete them." |
|
1157 | " changeset. Default is ``{{mergefrombranch ([-\\w]+)}}``" | |
|
1158 | msgstr "" | |||
|
1159 | ||||
|
1160 | msgid "" | |||
|
1161 | " :hook.cvslog: Specify a Python function to be called at the end of\n" | |||
|
1162 | " gathering the CVS log. The function is passed a list with the\n" | |||
|
1163 | " log entries, and can modify the entries in-place, or add or\n" | |||
|
1164 | " delete them." | |||
|
1165 | msgstr "" | |||
|
1166 | ||||
|
1167 | msgid "" | |||
|
1168 | " :hook.cvschangesets: Specify a Python function to be called after\n" | |||
|
1169 | " the changesets are calculated from the the CVS log. The\n" | |||
|
1170 | " function is passed a list with the changeset entries, and can\n" | |||
|
1171 | " modify the changesets in-place, or add or delete them." | |||
1306 | msgstr "" |
|
1172 | msgstr "" | |
1307 |
|
1173 | |||
1308 | msgid "" |
|
1174 | msgid "" | |
@@ -1319,24 +1185,33 b' msgstr ""' | |||||
1319 |
|
1185 | |||
1320 | msgid "" |
|
1186 | msgid "" | |
1321 | " Subversion source detects classical trunk/branches/tags layouts.\n" |
|
1187 | " Subversion source detects classical trunk/branches/tags layouts.\n" | |
1322 |
" By default, the supplied |
|
1188 | " By default, the supplied ``svn://repo/path/`` source URL is\n" | |
1323 |
" converted as a single branch. If |
|
1189 | " converted as a single branch. If ``svn://repo/path/trunk`` exists\n" | |
1324 |
" replaces the default branch. If |
|
1190 | " it replaces the default branch. If ``svn://repo/path/branches``\n" | |
1325 | " its subdirectories are listed as possible branches. If\n" |
|
1191 | " exists, its subdirectories are listed as possible branches. If\n" | |
1326 |
" |
|
1192 | " ``svn://repo/path/tags`` exists, it is looked for tags referencing\n" | |
1327 |
" converted branches. Default |
|
1193 | " converted branches. Default ``trunk``, ``branches`` and ``tags``\n" | |
1328 | " can be overridden with following options. Set them to paths\n" |
|
1194 | " values can be overridden with following options. Set them to paths\n" | |
1329 | " relative to the source URL, or leave them blank to disable auto\n" |
|
1195 | " relative to the source URL, or leave them blank to disable auto\n" | |
1330 | " detection." |
|
1196 | " detection." | |
1331 | msgstr "" |
|
1197 | msgstr "" | |
1332 |
|
1198 | |||
1333 | msgid "" |
|
1199 | msgid " The following options can be set with ``--config``:" | |
1334 | " --config convert.svn.branches=branches (directory name)\n" |
|
1200 | msgstr "" | |
1335 | " specify the directory containing branches\n" |
|
1201 | ||
1336 | " --config convert.svn.tags=tags (directory name)\n" |
|
1202 | msgid "" | |
1337 |
" |
|
1203 | " :convert.svn.branches: specify the directory containing branches.\n" | |
1338 | " --config convert.svn.trunk=trunk (directory name)\n" |
|
1204 | " The defaults is ``branches``." | |
1339 | " specify the name of the trunk branch" |
|
1205 | msgstr "" | |
|
1206 | ||||
|
1207 | msgid "" | |||
|
1208 | " :convert.svn.tags: specify the directory containing tags. The\n" | |||
|
1209 | " default is ``tags``." | |||
|
1210 | msgstr "" | |||
|
1211 | ||||
|
1212 | msgid "" | |||
|
1213 | " :convert.svn.trunk: specify the name of the trunk branch The\n" | |||
|
1214 | " defauls is ``trunk``." | |||
1340 | msgstr "" |
|
1215 | msgstr "" | |
1341 |
|
1216 | |||
1342 | msgid "" |
|
1217 | msgid "" | |
@@ -1346,8 +1221,8 b' msgid ""' | |||||
1346 | msgstr "" |
|
1221 | msgstr "" | |
1347 |
|
1222 | |||
1348 | msgid "" |
|
1223 | msgid "" | |
1349 |
" |
|
1224 | " :convert.svn.startrev: specify start Subversion revision number.\n" | |
1350 | " specify start Subversion revision." |
|
1225 | " The default is 0." | |
1351 | msgstr "" |
|
1226 | msgstr "" | |
1352 |
|
1227 | |||
1353 | msgid "" |
|
1228 | msgid "" | |
@@ -1361,17 +1236,17 b' msgid ""' | |||||
1361 | " source to a flat Mercurial repository, ignoring labels, branches\n" |
|
1236 | " source to a flat Mercurial repository, ignoring labels, branches\n" | |
1362 | " and integrations. Note that when a depot path is given you then\n" |
|
1237 | " and integrations. Note that when a depot path is given you then\n" | |
1363 | " usually should specify a target directory, because otherwise the\n" |
|
1238 | " usually should specify a target directory, because otherwise the\n" | |
1364 | " target may be named ...-hg." |
|
1239 | " target may be named ``...-hg``." | |
1365 | msgstr "" |
|
1240 | msgstr "" | |
1366 |
|
1241 | |||
1367 | msgid "" |
|
1242 | msgid "" | |
1368 | " It is possible to limit the amount of source history to be\n" |
|
1243 | " It is possible to limit the amount of source history to be\n" | |
1369 |
" converted by specifying an initial Perforce revision |
|
1244 | " converted by specifying an initial Perforce revision:" | |
1370 | msgstr "" |
|
1245 | msgstr "" | |
1371 |
|
1246 | |||
1372 | msgid "" |
|
1247 | msgid "" | |
1373 | " --config convert.p4.startrev=0 (perforce changelist number)\n" |
|
1248 | " :convert.p4.startrev: specify initial Perforce revision (a\n" | |
1374 | " specify initial Perforce revision." |
|
1249 | " Perforce changelist number)." | |
1375 | msgstr "" |
|
1250 | msgstr "" | |
1376 |
|
1251 | |||
1377 | msgid "" |
|
1252 | msgid "" | |
@@ -1379,16 +1254,23 b' msgid ""' | |||||
1379 | " '''''''''''''''''''''" |
|
1254 | " '''''''''''''''''''''" | |
1380 | msgstr "" |
|
1255 | msgstr "" | |
1381 |
|
1256 | |||
1382 | msgid "" |
|
1257 | msgid " The following options are supported:" | |
1383 | " --config convert.hg.clonebranches=False (boolean)\n" |
|
1258 | msgstr "" | |
1384 | " dispatch source branches in separate clones.\n" |
|
1259 | ||
1385 | " --config convert.hg.tagsbranch=default (branch name)\n" |
|
1260 | msgid "" | |
1386 | " tag revisions branch name\n" |
|
1261 | " :convert.hg.clonebranches: dispatch source branches in separate\n" | |
1387 | " --config convert.hg.usebranchnames=True (boolean)\n" |
|
1262 | " clones. The default is False." | |
1388 | " preserve branch names" |
|
1263 | msgstr "" | |
1389 | msgstr "" |
|
1264 | ||
1390 |
|
1265 | msgid "" | ||
1391 | msgid " " |
|
1266 | " :convert.hg.tagsbranch: branch name for tag revisions, defaults to\n" | |
|
1267 | " ``default``." | |||
|
1268 | msgstr "" | |||
|
1269 | ||||
|
1270 | msgid "" | |||
|
1271 | " :convert.hg.usebranchnames: preserve branch names. The default is\n" | |||
|
1272 | " True.\n" | |||
|
1273 | " " | |||
1392 | msgstr "" |
|
1274 | msgstr "" | |
1393 |
|
1275 | |||
1394 | msgid "create changeset information from CVS" |
|
1276 | msgid "create changeset information from CVS" | |
@@ -1530,7 +1412,7 b' msgstr "%s: \xe5\xa4\x89\xe6\x8f\x9b\xe5\x85\x83\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe7\xa8\xae\xe5\x88\xa5\xe3\x81\x8c\xe4\xb8\x8d\xe6\xad\xa3\xe3\x81\xa7\xe3\x81\x99"' | |||||
1530 |
|
1412 | |||
1531 | #, python-format |
|
1413 | #, python-format | |
1532 | msgid "%s: missing or unsupported repository" |
|
1414 | msgid "%s: missing or unsupported repository" | |
1533 |
msgstr "%s: リポジトリが見つからないか、 サポート |
|
1415 | msgstr "%s: リポジトリが見つからないか、 未サポートな形式です" | |
1534 |
|
1416 | |||
1535 | #, python-format |
|
1417 | #, python-format | |
1536 | msgid "%s: invalid destination repository type" |
|
1418 | msgid "%s: invalid destination repository type" | |
@@ -1608,7 +1490,7 b' msgid "more than one sort mode specified' | |||||
1608 | msgstr "整列オプションの指定が過剰です" |
|
1490 | msgstr "整列オプションの指定が過剰です" | |
1609 |
|
1491 | |||
1610 | msgid "--sourcesort is not supported by this data source" |
|
1492 | msgid "--sourcesort is not supported by this data source" | |
1611 |
msgstr "指定の変換元 |
|
1493 | msgstr "指定の変換元は --sourcesort が未サポートです" | |
1612 |
|
1494 | |||
1613 | #, python-format |
|
1495 | #, python-format | |
1614 | msgid "%s does not look like a CVS checkout" |
|
1496 | msgid "%s does not look like a CVS checkout" | |
@@ -1952,20 +1834,22 b' msgid ""' | |||||
1952 | msgstr "" |
|
1834 | msgstr "" | |
1953 |
|
1835 | |||
1954 | msgid "" |
|
1836 | msgid "" | |
1955 |
"The ``[patterns]`` section specifies |
|
1837 | "The ``[patterns]`` section specifies how line endings should be\n" | |
1956 | "working directory. The format is specified by a file pattern. The\n" |
|
1838 | "converted between the working copy and the repository. The format is\n" | |
1957 | "first match is used, so put more specific patterns first. The\n" |
|
1839 | "specified by a file pattern. The first match is used, so put more\n" | |
1958 | "available line endings are ``LF``, ``CRLF``, and ``BIN``." |
|
1840 | "specific patterns first. The available line endings are ``LF``,\n" | |
|
1841 | "``CRLF``, and ``BIN``." | |||
1959 | msgstr "" |
|
1842 | msgstr "" | |
1960 |
|
1843 | |||
1961 | msgid "" |
|
1844 | msgid "" | |
1962 | "Files with the declared format of ``CRLF`` or ``LF`` are always\n" |
|
1845 | "Files with the declared format of ``CRLF`` or ``LF`` are always\n" | |
1963 | "checked out in that format and files declared to be binary (``BIN``)\n" |
|
1846 | "checked out and stored in the repository in that format and files\n" | |
1964 | "are left unchanged. Additionally, ``native`` is an alias for the\n" |
|
1847 | "declared to be binary (``BIN``) are left unchanged. Additionally,\n" | |
1965 | "platform's default line ending: ``LF`` on Unix (including Mac OS X)\n" |
|
1848 | "``native`` is an alias for checking out in the platform's default line\n" | |
1966 | "and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n" |
|
1849 | "ending: ``LF`` on Unix (including Mac OS X) and ``CRLF`` on\n" | |
1967 | "endings) is Mercurial's default behaviour; it is only needed if you\n" |
|
1850 | "Windows. Note that ``BIN`` (do nothing to line endings) is Mercurial's\n" | |
1968 | "need to override a later, more general pattern." |
|
1851 | "default behaviour; it is only needed if you need to override a later,\n" | |
|
1852 | "more general pattern." | |||
1969 | msgstr "" |
|
1853 | msgstr "" | |
1970 |
|
1854 | |||
1971 | msgid "" |
|
1855 | msgid "" | |
@@ -2000,6 +1884,12 b' msgstr ""' | |||||
2000 | " native = LF" |
|
1884 | " native = LF" | |
2001 |
|
1885 | |||
2002 | msgid "" |
|
1886 | msgid "" | |
|
1887 | ".. note::\n" | |||
|
1888 | " The rules will first apply when files are touched in the working\n" | |||
|
1889 | " copy, e.g. by updating to null and back to tip to touch all files." | |||
|
1890 | msgstr "" | |||
|
1891 | ||||
|
1892 | msgid "" | |||
2003 | "The extension uses an optional ``[eol]`` section in your hgrc file\n" |
|
1893 | "The extension uses an optional ``[eol]`` section in your hgrc file\n" | |
2004 | "(not the ``.hgeol`` file) for settings that control the overall\n" |
|
1894 | "(not the ``.hgeol`` file) for settings that control the overall\n" | |
2005 | "behavior. There are two settings:" |
|
1895 | "behavior. There are two settings:" | |
@@ -2021,6 +1911,20 b' msgid ""' | |||||
2021 | msgstr "" |
|
1911 | msgstr "" | |
2022 |
|
1912 | |||
2023 | msgid "" |
|
1913 | msgid "" | |
|
1914 | "The extension provides ``cleverencode:`` and ``cleverdecode:`` filters\n" | |||
|
1915 | "like the deprecated win32text extension does. This means that you can\n" | |||
|
1916 | "disable win32text and enable eol and your filters will still work. You\n" | |||
|
1917 | "only need to these filters until you have prepared a ``.hgeol`` file." | |||
|
1918 | msgstr "" | |||
|
1919 | ||||
|
1920 | msgid "" | |||
|
1921 | "The ``win32text.forbid*`` hooks provided by the win32text extension\n" | |||
|
1922 | "have been unified into a single hook named ``eol.hook``. The hook will\n" | |||
|
1923 | "lookup the expected line endings from the ``.hgeol`` file, which means\n" | |||
|
1924 | "you must migrate to a ``.hgeol`` file first before using the hook." | |||
|
1925 | msgstr "" | |||
|
1926 | ||||
|
1927 | msgid "" | |||
2024 | "See :hg:`help patterns` for more information about the glob patterns\n" |
|
1928 | "See :hg:`help patterns` for more information about the glob patterns\n" | |
2025 | "used.\n" |
|
1929 | "used.\n" | |
2026 | msgstr "パターン合致に関する詳細は :hg:`help patterns` を参照してください。\n" |
|
1930 | msgstr "パターン合致に関する詳細は :hg:`help patterns` を参照してください。\n" | |
@@ -2175,6 +2079,9 b' msgstr ""' | |||||
2175 | msgid "pass option to comparison program" |
|
2079 | msgid "pass option to comparison program" | |
2176 | msgstr "比較実行用プログラムへのオプション指定" |
|
2080 | msgstr "比較実行用プログラムへのオプション指定" | |
2177 |
|
2081 | |||
|
2082 | msgid "revision" | |||
|
2083 | msgstr "リビジョン" | |||
|
2084 | ||||
2178 | msgid "change made by revision" |
|
2085 | msgid "change made by revision" | |
2179 | msgstr "当該リビジョンにおける変更内容の表示" |
|
2086 | msgstr "当該リビジョンにおける変更内容の表示" | |
2180 |
|
2087 | |||
@@ -2409,8 +2316,7 b' msgstr "ASCII \xe6\x96\x87\xe5\xad\x97\xe3\x81\xab\xe3\x82\x88\xe3\x82\x8b\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x82\xb0\xe3\x83\xa9\xe3\x83\x95\xe8\xa1\xa8\xe7\xa4\xba\xe3\x82\x92\xe6\x8c\x81\xe3\x81\xa4\xe5\xb1\xa5\xe6\xad\xb4\xe8\xa1\xa8\xe7\xa4\xba"' | |||||
2409 | msgid "" |
|
2316 | msgid "" | |
2410 | " Print a revision history alongside a revision graph drawn with\n" |
|
2317 | " Print a revision history alongside a revision graph drawn with\n" | |
2411 | " ASCII characters." |
|
2318 | " ASCII characters." | |
2412 | msgstr "" |
|
2319 | msgstr " ASCII 文字によるリビジョングラフ表示を伴った変更履歴を表示します。" | |
2413 | " ASCII 文字によるリビジョングラフ表示を伴った変更履歴を表示します。" |
|
|||
2414 |
|
2320 | |||
2415 | msgid "" |
|
2321 | msgid "" | |
2416 | " Nodes printed as an @ character are parents of the working\n" |
|
2322 | " Nodes printed as an @ character are parents of the working\n" | |
@@ -2862,7 +2768,7 b' msgid ""' | |||||
2862 | "Keywords expand to the changeset data pertaining to the latest change\n" |
|
2768 | "Keywords expand to the changeset data pertaining to the latest change\n" | |
2863 | "relative to the working directory parent of each file." |
|
2769 | "relative to the working directory parent of each file." | |
2864 | msgstr "" |
|
2770 | msgstr "" | |
2865 |
"作業領域の各ファイルに対する直近の更新内容を使用して、 |
|
2771 | "作業領域の各ファイルに対する直近の更新内容を使用して、\n" | |
2866 | "キーワードの展開が行われます" |
|
2772 | "キーワードの展開が行われます" | |
2867 |
|
2773 | |||
2868 | msgid "" |
|
2774 | msgid "" | |
@@ -2901,7 +2807,7 b' msgid ""' | |||||
2901 | " lose speed in huge repositories." |
|
2807 | " lose speed in huge repositories." | |
2902 | msgstr "" |
|
2808 | msgstr "" | |
2903 | ".. note::\n" |
|
2809 | ".. note::\n" | |
2904 |
" ファイル名パターンが更に特殊になる場合、 |
|
2810 | " ファイル名パターンが更に特殊になる場合、\n" | |
2905 | " リポジトリサイズ次第では性能劣化が生じ得ます。" |
|
2811 | " リポジトリサイズ次第では性能劣化が生じ得ます。" | |
2906 |
|
2812 | |||
2907 | msgid "" |
|
2813 | msgid "" | |
@@ -2928,19 +2834,19 b' msgstr ""' | |||||
2928 | msgid "" |
|
2834 | msgid "" | |
2929 | "The default template mappings (view with :hg:`kwdemo -d`) can be\n" |
|
2835 | "The default template mappings (view with :hg:`kwdemo -d`) can be\n" | |
2930 | "replaced with customized keywords and templates. Again, run\n" |
|
2836 | "replaced with customized keywords and templates. Again, run\n" | |
2931 | ":hg:`kwdemo` to control the results of your config changes." |
|
2837 | ":hg:`kwdemo` to control the results of your configuration changes." | |
2932 | msgstr "" |
|
2838 | msgstr "" | |
2933 |
"無指定時のテンプレート設定(:hg:`kwdemo -d` で閲覧可能)は、 |
|
2839 | "無指定時のテンプレート設定 (:hg:`kwdemo -d` で閲覧可能) は、\n" | |
2934 | "及びテンプレートのカスタマイズで置き換えることが可能です。\n" |
|
2840 | "キーワード及びテンプレートのカスタマイズで、 置き換えることが可能です。\n" | |
2935 | "繰り返しますが設定変更の確認は :hg:`kwdemo` で行うことができます。" |
|
2841 | "繰り返しますが、 設定変更の確認は :hg:`kwdemo` で行うことができます。" | |
2936 |
|
2842 | |||
2937 | msgid "" |
|
2843 | msgid "" | |
2938 |
"Before changing/disabling active keywords, run :hg:`kwshrink` |
|
2844 | "Before changing/disabling active keywords, you must run :hg:`kwshrink`\n" | |
2939 |
"t |
|
2845 | "to avoid storing expanded keywords in the change history." | |
2940 | "history." |
|
2846 | msgstr "" | |
2941 | msgstr "" |
|
2847 | "展開済みキーワードの、 意図せぬ履歴への記録を防ぐために、\n" | |
2942 | "展開済みキーワードが意図せず履歴に記録されてしまうことを防ぐために、 \n" |
|
2848 | "キーワード展開の設定変更/無効化の前には、\n" | |
2943 |
" |
|
2849 | "必ず :hg:`kwshrink` を実行してください。" | |
2944 |
|
2850 | |||
2945 | msgid "" |
|
2851 | msgid "" | |
2946 | "To force expansion after enabling it, or a configuration change, run\n" |
|
2852 | "To force expansion after enabling it, or a configuration change, run\n" | |
@@ -2954,8 +2860,8 b' msgid ""' | |||||
2954 | "like CVS' $Log$, are not supported. A keyword template map \"Log =\n" |
|
2860 | "like CVS' $Log$, are not supported. A keyword template map \"Log =\n" | |
2955 | "{desc}\" expands to the first line of the changeset description.\n" |
|
2861 | "{desc}\" expands to the first line of the changeset description.\n" | |
2956 | msgstr "" |
|
2862 | msgstr "" | |
2957 |
"複数行に渡る展開や、 CVS の $Log$ のような増加する内容の展開は |
|
2863 | "複数行に渡る展開や、 CVS の $Log$ のような増加する内容の展開は\n" | |
2958 |
" |
|
2864 | "未サポートです。 キーワードテンプレート設定 \"Log = {desc}\" は、\n" | |
2959 | "コミットメッセージの最初の一行を埋め込みます。\n" |
|
2865 | "コミットメッセージの最初の一行を埋め込みます。\n" | |
2960 |
|
2866 | |||
2961 | #, python-format |
|
2867 | #, python-format | |
@@ -2979,7 +2885,7 b' msgid ""' | |||||
2979 | " Show current, custom, or default keyword template maps and their\n" |
|
2885 | " Show current, custom, or default keyword template maps and their\n" | |
2980 | " expansions." |
|
2886 | " expansions." | |
2981 | msgstr "" |
|
2887 | msgstr "" | |
2982 |
" 現時点、 固有ないしデフォルトのキーワードテンプレートマップ、 |
|
2888 | " 現時点、 固有ないしデフォルトのキーワードテンプレートマップ、\n" | |
2983 | " およびその展開例を表示します。" |
|
2889 | " およびその展開例を表示します。" | |
2984 |
|
2890 | |||
2985 | msgid "" |
|
2891 | msgid "" | |
@@ -3016,15 +2922,25 b' msgstr ""' | |||||
3016 | msgid "\textending current template maps\n" |
|
2922 | msgid "\textending current template maps\n" | |
3017 | msgstr "\t現行テンプレートマップの終了\n" |
|
2923 | msgstr "\t現行テンプレートマップの終了\n" | |
3018 |
|
2924 | |||
3019 |
msgid "\toverriding default |
|
2925 | msgid "\toverriding default svn keywordset\n" | |
3020 |
msgstr "\t |
|
2926 | msgstr "\tsvn のデフォルトキーワードを上書き\n" | |
|
2927 | ||||
|
2928 | msgid "\toverriding default cvs keywordset\n" | |||
|
2929 | msgstr "\tcvs のデフォルトキーワードを上書き\n" | |||
3021 |
|
2930 | |||
3022 | msgid "" |
|
2931 | msgid "" | |
3023 | "\n" |
|
2932 | "\n" | |
3024 |
"\tconfiguration using default keyword |
|
2933 | "\tconfiguration using default svn keywordset\n" | |
3025 | msgstr "" |
|
2934 | msgstr "" | |
3026 | "\n" |
|
2935 | "\n" | |
3027 |
"\t |
|
2936 | "\tsvn のデフォルトキーワード設定を使用\n" | |
|
2937 | ||||
|
2938 | msgid "" | |||
|
2939 | "\n" | |||
|
2940 | "\tconfiguration using default cvs keywordset\n" | |||
|
2941 | msgstr "" | |||
|
2942 | "\n" | |||
|
2943 | "\tcvs のデフォルトキーワード設定を使用\n" | |||
3028 |
|
2944 | |||
3029 | msgid "\tdisabling current template maps\n" |
|
2945 | msgid "\tdisabling current template maps\n" | |
3030 | msgstr "\t現行のテンプレートマップを無効化\n" |
|
2946 | msgstr "\t現行のテンプレートマップを無効化\n" | |
@@ -3114,12 +3030,10 b' msgstr ""' | |||||
3114 | msgid "revert expanded keywords in the working directory" |
|
3030 | msgid "revert expanded keywords in the working directory" | |
3115 | msgstr "作業領域中のキーワード展開の取り消し" |
|
3031 | msgstr "作業領域中のキーワード展開の取り消し" | |
3116 |
|
3032 | |||
3117 | msgid "" |
|
3033 | msgid " Must be run before changing/disabling active keywords." | |
3118 | " Run before changing/disabling active keywords or if you experience\n" |
|
3034 | msgstr "" | |
3119 | " problems with :hg:`import` or :hg:`merge`." |
|
3035 | " キーワード展開の設定変更/無効化の前に、\n" | |
3120 | msgstr "" |
|
3036 | " 必ず実施してください。" | |
3121 | " キーワード設定の変更前や、 :hg:`import` ないし :hg:`merge` で問題が\n" |
|
|||
3122 | " 発生した経験がある場合に実行してください。" |
|
|||
3123 |
|
3037 | |||
3124 | msgid "" |
|
3038 | msgid "" | |
3125 | " kwshrink refuses to run if given files contain local changes.\n" |
|
3039 | " kwshrink refuses to run if given files contain local changes.\n" | |
@@ -3227,7 +3141,7 b' msgstr ""' | |||||
3227 | "'keep' が指定された場合、 既存の qrefresh 対象となるパッチが git 形式\n" |
|
3141 | "'keep' が指定された場合、 既存の qrefresh 対象となるパッチが git 形式\n" | |
3228 | "パッチである間は、 MQ は [diff] セクションの設定に従います。\n" |
|
3142 | "パッチである間は、 MQ は [diff] セクションの設定に従います。\n" | |
3229 | "'yes' ないし 'no' が指定された場合、 MQ は [diff] セクションの設定を無視\n" |
|
3143 | "'yes' ないし 'no' が指定された場合、 MQ は [diff] セクションの設定を無視\n" | |
3230 |
"して、 git パッチないし通常パッチを生成します。 通常パッチを生成する場合、 |
|
3144 | "して、 git パッチないし通常パッチを生成します。 通常パッチを生成する場合、\n" | |
3231 | "情報が失われる可能性があります。" |
|
3145 | "情報が失われる可能性があります。" | |
3232 |
|
3146 | |||
3233 | msgid "" |
|
3147 | msgid "" | |
@@ -3369,6 +3283,10 b' msgstr "\xe9\x81\xa9\xe7\x94\xa8\xe4\xb8\xad\xe3\x81\xae\xe3\x83\x91\xe3\x83\x83\xe3\x83\x81\xe3\x81\xaf\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
3369 | msgid "working directory revision is not qtip" |
|
3283 | msgid "working directory revision is not qtip" | |
3370 | msgstr "作業領域の親リビジョンは qtip ではありません" |
|
3284 | msgstr "作業領域の親リビジョンは qtip ではありません" | |
3371 |
|
3285 | |||
|
3286 | #, python-format | |||
|
3287 | msgid "uncommitted changes in subrepository %s" | |||
|
3288 | msgstr "副リポジトリ %s に未コミット変更あり" | |||
|
3289 | ||||
3372 | msgid "local changes found, refresh first" |
|
3290 | msgid "local changes found, refresh first" | |
3373 | msgstr "作業領域の内容は変更されていますので qrefresh を実施してください" |
|
3291 | msgstr "作業領域の内容は変更されていますので qrefresh を実施してください" | |
3374 |
|
3292 | |||
@@ -3380,6 +3298,10 b' msgid "\\"%s\\" cannot be used as the name' | |||||
3380 | msgstr "\"%s\" はパッチ名として使用できません" |
|
3298 | msgstr "\"%s\" はパッチ名として使用できません" | |
3381 |
|
3299 | |||
3382 | #, python-format |
|
3300 | #, python-format | |
|
3301 | msgid "\"%s\" already exists as a directory" | |||
|
3302 | msgstr "\"%s\" はディレクトリとして既に存在します" | |||
|
3303 | ||||
|
3304 | #, python-format | |||
3383 | msgid "patch \"%s\" already exists" |
|
3305 | msgid "patch \"%s\" already exists" | |
3384 | msgstr "パッチ \"%s\" は既に存在します" |
|
3306 | msgstr "パッチ \"%s\" は既に存在します" | |
3385 |
|
3307 | |||
@@ -3387,6 +3309,10 b' msgid "cannot manage merge changesets"' | |||||
3387 | msgstr "マージリビジョンは MQ の管理対象にできません" |
|
3309 | msgstr "マージリビジョンは MQ の管理対象にできません" | |
3388 |
|
3310 | |||
3389 | #, python-format |
|
3311 | #, python-format | |
|
3312 | msgid "cannot write patch \"%s\": %s" | |||
|
3313 | msgstr "パッチ \"%s\" の書き出しに失敗: %s" | |||
|
3314 | ||||
|
3315 | #, python-format | |||
3390 | msgid "error unlinking %s\n" |
|
3316 | msgid "error unlinking %s\n" | |
3391 | msgstr "%s の unlink に失敗\n" |
|
3317 | msgstr "%s の unlink に失敗\n" | |
3392 |
|
3318 | |||
@@ -3405,14 +3331,14 b' msgid "no patches in series\\n"' | |||||
3405 | msgstr "既知のパッチはありません\n" |
|
3331 | msgstr "既知のパッチはありません\n" | |
3406 |
|
3332 | |||
3407 | #, python-format |
|
3333 | #, python-format | |
|
3334 | msgid "qpush: %s is already at the top\n" | |||
|
3335 | msgstr "qpush: パッチ %s は既に適用中の最上位パッチです\n" | |||
|
3336 | ||||
|
3337 | #, python-format | |||
3408 | msgid "cannot push to a previous patch: %s" |
|
3338 | msgid "cannot push to a previous patch: %s" | |
3409 | msgstr "適用中のパッチ %s の再適用はできません" |
|
3339 | msgstr "適用中のパッチ %s の再適用はできません" | |
3410 |
|
3340 | |||
3411 | #, python-format |
|
3341 | #, python-format | |
3412 | msgid "qpush: %s is already at the top\n" |
|
|||
3413 | msgstr "qpush: パッチ %s は既に適用中の最上位パッチです\n" |
|
|||
3414 |
|
||||
3415 | #, python-format |
|
|||
3416 | msgid "guarded by %r" |
|
3342 | msgid "guarded by %r" | |
3417 | msgstr "ガード %r が適用されました" |
|
3343 | msgstr "ガード %r が適用されました" | |
3418 |
|
3344 | |||
@@ -3429,6 +3355,16 b' msgstr "\xe5\x85\xa8\xe3\x81\xa6\xe3\x81\xae\xe3\x83\x91\xe3\x83\x83\xe3\x83\x81\xe3\x81\x8c\xe9\x81\xa9\xe7\x94\xa8\xe4\xb8\xad\xe3\x81\xa7\xe3\x81\x99\\n"' | |||||
3429 | msgid "patch series already fully applied\n" |
|
3355 | msgid "patch series already fully applied\n" | |
3430 | msgstr "全てのパッチが適用中です\n" |
|
3356 | msgstr "全てのパッチが適用中です\n" | |
3431 |
|
3357 | |||
|
3358 | msgid "cannot use --exact and --move together" | |||
|
3359 | msgstr "--exact と --move の併用はできません" | |||
|
3360 | ||||
|
3361 | msgid "cannot push --exact with applied patches" | |||
|
3362 | msgstr "パッチ適用中に、 --exact 付きでのパッチ適用はできません" | |||
|
3363 | ||||
|
3364 | #, python-format | |||
|
3365 | msgid "%s does not have a parent recorded" | |||
|
3366 | msgstr "%s には親リビジョン情報がありません" | |||
|
3367 | ||||
3432 | msgid "please specify the patch to move" |
|
3368 | msgid "please specify the patch to move" | |
3433 | msgstr "移動するパッチを指定してください" |
|
3369 | msgstr "移動するパッチを指定してください" | |
3434 |
|
3370 | |||
@@ -3808,7 +3744,7 b' msgid ""' | |||||
3808 | " empty and the commit message is '[mq]: PATCH'." |
|
3744 | " empty and the commit message is '[mq]: PATCH'." | |
3809 | msgstr "" |
|
3745 | msgstr "" | |
3810 | " -e/--edit, -m/--message ないし -l/--logfile は、 コミットメッセージと\n" |
|
3746 | " -e/--edit, -m/--message ないし -l/--logfile は、 コミットメッセージと\n" | |
3811 |
" 同様に、 パッチのヘッダに記録する情報を指定します。 指定が無い場合は、 |
|
3747 | " 同様に、 パッチのヘッダに記録する情報を指定します。 指定が無い場合は、\n" | |
3812 | " ヘッダは空のまま、 コミットメッセージが '[mq]: パッチ名' となります。" |
|
3748 | " ヘッダは空のまま、 コミットメッセージが '[mq]: パッチ名' となります。" | |
3813 |
|
3749 | |||
3814 | msgid "" |
|
3750 | msgid "" | |
@@ -3818,7 +3754,7 b' msgid ""' | |||||
3818 | " information." |
|
3754 | " information." | |
3819 | msgstr "" |
|
3755 | msgstr "" | |
3820 | " git 拡張差分形式を使用する場合は、 -g/--git を指定します。 改名/複製\n" |
|
3756 | " git 拡張差分形式を使用する場合は、 -g/--git を指定します。 改名/複製\n" | |
3821 |
" 情報や、 権限設定の情報保持にとっての git 差分形式の有用性に関しては、 |
|
3757 | " 情報や、 権限設定の情報保持にとっての git 差分形式の有用性に関しては、\n" | |
3822 | " 'help diffs' を参照してください。" |
|
3758 | " 'help diffs' を参照してください。" | |
3823 |
|
3759 | |||
3824 | msgid "" |
|
3760 | msgid "" | |
@@ -3855,7 +3791,7 b' msgid ""' | |||||
3855 | " your message in ``.hg/last-message.txt``." |
|
3791 | " your message in ``.hg/last-message.txt``." | |
3856 | msgstr "" |
|
3792 | msgstr "" | |
3857 | " -e/--edit が指定された場合、 メッセージ入力用のプログラムが\n" |
|
3793 | " -e/--edit が指定された場合、 メッセージ入力用のプログラムが\n" | |
3858 |
" 設定に従って起動されます。 処理が失敗した場合、 |
|
3794 | " 設定に従って起動されます。 処理が失敗した場合、\n" | |
3859 | " 入力したメッセージは ``.hg/last-message.txt`` に保存されます。" |
|
3795 | " 入力したメッセージは ``.hg/last-message.txt`` に保存されます。" | |
3860 |
|
3796 | |||
3861 | msgid "" |
|
3797 | msgid "" | |
@@ -3865,9 +3801,9 b' msgid ""' | |||||
3865 | " git diff format." |
|
3801 | " git diff format." | |
3866 | msgstr "" |
|
3802 | msgstr "" | |
3867 | " 複製/改名に関する履歴保存のために git 差分形式を使用(-g/--git 指定や\n" |
|
3803 | " 複製/改名に関する履歴保存のために git 差分形式を使用(-g/--git 指定や\n" | |
3868 |
" 設定ファイルでの [diff] git=1 記述)するのであれば、 |
|
3804 | " 設定ファイルでの [diff] git=1 記述)するのであれば、\n" | |
3869 |
" add/remove/copy/rename といった hg のコマンドによる履歴記録も、 |
|
3805 | " add/remove/copy/rename といった hg のコマンドによる履歴記録も、\n" | |
3870 |
" 通常と変わりなく機能します。 git 差分形式の詳細に関しては、 |
|
3806 | " 通常と変わりなく機能します。 git 差分形式の詳細に関しては、\n" | |
3871 | " 'help diffs' を参照してください。" |
|
3807 | " 'help diffs' を参照してください。" | |
3872 |
|
3808 | |||
3873 | msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" |
|
3809 | msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" | |
@@ -3907,18 +3843,20 b' msgid ""' | |||||
3907 | " deleted. With -k/--keep, the folded patch files will not be\n" |
|
3843 | " deleted. With -k/--keep, the folded patch files will not be\n" | |
3908 | " removed afterwards." |
|
3844 | " removed afterwards." | |
3909 | msgstr "" |
|
3845 | msgstr "" | |
3910 |
" 対象パッチは未適用でなければなりません。 |
|
3846 | " 対象パッチは未適用でなければなりません。\n" | |
3911 | " 順序で連続的に現行パッチに適用されます。 全ての適用が成功した場合は、 \n" |
|
3847 | " それぞれのパッチは、 指定された順序で、\n" | |
3912 | " 現行パッチが全てのパッチの累積として更新され、 統合されたパッチは削除\n" |
|
3848 | " 連続的に現行パッチに適用されます。\n" | |
3913 | " されます。 -k/--keep が指定された場合は、 統合実施後も統合されtパッチ" |
|
3849 | " 全ての適用が成功した場合は、\n" | |
3914 | "の\n" |
|
3850 | " 現行パッチが全てのパッチの累積として更新され、\n" | |
3915 |
" |
|
3851 | " 統合されたパッチは削除されます。\n" | |
|
3852 | " -k/--keep が指定された場合、\n" | |||
|
3853 | " 統合されたパッチのファイルは、 統合実施後も残ります。" | |||
3916 |
|
3854 | |||
3917 | msgid "" |
|
3855 | msgid "" | |
3918 | " The header for each folded patch will be concatenated with the\n" |
|
3856 | " The header for each folded patch will be concatenated with the\n" | |
3919 | " current patch header, separated by a line of ``* * *``." |
|
3857 | " current patch header, separated by a line of ``* * *``." | |
3920 | msgstr "" |
|
3858 | msgstr "" | |
3921 |
" 統合対象パッチのヘッダ情報は、 ``* * *`` 行を区切り記号として、 |
|
3859 | " 統合対象パッチのヘッダ情報は、 ``* * *`` 行を区切り記号として、\n" | |
3922 | " 現行のパッチに追加されます。" |
|
3860 | " 現行のパッチに追加されます。" | |
3923 |
|
3861 | |||
3924 | msgid "qfold requires at least one patch name" |
|
3862 | msgid "qfold requires at least one patch name" | |
@@ -3953,7 +3891,7 b' msgstr ""' | |||||
3953 | " 「ガード」はパッチ適用の可否を制御します。 ガードが設定されていない\n" |
|
3891 | " 「ガード」はパッチ適用の可否を制御します。 ガードが設定されていない\n" | |
3954 | " パッチは常に適用されます。 「正」のガード(例: \"+foo\")が設定された\n" |
|
3892 | " パッチは常に適用されます。 「正」のガード(例: \"+foo\")が設定された\n" | |
3955 | " パッチは、 :hg:`qselect` によって当該ガードが設定されている場合に限り\n" |
|
3893 | " パッチは、 :hg:`qselect` によって当該ガードが設定されている場合に限り\n" | |
3956 |
" 適用されます。 「負」のガード(例: \"-foo\")が設定されているパッチは、 |
|
3894 | " 適用されます。 「負」のガード(例: \"-foo\")が設定されているパッチは、\n" | |
3957 | " :hg:`qselect` によって当該ガードが設定されている場合は適用されません。" |
|
3895 | " :hg:`qselect` によって当該ガードが設定されている場合は適用されません。" | |
3958 |
|
3896 | |||
3959 | msgid "" |
|
3897 | msgid "" | |
@@ -3996,7 +3934,7 b' msgid ""' | |||||
3996 | " When -f/--force is applied, all local changes in patched files\n" |
|
3934 | " When -f/--force is applied, all local changes in patched files\n" | |
3997 | " will be lost." |
|
3935 | " will be lost." | |
3998 | msgstr "" |
|
3936 | msgstr "" | |
3999 |
" -f/--force が指定された場合、 パッチ適用対象ファイルの、 |
|
3937 | " -f/--force が指定された場合、 パッチ適用対象ファイルの、\n" | |
4000 | " 作業領域における変更内容は破棄されます。" |
|
3938 | " 作業領域における変更内容は破棄されます。" | |
4001 |
|
3939 | |||
4002 | msgid "" |
|
3940 | msgid "" | |
@@ -4077,7 +4015,7 b' msgid ""' | |||||
4077 | " the operation is aborted unless the --force flag is supplied." |
|
4015 | " the operation is aborted unless the --force flag is supplied." | |
4078 | msgstr "" |
|
4016 | msgstr "" | |
4079 | " :hg:`strip` は指定のリビジョンおよび、 指定リビジョンの子孫を\n" |
|
4017 | " :hg:`strip` は指定のリビジョンおよび、 指定リビジョンの子孫を\n" | |
4080 |
" 取り除きます。 作業領域に未コミットの変更がある場合、 |
|
4018 | " 取り除きます。 作業領域に未コミットの変更がある場合、\n" | |
4081 | " --force が指定されない限りは処理を中断します。" |
|
4019 | " --force が指定されない限りは処理を中断します。" | |
4082 |
|
4020 | |||
4083 | msgid "" |
|
4021 | msgid "" | |
@@ -4086,7 +4024,7 b' msgid ""' | |||||
4086 | " available ancestor of the stripped parent after the operation\n" |
|
4024 | " available ancestor of the stripped parent after the operation\n" | |
4087 | " completes." |
|
4025 | " completes." | |
4088 | msgstr "" |
|
4026 | msgstr "" | |
4089 |
" 作業領域の親リビジョンが除外対象になった場合、 除外操作の完了後に、 |
|
4027 | " 作業領域の親リビジョンが除外対象になった場合、 除外操作の完了後に、\n" | |
4090 | " 除外された親リビジョンの先祖の中で最も近い有効なリビジョンを使用して\n" |
|
4028 | " 除外された親リビジョンの先祖の中で最も近い有効なリビジョンを使用して\n" | |
4091 | " 作業領域を更新します。" |
|
4029 | " 作業領域を更新します。" | |
4092 |
|
4030 | |||
@@ -4146,7 +4084,7 b' msgid ""' | |||||
4146 | " positive match)." |
|
4084 | " positive match)." | |
4147 | msgstr "" |
|
4085 | msgstr "" | |
4148 | " 上記の qselect 実行により、 \"stable\" ガードが選択されます。 MQ は\n" |
|
4086 | " 上記の qselect 実行により、 \"stable\" ガードが選択されます。 MQ は\n" | |
4149 |
" foo.patch の適用を(「負」のガードに合致するため)見送りますが、 |
|
4087 | " foo.patch の適用を(「負」のガードに合致するため)見送りますが、\n" | |
4150 | " bar.patch の適用は(「正」のガードに合致するため)実施します。" |
|
4088 | " bar.patch の適用は(「正」のガードに合致するため)実施します。" | |
4151 |
|
4089 | |||
4152 | msgid "" |
|
4090 | msgid "" | |
@@ -4174,9 +4112,9 b' msgid ""' | |||||
4174 | " guarded patches." |
|
4112 | " guarded patches." | |
4175 | msgstr "" |
|
4113 | msgstr "" | |
4176 | " 本コマンドの実行により、 適用中のパッチの適用可否も変化し得ます。 特に\n" |
|
4114 | " 本コマンドの実行により、 適用中のパッチの適用可否も変化し得ます。 特に\n" | |
4177 |
" 指定が無い場合、 ガードが有効なパッチの適用解除は行われません。 |
|
4115 | " 指定が無い場合、 ガードが有効なパッチの適用解除は行われません。\n" | |
4178 | " --pop が指定された場合、 適用可否が変わる最初のパッチまでのパッチが\n" |
|
4116 | " --pop が指定された場合、 適用可否が変わる最初のパッチまでのパッチが\n" | |
4179 |
" 適用解除されます。 --reapply が指定された場合、 --pop 相当の処理後に、 |
|
4117 | " 適用解除されます。 --reapply が指定された場合、 --pop 相当の処理後に、\n" | |
4180 | " ガードが有効なパッチの適用を見送りつつ、 現行パッチに至るまでパッチを\n" |
|
4118 | " ガードが有効なパッチの適用を見送りつつ、 現行パッチに至るまでパッチを\n" | |
4181 | " 再適用します。" |
|
4119 | " 再適用します。" | |
4182 |
|
4120 | |||
@@ -4224,7 +4162,7 b' msgid ""' | |||||
4224 | " patches) by moving them out of mq control into regular repository\n" |
|
4162 | " patches) by moving them out of mq control into regular repository\n" | |
4225 | " history." |
|
4163 | " history." | |
4226 | msgstr "" |
|
4164 | msgstr "" | |
4227 |
" 指定されたリビジョン(適用中パッチに相当)を、 MQ 管理下から除外し、 |
|
4165 | " 指定されたリビジョン(適用中パッチに相当)を、 MQ 管理下から除外し、\n" | |
4228 | " 通常のリビジョンとしてリポジトリに記録します。" |
|
4166 | " 通常のリビジョンとしてリポジトリに記録します。" | |
4229 |
|
4167 | |||
4230 | msgid "" |
|
4168 | msgid "" | |
@@ -4243,7 +4181,7 b' msgid ""' | |||||
4243 | " an upstream repository, or if you are about to push your changes\n" |
|
4181 | " an upstream repository, or if you are about to push your changes\n" | |
4244 | " to upstream." |
|
4182 | " to upstream." | |
4245 | msgstr "" |
|
4183 | msgstr "" | |
4246 |
" この機能は、 上流のリポジトリでパッチが受理された場合や、 |
|
4184 | " この機能は、 上流のリポジトリでパッチが受理された場合や、\n" | |
4247 | " パッチ内容を上流リポジトリに反映する場合などに有用です。" |
|
4185 | " パッチ内容を上流リポジトリに反映する場合などに有用です。" | |
4248 |
|
4186 | |||
4249 | msgid "no revisions specified" |
|
4187 | msgid "no revisions specified" | |
@@ -4279,7 +4217,7 b' msgid ""' | |||||
4279 | msgstr "" |
|
4217 | msgstr "" | |
4280 | " -c/--create が指定された場合、 新規キューを作成します。 当該時点で\n" |
|
4218 | " -c/--create が指定された場合、 新規キューを作成します。 当該時点で\n" | |
4281 | " アクティブなキューからパッチが適用中の場合を除き、 新規作成された\n" |
|
4219 | " アクティブなキューからパッチが適用中の場合を除き、 新規作成された\n" | |
4282 |
" キューが自動的にアクティブなキューとなります。 この場合、 |
|
4220 | " キューが自動的にアクティブなキューとなります。 この場合、\n" | |
4283 | " 新規キューは生成されますがキューの切り替えは実施されません。" |
|
4221 | " 新規キューは生成されますがキューの切り替えは実施されません。" | |
4284 |
|
4222 | |||
4285 | msgid "" |
|
4223 | msgid "" | |
@@ -4432,6 +4370,9 b' msgstr "hg qheader [PATCH]"' | |||||
4432 | msgid "import file in patch directory" |
|
4370 | msgid "import file in patch directory" | |
4433 | msgstr "パッチ管理領域中のファイルから取り込み" |
|
4371 | msgstr "パッチ管理領域中のファイルから取り込み" | |
4434 |
|
4372 | |||
|
4373 | msgid "NAME" | |||
|
4374 | msgstr "名前" | |||
|
4375 | ||||
4435 | msgid "name of patch file" |
|
4376 | msgid "name of patch file" | |
4436 | msgstr "パッチファイル名" |
|
4377 | msgstr "パッチファイル名" | |
4437 |
|
4378 | |||
@@ -4498,6 +4439,9 b' msgstr "hg qpop [-a] [-f] [PATCH | INDEX' | |||||
4498 | msgid "apply on top of local changes" |
|
4439 | msgid "apply on top of local changes" | |
4499 | msgstr "作業領域の変更をそのままでパッチを適用" |
|
4440 | msgstr "作業領域の変更をそのままでパッチを適用" | |
4500 |
|
4441 | |||
|
4442 | msgid "apply the target patch to its recorded parent" | |||
|
4443 | msgstr "パッチに記録された親リビジョンに対して適用" | |||
|
4444 | ||||
4501 | msgid "list patch name in commit text" |
|
4445 | msgid "list patch name in commit text" | |
4502 | msgstr "コミットメッセージとしてパッチ名を列挙" |
|
4446 | msgstr "コミットメッセージとしてパッチ名を列挙" | |
4503 |
|
4447 | |||
@@ -4517,7 +4461,7 b' msgid "hg qpush [-f] [-l] [-a] [--move] ' | |||||
4517 | msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" |
|
4461 | msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" | |
4518 |
|
4462 | |||
4519 | msgid "refresh only files already in the patch and specified files" |
|
4463 | msgid "refresh only files already in the patch and specified files" | |
4520 |
msgstr " |
|
4464 | msgstr "既存のパッチ対象に加え、明示されたファイルを処理対象にする" | |
4521 |
|
4465 | |||
4522 | msgid "add/update author field in patch with current user" |
|
4466 | msgid "add/update author field in patch with current user" | |
4523 | msgstr "パッチ作成者情報を現行ユーザに設定" |
|
4467 | msgstr "パッチ作成者情報を現行ユーザに設定" | |
@@ -4761,7 +4705,7 b' msgstr ""' | |||||
4761 |
|
4705 | |||
4762 | msgid "" |
|
4706 | msgid "" | |
4763 | " [pager]\n" |
|
4707 | " [pager]\n" | |
4764 |
" pager = |
|
4708 | " pager = less -FRSX" | |
4765 | msgstr "" |
|
4709 | msgstr "" | |
4766 |
|
4710 | |||
4767 | msgid "" |
|
4711 | msgid "" | |
@@ -4770,16 +4714,6 b' msgid ""' | |||||
4770 | msgstr "" |
|
4714 | msgstr "" | |
4771 |
|
4715 | |||
4772 | msgid "" |
|
4716 | msgid "" | |
4773 | "By default, the pager is only executed if a command has output. To\n" |
|
|||
4774 | "force the pager to run even if a command prints nothing, set::" |
|
|||
4775 | msgstr "" |
|
|||
4776 |
|
||||
4777 | msgid "" |
|
|||
4778 | " [pager]\n" |
|
|||
4779 | " force = True" |
|
|||
4780 | msgstr "" |
|
|||
4781 |
|
||||
4782 | msgid "" |
|
|||
4783 | "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" |
|
4717 | "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" | |
4784 | "setting::" |
|
4718 | "setting::" | |
4785 | msgstr "" |
|
4719 | msgstr "" | |
@@ -4891,7 +4825,7 b' msgid ""' | |||||
4891 | "mail and news readers, and in mail archives." |
|
4825 | "mail and news readers, and in mail archives." | |
4892 | msgstr "" |
|
4826 | msgstr "" | |
4893 | "個々のメールは、 In-Reply-To および References ヘッダを使用して、 1通目の\n" |
|
4827 | "個々のメールは、 In-Reply-To および References ヘッダを使用して、 1通目の\n" | |
4894 |
"メールを参照しますので、 メールリーダーやニュースリーダーでの参照時や、 |
|
4828 | "メールを参照しますので、 メールリーダーやニュースリーダーでの参照時や、\n" | |
4895 | "メールアーカイブにおいては、 一連のスレッドとして扱われます。" |
|
4829 | "メールアーカイブにおいては、 一連のスレッドとして扱われます。" | |
4896 |
|
4830 | |||
4897 | msgid "" |
|
4831 | msgid "" | |
@@ -4968,7 +4902,7 b' msgid ""' | |||||
4968 | " The message contains two or three parts. First, the changeset\n" |
|
4902 | " The message contains two or three parts. First, the changeset\n" | |
4969 | " description." |
|
4903 | " description." | |
4970 | msgstr "" |
|
4904 | msgstr "" | |
4971 |
" 個々のメールの Subject ヘッダは、 \"[PATCH M of N]\" で始まり、 |
|
4905 | " 個々のメールの Subject ヘッダは、 \"[PATCH M of N]\" で始まり、\n" | |
4972 | " 対応するリビジョンのコミットメッセージの1行目が記載されます。\n" |
|
4906 | " 対応するリビジョンのコミットメッセージの1行目が記載されます。\n" | |
4973 | " メール本文は、 2ないし3の部位から構成されます。\n" |
|
4907 | " メール本文は、 2ないし3の部位から構成されます。\n" | |
4974 | " 最初の部位にはコミットメッセージの続きが配置されます。" |
|
4908 | " 最初の部位にはコミットメッセージの続きが配置されます。" | |
@@ -4977,7 +4911,7 b' msgid ""' | |||||
4977 | " With the -d/--diffstat option, if the diffstat program is\n" |
|
4911 | " With the -d/--diffstat option, if the diffstat program is\n" | |
4978 | " installed, the result of running diffstat on the patch is inserted." |
|
4912 | " installed, the result of running diffstat on the patch is inserted." | |
4979 | msgstr "" |
|
4913 | msgstr "" | |
4980 |
" -d/--diffstat が指定され、 diffstat コマンドが利用可能な場合、 |
|
4914 | " -d/--diffstat が指定され、 diffstat コマンドが利用可能な場合、\n" | |
4981 | " パッチに対する diffstat の実行結果が配置されます。" |
|
4915 | " パッチに対する diffstat の実行結果が配置されます。" | |
4982 |
|
4916 | |||
4983 | msgid " Finally, the patch itself, as generated by :hg:`export`." |
|
4917 | msgid " Finally, the patch itself, as generated by :hg:`export`." | |
@@ -4988,8 +4922,8 b' msgid ""' | |||||
4988 | " with a final summary of all messages and asked for confirmation before\n" |
|
4922 | " with a final summary of all messages and asked for confirmation before\n" | |
4989 | " the messages are sent." |
|
4923 | " the messages are sent." | |
4990 | msgstr "" |
|
4924 | msgstr "" | |
4991 |
" -d/--diffstat ないし -c/--confirm が指定された場合、 |
|
4925 | " -d/--diffstat ないし -c/--confirm が指定された場合、\n" | |
4992 |
" メッセージの送信に先立って、 全メッセージのまとめを伴って、 |
|
4926 | " メッセージの送信に先立って、 全メッセージのまとめを伴って、\n" | |
4993 | " 確認の問い合わせがあります。" |
|
4927 | " 確認の問い合わせがあります。" | |
4994 |
|
4928 | |||
4995 | msgid "" |
|
4929 | msgid "" | |
@@ -5008,7 +4942,7 b' msgid ""' | |||||
5008 | " of the specified revisions if any are provided)" |
|
4942 | " of the specified revisions if any are provided)" | |
5009 | msgstr "" |
|
4943 | msgstr "" | |
5010 | " -o/--outgoing 指定がある場合、 連携対象リポジトリに存在しない\n" |
|
4944 | " -o/--outgoing 指定がある場合、 連携対象リポジトリに存在しない\n" | |
5011 |
" (あるいは、 指定リビジョンの |
|
4945 | " (あるいは、 指定リビジョン以前の)リビジョンのためのパッチのみが\n" | |
5012 | " メールで送信されます。" |
|
4946 | " メールで送信されます。" | |
5013 |
|
4947 | |||
5014 | msgid "" |
|
4948 | msgid "" | |
@@ -5027,7 +4961,7 b' msgid ""' | |||||
5027 | " previewed with any mail user agent which supports UNIX mbox\n" |
|
4961 | " previewed with any mail user agent which supports UNIX mbox\n" | |
5028 | " files." |
|
4962 | " files." | |
5029 | msgstr "" |
|
4963 | msgstr "" | |
5030 |
" -m/--mbox が指定された場合、 PAGER での表示やメール送信の代わりに、 |
|
4964 | " -m/--mbox が指定された場合、 PAGER での表示やメール送信の代わりに、\n" | |
5031 | " パッチのメールを格納した UNIX mbox 形式ファイルを作成します。\n" |
|
4965 | " パッチのメールを格納した UNIX mbox 形式ファイルを作成します。\n" | |
5032 | " このファイルは UNIX mbox 形式に対応しているツールで閲覧可能です。" |
|
4966 | " このファイルは UNIX mbox 形式に対応しているツールで閲覧可能です。" | |
5033 |
|
4967 | |||
@@ -5039,21 +4973,26 b' msgid ""' | |||||
5039 | " PAGER environment variable is set, your pager will be fired up once\n" |
|
4973 | " PAGER environment variable is set, your pager will be fired up once\n" | |
5040 | " for each patchbomb message, so you can verify everything is alright." |
|
4974 | " for each patchbomb message, so you can verify everything is alright." | |
5041 | msgstr "" |
|
4975 | msgstr "" | |
5042 |
" -n/--test 指定のある場合、 一連の処理手順は実行されますが、 |
|
4976 | " -n/--test 指定のある場合、 一連の処理手順は実行されますが、\n" | |
5043 |
" メールの送信は行われません。 その代わりに、 送信先アドレスや、 |
|
4977 | " メールの送信は行われません。 その代わりに、 送信先アドレスや、\n" | |
5044 |
" パッチ説明文の入力が促されます。 必要な入力が完了すると、 |
|
4978 | " パッチ説明文の入力が促されます。 必要な入力が完了すると、\n" | |
5045 | " 送信されるメールの内容が表示されます。\n" |
|
4979 | " 送信されるメールの内容が表示されます。\n" | |
5046 | " PAGER 環境変数が設定されている場合、 パッチ爆弾を構成する\n" |
|
4980 | " PAGER 環境変数が設定されている場合、 パッチ爆弾を構成する\n" | |
5047 |
" メールごとに、 環境変数に設定されたプログラムが起動されますので、 |
|
4981 | " メールごとに、 環境変数に設定されたプログラムが起動されますので、\n" | |
5048 | " 内容を確認することが出来ます。" |
|
4982 | " 内容を確認することが出来ます。" | |
5049 |
|
4983 | |||
5050 | msgid "" |
|
4984 | msgid "" | |
|
4985 | " In case email sending fails, you will find a backup of your series\n" | |||
|
4986 | " introductory message in ``.hg/last-email.txt``." | |||
|
4987 | msgstr "" | |||
|
4988 | ||||
|
4989 | msgid "" | |||
5051 | " hg email -r 3000 # send patch 3000 only\n" |
|
4990 | " hg email -r 3000 # send patch 3000 only\n" | |
5052 | " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" |
|
4991 | " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" | |
5053 | " hg email -r 3000:3005 # send patches 3000 through 3005\n" |
|
4992 | " hg email -r 3000:3005 # send patches 3000 through 3005\n" | |
5054 | " hg email 3000 # send patch 3000 (deprecated)" |
|
4993 | " hg email 3000 # send patch 3000 (deprecated)" | |
5055 | msgstr "" |
|
4994 | msgstr "" | |
5056 |
" hg email -r 3000 # リビジョン 3000 |
|
4995 | " hg email -r 3000 # リビジョン 3000\n" | |
5057 | " hg email -r 3000 -r 3001 # リビジョン 3000 および 3001\n" |
|
4996 | " hg email -r 3000 -r 3001 # リビジョン 3000 および 3001\n" | |
5058 | " hg email -r 3000:3005 # リビジョン 3000 から 3005 まで\n" |
|
4997 | " hg email -r 3000:3005 # リビジョン 3000 から 3005 まで\n" | |
5059 | " hg email 3000 # リビジョン 3000 (非推奨形式)" |
|
4998 | " hg email 3000 # リビジョン 3000 (非推奨形式)" | |
@@ -5066,8 +5005,8 b' msgid ""' | |||||
5066 | msgstr "" |
|
5005 | msgstr "" | |
5067 | " hg email -o # default に無いリビジョン\n" |
|
5006 | " hg email -o # default に無いリビジョン\n" | |
5068 | " hg email -o DEST # DEST に無いリビジョン\n" |
|
5007 | " hg email -o DEST # DEST に無いリビジョン\n" | |
5069 |
" hg email -o -r 3000 # default |
|
5008 | " hg email -o -r 3000 # 3000 以前で default 側に無いリビジョン\n" | |
5070 |
" hg email -o -r 3000 DEST # |
|
5009 | " hg email -o -r 3000 DEST # 3000 以前で DEST 側に無いリビジョン" | |
5071 |
|
5010 | |||
5072 | msgid "" |
|
5011 | msgid "" | |
5073 | " hg email -b # send bundle of all patches not in default\n" |
|
5012 | " hg email -b # send bundle of all patches not in default\n" | |
@@ -5076,10 +5015,11 b' msgid ""' | |||||
5076 | "default\n" |
|
5015 | "default\n" | |
5077 | " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" |
|
5016 | " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" | |
5078 | msgstr "" |
|
5017 | msgstr "" | |
5079 |
" |
|
5018 | " # ※ 以下、すべて bundle 形式\n" | |
5080 |
" hg email -b |
|
5019 | " hg email -b # default 側に無いリビジョン\n" | |
5081 |
" hg email -b |
|
5020 | " hg email -b DEST # DEST 側に無いリビジョン\n" | |
5082 |
" hg email -b -r 3000 |
|
5021 | " hg email -b -r 3000 # 3000 以前で default 側に無いリビジョン\n" | |
|
5022 | " hg email -b -r 3000 DEST # 3000 以前で DEST 側に無いリビジョン" | |||
5083 |
|
5023 | |||
5084 | msgid "" |
|
5024 | msgid "" | |
5085 | " hg email -o -m mbox && # generate an mbox file...\n" |
|
5025 | " hg email -o -m mbox && # generate an mbox file...\n" | |
@@ -5105,6 +5045,10 b' msgstr ""' | |||||
5105 | " ください。\n" |
|
5045 | " ください。\n" | |
5106 | " " |
|
5046 | " " | |
5107 |
|
5047 | |||
|
5048 | #, python-format | |||
|
5049 | msgid "comparing with %s\n" | |||
|
5050 | msgstr "%s と比較中\n" | |||
|
5051 | ||||
5108 | msgid "no changes found\n" |
|
5052 | msgid "no changes found\n" | |
5109 | msgstr "差分はありません\n" |
|
5053 | msgstr "差分はありません\n" | |
5110 |
|
5054 | |||
@@ -5139,7 +5083,7 b' msgstr ""' | |||||
5139 | "統計結果:" |
|
5083 | "統計結果:" | |
5140 |
|
5084 | |||
5141 | msgid "are you sure you want to send (yn)?" |
|
5085 | msgid "are you sure you want to send (yn)?" | |
5142 | msgstr "メールを送信しますか?(yn)" |
|
5086 | msgstr "メールを送信しますか? (y/n)" | |
5143 |
|
5087 | |||
5144 | msgid "&No" |
|
5088 | msgid "&No" | |
5145 | msgstr "&No" |
|
5089 | msgstr "&No" | |
@@ -5257,7 +5201,7 b' msgid ""' | |||||
5257 | " [progress]\n" |
|
5201 | " [progress]\n" | |
5258 | " delay = 3 # number of seconds (float) before showing the progress bar\n" |
|
5202 | " delay = 3 # number of seconds (float) before showing the progress bar\n" | |
5259 | " refresh = 0.1 # time in seconds between refreshes of the progress bar\n" |
|
5203 | " refresh = 0.1 # time in seconds between refreshes of the progress bar\n" | |
5260 | " format = topic bar number # format of the progress bar\n" |
|
5204 | " format = topic bar number estimate # format of the progress bar\n" | |
5261 | " width = <none> # if set, the maximum width of the progress information\n" |
|
5205 | " width = <none> # if set, the maximum width of the progress information\n" | |
5262 | " # (that is, min(width, term width) will be used)\n" |
|
5206 | " # (that is, min(width, term width) will be used)\n" | |
5263 | " clear-complete = True # clear the progress bar after it's done\n" |
|
5207 | " clear-complete = True # clear the progress bar after it's done\n" | |
@@ -5267,10 +5211,41 b' msgid ""' | |||||
5267 | msgstr "" |
|
5211 | msgstr "" | |
5268 |
|
5212 | |||
5269 | msgid "" |
|
5213 | msgid "" | |
5270 |
"Valid entries for the format field are topic, bar, number, unit, |
|
5214 | "Valid entries for the format field are topic, bar, number, unit,\n" | |
5271 |
"item. item defaults to the last 20 characters of the |
|
5215 | "estimate, and item. item defaults to the last 20 characters of the\n" | |
5272 |
"can be changed by adding either ``-<num>`` which would |
|
5216 | "item, but this can be changed by adding either ``-<num>`` which would\n" | |
5273 |
"num characters, or ``+<num>`` for the first num |
|
5217 | "take the last num characters, or ``+<num>`` for the first num\n" | |
|
5218 | "characters.\n" | |||
|
5219 | msgstr "" | |||
|
5220 | ||||
|
5221 | #. i18n: format XX seconds as "XXs" | |||
|
5222 | #, python-format | |||
|
5223 | msgid "%02ds" | |||
|
5224 | msgstr "" | |||
|
5225 | ||||
|
5226 | #. i18n: format X minutes and YY seconds as "XmYYs" | |||
|
5227 | #, python-format | |||
|
5228 | msgid "%dm%02ds" | |||
|
5229 | msgstr "" | |||
|
5230 | ||||
|
5231 | #. i18n: format X hours and YY minutes as "XhYYm" | |||
|
5232 | #, python-format | |||
|
5233 | msgid "%dh%02dm" | |||
|
5234 | msgstr "" | |||
|
5235 | ||||
|
5236 | #. i18n: format X days and YY hours as "XdYYh" | |||
|
5237 | #, python-format | |||
|
5238 | msgid "%dd%02dh" | |||
|
5239 | msgstr "" | |||
|
5240 | ||||
|
5241 | #. i18n: format X weeks and YY days as "XwYYd" | |||
|
5242 | #, python-format | |||
|
5243 | msgid "%dw%02dd" | |||
|
5244 | msgstr "" | |||
|
5245 | ||||
|
5246 | #. i18n: format X years and YY weeks as "XyYYw" | |||
|
5247 | #, python-format | |||
|
5248 | msgid "%dy%02dw" | |||
5274 | msgstr "" |
|
5249 | msgstr "" | |
5275 |
|
5250 | |||
5276 | msgid "command to delete untracked files from the working directory" |
|
5251 | msgid "command to delete untracked files from the working directory" | |
@@ -5385,7 +5360,7 b' msgid ""' | |||||
5385 | msgstr "" |
|
5360 | msgstr "" | |
5386 | " 他の利用者に公開済みのリビジョンは、 移動すべきではありません。\n" |
|
5361 | " 他の利用者に公開済みのリビジョンは、 移動すべきではありません。\n" | |
5387 | " 公開済みリビジョンの移動は、 他の利用者に同様の移動操作を強制する\n" |
|
5362 | " 公開済みリビジョンの移動は、 他の利用者に同様の移動操作を強制する\n" | |
5388 |
" ことになったり、 あなたが移動した後のリビジョンを取り込むことで、 |
|
5363 | " ことになったり、 あなたが移動した後のリビジョンを取り込むことで、\n" | |
5389 | " 同一リビジョンが重複した状態になってしまったりします。" |
|
5364 | " 同一リビジョンが重複した状態になってしまったりします。" | |
5390 |
|
5365 | |||
5391 | msgid "" |
|
5366 | msgid "" | |
@@ -5414,13 +5389,13 b' msgstr ""' | |||||
5414 | " 移動対象リビジョンは、 \"source\" 指定と \"base\" 指定の2つの方法で\n" |
|
5389 | " 移動対象リビジョンは、 \"source\" 指定と \"base\" 指定の2つの方法で\n" | |
5415 | " 指定可能です。 どちらも履歴ツリー上から「移動元ブランチ」リビジョンを\n" |
|
5390 | " 指定可能です。 どちらも履歴ツリー上から「移動元ブランチ」リビジョンを\n" | |
5416 | " 抽出するための簡略表現です。 \"source\" (``-s/--source``) を指定した\n" |
|
5391 | " 抽出するための簡略表現です。 \"source\" (``-s/--source``) を指定した\n" | |
5417 |
" 場合、 指定リビジョンおよびその子孫全てを移動します。 \"base\" |
|
5392 | " 場合、 指定リビジョンおよびその子孫全てを移動します。 \"base\"\n" | |
5418 | " (``-b/--base``) を指定した場合、 移動先リビジョンと共通となる先祖を\n" |
|
5393 | " (``-b/--base``) を指定した場合、 移動先リビジョンと共通となる先祖を\n" | |
5419 | " 含まない範囲で指定リビジョンの先祖へと遡り、 移動対象を選択します。\n" |
|
5394 | " 含まない範囲で指定リビジョンの先祖へと遡り、 移動対象を選択します。\n" | |
5420 | " そのため、 ``-s`` での指定と比較して、 ``-b`` での指定は精密さでは\n" |
|
5395 | " そのため、 ``-s`` での指定と比較して、 ``-b`` での指定は精密さでは\n" | |
5421 | " 劣りますが、 その分便利です。 移動元のブランチで任意のリビジョンを\n" |
|
5396 | " 劣りますが、 その分便利です。 移動元のブランチで任意のリビジョンを\n" | |
5422 | " 選択することで、 ブランチ全体から対象が自動的に選択されます。\n" |
|
5397 | " 選択することで、 ブランチ全体から対象が自動的に選択されます。\n" | |
5423 |
" ``-s`` も ``-b`` も指定しない場合、 作業領域の親リビジョンを |
|
5398 | " ``-s`` も ``-b`` も指定しない場合、 作業領域の親リビジョンを\n" | |
5424 | " \"base\" とみなします。" |
|
5399 | " \"base\" とみなします。" | |
5425 |
|
5400 | |||
5426 | msgid "" |
|
5401 | msgid "" | |
@@ -5430,7 +5405,7 b' msgid ""' | |||||
5430 | " changesets in the source branch (e.g. merges from the destination\n" |
|
5405 | " changesets in the source branch (e.g. merges from the destination\n" | |
5431 | " branch) may be dropped if they no longer contribute any change." |
|
5406 | " branch) may be dropped if they no longer contribute any change." | |
5432 | msgstr "" |
|
5407 | msgstr "" | |
5433 |
" 特に指定が無い場合、 本コマンドは移動元ブランチのリビジョンを、 |
|
5408 | " 特に指定が無い場合、 本コマンドは移動元ブランチのリビジョンを、\n" | |
5434 | " 移動先の子孫として再生成し、 その後に元リビジョンを破棄します。\n" |
|
5409 | " 移動先の子孫として再生成し、 その後に元リビジョンを破棄します。\n" | |
5435 | " 移動元リビジョンを残す場合、 ``--keep`` を指定してください。\n" |
|
5410 | " 移動元リビジョンを残す場合、 ``--keep`` を指定してください。\n" | |
5436 | " 移動元ブランチのリビジョンのうち、 何も貢献の無いリビジョン\n" |
|
5411 | " 移動元ブランチのリビジョンのうち、 何も貢献の無いリビジョン\n" | |
@@ -5492,8 +5467,8 b' msgstr "\xe3\x83\xaa\xe3\x83\x99\xe3\x83\xbc\xe3\x82\xb9\xe5\xae\x9f\xe6\x96\xbd\xe4\xb8\xad"' | |||||
5492 | msgid "changesets" |
|
5467 | msgid "changesets" | |
5493 | msgstr "チェンジセット" |
|
5468 | msgstr "チェンジセット" | |
5494 |
|
5469 | |||
5495 |
msgid " |
|
5470 | msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)" | |
5496 |
msgstr " |
|
5471 | msgstr "衝突が未解決です (:hg:`resolve` と :hg:`rebase --continue` 参照)" | |
5497 |
|
5472 | |||
5498 | #, python-format |
|
5473 | #, python-format | |
5499 | msgid "no changes, revision %d skipped\n" |
|
5474 | msgid "no changes, revision %d skipped\n" | |
@@ -5621,18 +5596,18 b' msgstr "\xe3\x83\xa6\xe3\x83\xbc\xe3\x82\xb6\xe3\x81\xae\xe6\x8c\x87\xe7\xa4\xba\xe3\x81\xab\xe3\x82\x88\xe3\x82\x8a\xe7\xb5\x82\xe4\xba\x86\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99"' | |||||
5621 |
|
5596 | |||
5622 | #, python-format |
|
5597 | #, python-format | |
5623 | msgid "examine changes to %s?" |
|
5598 | msgid "examine changes to %s?" | |
5624 |
msgstr "%s の変更点を調べますか |
|
5599 | msgstr "%s の変更点を調べますか?" | |
5625 |
|
5600 | |||
5626 | msgid " and " |
|
5601 | msgid " and " | |
5627 | msgstr " と " |
|
5602 | msgstr " と " | |
5628 |
|
5603 | |||
5629 | #, python-format |
|
5604 | #, python-format | |
5630 | msgid "record this change to %r?" |
|
5605 | msgid "record this change to %r?" | |
5631 |
msgstr "この変更を %r に記録しますか |
|
5606 | msgstr "この変更を %r に記録しますか?" | |
5632 |
|
5607 | |||
5633 | #, python-format |
|
5608 | #, python-format | |
5634 | msgid "record change %d/%d to %r?" |
|
5609 | msgid "record change %d/%d to %r?" | |
5635 |
msgstr "この変更 (%d 件目 / %d 件中) を %r に記録しますか |
|
5610 | msgstr "この変更 (%d 件目 / %d 件中) を %r に記録しますか?" | |
5636 |
|
5611 | |||
5637 | msgid "interactively select changes to commit" |
|
5612 | msgid "interactively select changes to commit" | |
5638 | msgstr "コミットする内容を対話的に選択します" |
|
5613 | msgstr "コミットする内容を対話的に選択します" | |
@@ -5688,8 +5663,8 b' msgstr "\'mq\' \xe3\x82\xa8\xe3\x82\xaf\xe3\x82\xb9\xe3\x83\x86\xe3\x83\xb3\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\x8c\xe8\xaa\xad\xe3\x81\xbf\xe8\xbe\xbc\xe3\x81\xbe\xe3\x82\x8c\xe3\x81\xa6\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
5688 | msgid "running non-interactively, use commit instead" |
|
5663 | msgid "running non-interactively, use commit instead" | |
5689 | msgstr "非対話的に実行する場合は commit を使用してください" |
|
5664 | msgstr "非対話的に実行する場合は commit を使用してください" | |
5690 |
|
5665 | |||
5691 | msgid "cannot partially commit a merge (use hg commit instead)" |
|
5666 | msgid "cannot partially commit a merge (use \"hg commit\" instead)" | |
5692 |
msgstr "マージの部分コミットはできません ( |
|
5667 | msgstr "マージの部分コミットはできません (\"hg commit\" を使用してください)" | |
5693 |
|
5668 | |||
5694 | msgid "no changes to record\n" |
|
5669 | msgid "no changes to record\n" | |
5695 | msgstr "記録可能な変更がありません\n" |
|
5670 | msgstr "記録可能な変更がありません\n" | |
@@ -5742,7 +5717,7 b' msgid ""' | |||||
5742 | msgstr "" |
|
5717 | msgstr "" | |
5743 |
|
5718 | |||
5744 | msgid "hardlinks are not supported on this system" |
|
5719 | msgid "hardlinks are not supported on this system" | |
5745 |
msgstr "このシステム上ではハードリンク |
|
5720 | msgstr "このシステム上ではハードリンクが未サポートです" | |
5746 |
|
5721 | |||
5747 | #, python-format |
|
5722 | #, python-format | |
5748 | msgid "relinking %s to %s\n" |
|
5723 | msgid "relinking %s to %s\n" | |
@@ -5950,7 +5925,7 b' msgstr ""' | |||||
5950 | "?: ヘルプの表示\n" |
|
5925 | "?: ヘルプの表示\n" | |
5951 |
|
5926 | |||
5952 | msgid "apply changeset? [ynmpcq?]:" |
|
5927 | msgid "apply changeset? [ynmpcq?]:" | |
5953 |
msgstr "チェンジセットを適用しますか |
|
5928 | msgstr "チェンジセットを適用しますか? [ynmpcq?]:" | |
5954 |
|
5929 | |||
5955 | msgid "no such option\n" |
|
5930 | msgid "no such option\n" | |
5956 | msgstr "そのようなオプションはありません\n" |
|
5931 | msgstr "そのようなオプションはありません\n" | |
@@ -5998,7 +5973,7 b' msgid ""' | |||||
5998 | " branch (up to the named revision) onto your current working\n" |
|
5973 | " branch (up to the named revision) onto your current working\n" | |
5999 | " directory." |
|
5974 | " directory." | |
6000 | msgstr "" |
|
5975 | msgstr "" | |
6001 |
" :hg:`transplant --branch REVISION --all` 形式での起動の場合、 |
|
5976 | " :hg:`transplant --branch REVISION --all` 形式での起動の場合、\n" | |
6002 | " 指定 REVISION までのブランチ全体が、 現在の作業領域上に移植されます。" |
|
5977 | " 指定 REVISION までのブランチ全体が、 現在の作業領域上に移植されます。" | |
6003 |
|
5978 | |||
6004 | msgid "" |
|
5979 | msgid "" | |
@@ -6128,15 +6103,19 b' msgstr ""' | |||||
6128 | msgid "Note that there are some limitations on using this extension:" |
|
6103 | msgid "Note that there are some limitations on using this extension:" | |
6129 | msgstr "このエクステンションの利用には幾つかの制限があります:" |
|
6104 | msgstr "このエクステンションの利用には幾つかの制限があります:" | |
6130 |
|
6105 | |||
6131 | msgid "- You should use single encoding in one repository." |
|
6106 | msgid "" | |
6132 | msgstr "- リポジトリ内では単一の文字コードを使用してください" |
|
6107 | "- You should use single encoding in one repository.\n" | |
6133 |
|
6108 | "- If the repository path ends with 0x5c, .hg/hgrc cannot be read.\n" | ||
6134 | msgid "" |
|
6109 | "- win32mbcs is not compatible with fixutf8 extension." | |
6135 | "\n" |
|
6110 | msgstr "" | |
|
6111 | "- リポジトリ内では単一の文字コードを使用してください\n" | |||
|
6112 | "- リポジトリパス末尾が 0x5c の場合、 .hg/hgrc が読み出せません\n" | |||
|
6113 | "- win32mbcs は fixutf8 エクステンションと互換性がありません" | |||
|
6114 | ||||
|
6115 | msgid "" | |||
6136 | "By default, win32mbcs uses encoding.encoding decided by Mercurial.\n" |
|
6116 | "By default, win32mbcs uses encoding.encoding decided by Mercurial.\n" | |
6137 | "You can specify the encoding by config option::" |
|
6117 | "You can specify the encoding by config option::" | |
6138 | msgstr "" |
|
6118 | msgstr "" | |
6139 | "\n" |
|
|||
6140 | "指定の無い場合、 win32mbcs は Mercurial により決定される\n" |
|
6119 | "指定の無い場合、 win32mbcs は Mercurial により決定される\n" | |
6141 | "(Python プログラム上の) encoding.encoding 変数値を使用します。\n" |
|
6120 | "(Python プログラム上の) encoding.encoding 変数値を使用します。\n" | |
6142 | "以下の設定記述により、 文字コードを指定することができます::" |
|
6121 | "以下の設定記述により、 文字コードを指定することができます::" | |
@@ -6294,7 +6273,7 b' msgid ""' | |||||
6294 | "win32text is deprecated: http://mercurial.selenic.com/wiki/" |
|
6273 | "win32text is deprecated: http://mercurial.selenic.com/wiki/" | |
6295 | "Win32TextExtension\n" |
|
6274 | "Win32TextExtension\n" | |
6296 | msgstr "" |
|
6275 | msgstr "" | |
6297 |
"win32text は推奨されていません: |
|
6276 | "win32text は推奨されていません: http://mercurial.selenic.com/wiki/" | |
6298 | "Win32TextExtension 参照\n" |
|
6277 | "Win32TextExtension 参照\n" | |
6299 |
|
6278 | |||
6300 | msgid "discover and advertise repositories on the local network" |
|
6279 | msgid "discover and advertise repositories on the local network" | |
@@ -6336,6 +6315,19 b' msgstr "\xe3\x82\xa2\xe3\x83\xbc\xe3\x82\xab\xe3\x82\xa4\xe3\x83\x96\xe3\x81\xab\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x82\x92\xe8\xbf\xbd\xe5\x8a\xa0\xe3\x81\x99\xe3\x82\x8b\xe3\x81\xa8\xe3\x81\x8d\xe3\x81\xaf\xe6\x8e\xa5\xe9\xa0\xad\xe8\xbe\x9e\xe3\x82\x92\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
6336 | msgid "unknown archive type '%s'" |
|
6315 | msgid "unknown archive type '%s'" | |
6337 | msgstr "未知のアーカイブ種別 '%s'" |
|
6316 | msgstr "未知のアーカイブ種別 '%s'" | |
6338 |
|
6317 | |||
|
6318 | msgid "archiving" | |||
|
6319 | msgstr "アーカイブ中" | |||
|
6320 | ||||
|
6321 | #, python-format | |||
|
6322 | msgid "bookmark '%s' contains illegal character" | |||
|
6323 | msgstr "ブックマーク '%s' は不正な文字を含んでいます" | |||
|
6324 | ||||
|
6325 | msgid "searching for changed bookmarks\n" | |||
|
6326 | msgstr "変更されたブックマークを探索中\n" | |||
|
6327 | ||||
|
6328 | msgid "no changed bookmarks found\n" | |||
|
6329 | msgstr "変更されたブックマークはありません\n" | |||
|
6330 | ||||
6339 | msgid "invalid changegroup" |
|
6331 | msgid "invalid changegroup" | |
6340 | msgstr "チェンジグループが不正です" |
|
6332 | msgstr "チェンジグループが不正です" | |
6341 |
|
6333 | |||
@@ -6350,8 +6342,12 b' msgid "cannot create new bundle reposito' | |||||
6350 | msgstr "バンドルリポジトリの新規作成はできません" |
|
6342 | msgstr "バンドルリポジトリの新規作成はできません" | |
6351 |
|
6343 | |||
6352 | #, python-format |
|
6344 | #, python-format | |
6353 |
msgid " |
|
6345 | msgid "stream ended unexpectedly (got %d bytes, expected %d)" | |
6354 |
msgstr "予期 |
|
6346 | msgstr "予期せぬデータ終端 (実データ:%d バイト 期待データ:%d バイト)" | |
|
6347 | ||||
|
6348 | #, python-format | |||
|
6349 | msgid "invalid chunk length %d" | |||
|
6350 | msgstr "不正なデータ長: %d" | |||
6355 |
|
6351 | |||
6356 | #, python-format |
|
6352 | #, python-format | |
6357 | msgid "%s: not a Mercurial bundle" |
|
6353 | msgid "%s: not a Mercurial bundle" | |
@@ -6402,6 +6398,10 b' msgid "recording removal of %s as rename' | |||||
6402 | msgstr "%s の削除を %s へのファイル名変更として記録中 (類似度 %d%%)\n" |
|
6398 | msgstr "%s の削除を %s へのファイル名変更として記録中 (類似度 %d%%)\n" | |
6403 |
|
6399 | |||
6404 | #, python-format |
|
6400 | #, python-format | |
|
6401 | msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" | |||
|
6402 | msgstr "%s は未コミットなので、 %s のコピーデータは残りません\n" | |||
|
6403 | ||||
|
6404 | #, python-format | |||
6405 | msgid "%s: not copying - file is not managed\n" |
|
6405 | msgid "%s: not copying - file is not managed\n" | |
6406 | msgstr "%s: コピー失敗 - ファイルは登録されていません\n" |
|
6406 | msgstr "%s: コピー失敗 - ファイルは登録されていません\n" | |
6407 |
|
6407 | |||
@@ -6441,10 +6441,6 b' msgstr "%s \xe3\x82\x92 %s \xe3\x81\xab\xe7\xa7\xbb\xe5\x8b\x95\xe4\xb8\xad\\n"' | |||||
6441 | msgid "copying %s to %s\n" |
|
6441 | msgid "copying %s to %s\n" | |
6442 | msgstr "%s を %s にコピー中\n" |
|
6442 | msgstr "%s を %s にコピー中\n" | |
6443 |
|
6443 | |||
6444 | #, python-format |
|
|||
6445 | msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" |
|
|||
6446 | msgstr "%s は未コミットなので、 %s のコピーデータは残りません\n" |
|
|||
6447 |
|
||||
6448 | msgid "no source or destination specified" |
|
6444 | msgid "no source or destination specified" | |
6449 | msgstr "作業元もしくは作業先を指定していません" |
|
6445 | msgstr "作業元もしくは作業先を指定していません" | |
6450 |
|
6446 | |||
@@ -6462,7 +6458,7 b' msgid "no files to copy"' | |||||
6462 | msgstr "コピーするファイルがありません" |
|
6458 | msgstr "コピーするファイルがありません" | |
6463 |
|
6459 | |||
6464 | msgid "(consider using --after)\n" |
|
6460 | msgid "(consider using --after)\n" | |
6465 |
msgstr "( |
|
6461 | msgstr "(--after を使ってみては?)\n" | |
6466 |
|
6462 | |||
6467 | msgid "child process failed to start" |
|
6463 | msgid "child process failed to start" | |
6468 | msgstr "子プロセスの生成に失敗" |
|
6464 | msgstr "子プロセスの生成に失敗" | |
@@ -6476,6 +6472,10 b' msgid "branch: %s\\n"' | |||||
6476 | msgstr "ブランチ: %s\n" |
|
6472 | msgstr "ブランチ: %s\n" | |
6477 |
|
6473 | |||
6478 | #, python-format |
|
6474 | #, python-format | |
|
6475 | msgid "bookmark: %s\n" | |||
|
6476 | msgstr "ブックマーク: %s\n" | |||
|
6477 | ||||
|
6478 | #, python-format | |||
6479 | msgid "tag: %s\n" |
|
6479 | msgid "tag: %s\n" | |
6480 | msgstr "タグ: %s\n" |
|
6480 | msgstr "タグ: %s\n" | |
6481 |
|
6481 | |||
@@ -6565,7 +6565,7 b' msgstr "HG: \xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81 \'%s\'"' | |||||
6565 |
|
6565 | |||
6566 | #, python-format |
|
6566 | #, python-format | |
6567 | msgid "HG: subrepo %s" |
|
6567 | msgid "HG: subrepo %s" | |
6568 |
msgstr "HG: |
|
6568 | msgstr "HG: 副リポジトリ %s" | |
6569 |
|
6569 | |||
6570 | #, python-format |
|
6570 | #, python-format | |
6571 | msgid "HG: added %s" |
|
6571 | msgid "HG: added %s" | |
@@ -6653,11 +6653,12 b' msgstr ""' | |||||
6653 |
|
6653 | |||
6654 | msgid "" |
|
6654 | msgid "" | |
6655 | " New files are ignored if they match any of the patterns in\n" |
|
6655 | " New files are ignored if they match any of the patterns in\n" | |
6656 | " .hgignore. As with add, these changes take effect at the next\n" |
|
6656 | " ``.hgignore``. As with add, these changes take effect at the next\n" | |
6657 | " commit." |
|
6657 | " commit." | |
6658 | msgstr "" |
|
6658 | msgstr "" | |
6659 |
" .hgignore に記述されたパターンに合致する新規ファイルは |
|
6659 | " ``.hgignore`` に記述されたパターンに合致する新規ファイルは\n" | |
6660 |
" :hg:`add` と同様に、 実行効果が発揮されるのは |
|
6660 | " 無視されます。 :hg:`add` と同様に、 実行効果が発揮されるのは\n" | |
|
6661 | " 次回コミット時点です。" | |||
6661 |
|
6662 | |||
6662 | msgid "" |
|
6663 | msgid "" | |
6663 | " Use the -s/--similarity option to detect renamed files. With a\n" |
|
6664 | " Use the -s/--similarity option to detect renamed files. With a\n" | |
@@ -6756,7 +6757,7 b' msgid ""' | |||||
6756 | " using a format string; see :hg:`help export` for details." |
|
6757 | " using a format string; see :hg:`help export` for details." | |
6757 | msgstr "" |
|
6758 | msgstr "" | |
6758 | " アーカイブ生成先となるファイル名ないしディレクトリ名の指定には\n" |
|
6759 | " アーカイブ生成先となるファイル名ないしディレクトリ名の指定には\n" | |
6759 |
" 置換指定を使用することができます。 置換指定に関する詳細は |
|
6760 | " 置換指定を使用することができます。 置換指定に関する詳細は\n" | |
6760 | " :hg:`help export` を参照してください。" |
|
6761 | " :hg:`help export` を参照してください。" | |
6761 |
|
6762 | |||
6762 | msgid "" |
|
6763 | msgid "" | |
@@ -6783,54 +6784,49 b' msgid "reverse effect of earlier changes' | |||||
6783 | msgstr "以前のチェンジセットにおける変更の打ち消し" |
|
6784 | msgstr "以前のチェンジセットにおける変更の打ち消し" | |
6784 |
|
6785 | |||
6785 | msgid "" |
|
6786 | msgid "" | |
6786 | " The backout command merges the reverse effect of the reverted\n" |
|
6787 | " Prepare a new changeset with the effect of REV undone in the\n" | |
6787 |
" c |
|
6788 | " current working directory." | |
6788 | msgstr "" |
|
6789 | msgstr "" | |
6789 |
" |
|
6790 | " 対象リビジョンでの変更を打ち消す効果を持つ変更を、\n" | |
6790 |
" 作業領域 |
|
6791 | " 作業領域で作成します。" | |
6791 |
|
6792 | |||
6792 | msgid "" |
|
6793 | msgid "" | |
6793 | " With the --merge option, it first commits the reverted changes\n" |
|
6794 | " If REV is the parent of the working directory, then this changeset\n" | |
6794 | " as a new changeset. This new changeset is a child of the reverted\n" |
|
6795 | " is committed automatically. Otherwise, hg needs to merge the\n" | |
6795 | " changeset.\n" |
|
6796 | " changes and the merged result is left uncommitted." | |
6796 | " The --merge option remembers the parent of the working directory\n" |
|
6797 | msgstr "" | |
6797 | " before starting the backout, then merges the new head with that\n" |
|
6798 | " 対象リビジョンが、 作業領域の親リビジョンの場合、\n" | |
6798 | " changeset afterwards.\n" |
|
6799 | " 打ち消しリビジョンは自動的にコミットされます。\n" | |
6799 | " This will result in an explicit merge in the history." |
|
6800 | " それ以外の場合は、 マージが実施されますが、\n" | |
6800 | msgstr "" |
|
6801 | " マージ結果はコミットされません。" | |
6801 | " --merge が指定された場合、 まずは打ち消し効果を持つ変更が、 \n" |
|
6802 | ||
6802 | " 打ち消し対象リビジョンの子リビジョンとして、 新規作成されます。\n" |
|
6803 | msgid "" | |
6803 | " その後、 打ち消し効果を持つ新規リビジョンによるヘッドと、 \n" |
|
6804 | " By default, the pending changeset will have one parent,\n" | |
6804 | " 処理の実施に先立って記録された作業領域の親リビジョンに対して、 \n" |
|
6805 | " maintaining a linear history. With --merge, the pending changeset\n" | |
6805 | " :hg:`merge` 相当の処理が実施されます。\n" |
|
6806 | " will instead have two parents: the old parent of the working\n" | |
6806 | " マージ結果を履歴に記録するには :hg:`commit` 実施が必要です。\n" |
|
6807 | " directory and a child of REV that simply undoes REV." | |
6807 | " (訳注: --merge が指定されない場合、 打ち消しのための変更の適用は、 \n" |
|
6808 | msgstr "" | |
6808 | " 作業領域に対して実施され、 新たなヘッドは作成されません)" |
|
6809 | " 特に指定が無い場合、 打ち消しリビジョンは、\n" | |
6809 |
|
6810 | " 単一の親リビジョンしか持たない、\n" | ||
6810 | msgid "" |
|
6811 | " 一直線の履歴となるように作成されます。\n" | |
6811 | " If you backout a changeset other than the original parent of the\n" |
|
6812 | " --merge を指定した場合は、 2つの親リビジョンを持つようになります。\n" | |
6812 | " working directory, the result of this merge is not committed,\n" |
|
6813 | " 一方の親は作業領域の親リビジョン、\n" | |
6813 | " as with a normal merge. Otherwise, no merge is needed and the\n" |
|
6814 | " もう一方は、 打ち消しリビジョン (= 打ち消し対象の子リビジョン)\n" | |
6814 | " commit is automatic." |
|
6815 | " です。" | |
6815 | msgstr "" |
|
6816 | ||
6816 | " 作業領域の親リビジョン「以外」の変更を打ち消す場合に、 \n" |
|
6817 | msgid "" | |
6817 | " (--merge 指定に関わらず) 実行結果が自動的にコミットされないのは、 \n" |
|
6818 | " Before version 1.7, the default behavior was equivalent to\n" | |
6818 | " 通常の :hg:`merge` 実行相当の処理が実施されているためです。\n" |
|
6819 | " specifying --merge followed by :hg:`update --clean .` to cancel\n" | |
6819 | " 作業領域の親リビジョンの変更を打ち消す場合、 \n" |
|
6820 | " the merge and leave the child of REV as a head to be merged\n" | |
6820 | " :hg:`merge` 相当の処理は実施されないため、 \n" |
|
6821 | " separately." | |
6821 | " 打ち消し結果は自動的にコミットされます。" |
|
6822 | msgstr "" | |
6822 |
|
6823 | " 1.8 版より前の本コマンドの挙動は、\n" | ||
6823 | msgid "" |
|
6824 | " 打消しを --merge 付きで実行した後で、\n" | |
6824 | " Note that the default behavior (without --merge) has changed in\n" |
|
6825 | " :hg:`update --clean .` を実行した場合と等価です。\n" | |
6825 | " version 1.7. To restore the previous default behavior, use\n" |
|
6826 | " ここでの :hg:`update --clean .` 実行は、\n" | |
6826 | " :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n" |
|
6827 | " マージの実施をキャンセルし、\n" | |
6827 | " the ongoing merge." |
|
6828 | " 打ち消しリビジョンを後から別途マージできるように、\n" | |
6828 | msgstr "" |
|
6829 | " ヘッドのまま残す働きをします。" | |
6829 | " 注意: --merge 指定が無い場合の挙動は、 1.7 版において変更されました。\n" |
|
|||
6830 | " (訳注: 旧版では --merge の有無に関わらず、 常に新規ヘッドが作成)\n" |
|
|||
6831 | " 以前の版における --merge 指定無し時の挙動と同等の結果を得るには、 \n" |
|
|||
6832 | " :hg:`backout --merge` 後に :hg:`update --clean .` を実行することで、 \n" |
|
|||
6833 | " 仕掛かり中のマージ処理を取り消してください。" |
|
|||
6834 |
|
6830 | |||
6835 | msgid "please specify just one revision" |
|
6831 | msgid "please specify just one revision" | |
6836 | msgstr "リビジョン指定は1つだけです" |
|
6832 | msgstr "リビジョン指定は1つだけです" | |
@@ -6875,8 +6871,8 b' msgid ""' | |||||
6875 | " bad, and bisect will either update to another candidate changeset\n" |
|
6871 | " bad, and bisect will either update to another candidate changeset\n" | |
6876 | " or announce that it has found the bad revision." |
|
6872 | " or announce that it has found the bad revision." | |
6877 | msgstr "" |
|
6873 | msgstr "" | |
6878 |
" 問題発生契機となるリビジョンの特定を補助します。 使用開始の際には、 |
|
6874 | " 問題発生契機となるリビジョンの特定を補助します。 使用開始の際には、\n" | |
6879 |
" 問題が発生する既知のリビジョンのうち、 最古のものを bad とマークし、 |
|
6875 | " 問題が発生する既知のリビジョンのうち、 最古のものを bad とマークし、\n" | |
6880 | " 問題が発生しない既知のリビジョンのうち、 最新のものを good とマーク\n" |
|
6876 | " 問題が発生しない既知のリビジョンのうち、 最新のものを good とマーク\n" | |
6881 | " します。 本コマンドは、 検証対象リビジョンで作業領域を更新します(-U/\n" |
|
6877 | " します。 本コマンドは、 検証対象リビジョンで作業領域を更新します(-U/\n" | |
6882 | " --noupdate 指定時除く)。 当該リビジョンを検証したなら、 bad あるいは\n" |
|
6878 | " --noupdate 指定時除く)。 当該リビジョンを検証したなら、 bad あるいは\n" | |
@@ -6951,6 +6947,74 b' msgstr "\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3 %d:%s: %s\\n"' | |||||
6951 | msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" |
|
6947 | msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" | |
6952 | msgstr "リビジョン %d:%s を検証中(検証残 %d、 検証済み %d)\n" |
|
6948 | msgstr "リビジョン %d:%s を検証中(検証残 %d、 検証済み %d)\n" | |
6953 |
|
6949 | |||
|
6950 | msgid "track a line of development with movable markers" | |||
|
6951 | msgstr "移動可能なマーキングによる履歴進展の追跡" | |||
|
6952 | ||||
|
6953 | msgid "" | |||
|
6954 | " Bookmarks are pointers to certain commits that move when\n" | |||
|
6955 | " committing. Bookmarks are local. They can be renamed, copied and\n" | |||
|
6956 | " deleted. It is possible to use bookmark names in :hg:`merge` and\n" | |||
|
6957 | " :hg:`update` to merge and update respectively to a given bookmark." | |||
|
6958 | msgstr "" | |||
|
6959 | " ブックマーク (bookmark) は、 コミット操作に追従して移動する、\n" | |||
|
6960 | " リビジョン特定用の情報です。\n" | |||
|
6961 | " ブックマークのリポジトリ間伝播は、 自動的には行われません。\n" | |||
|
6962 | " ブックマークに対しては、 改名/複製/削除が可能です。\n" | |||
|
6963 | " :hg:`merge` や :hg:`update` へのリビジョン指定において、\n" | |||
|
6964 | " ブックマークを使用することが可能です。" | |||
|
6965 | ||||
|
6966 | msgid "" | |||
|
6967 | " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" | |||
|
6968 | " directory's parent revision with the given name. If you specify\n" | |||
|
6969 | " a revision using -r REV (where REV may be an existing bookmark),\n" | |||
|
6970 | " the bookmark is assigned to that revision." | |||
|
6971 | msgstr "" | |||
|
6972 | " :hg:`bookmark NAME` を実行することで、 作業領域の親リビジョンに、\n" | |||
|
6973 | " 指定された名前で、 ブックマークが設定されます。\n" | |||
|
6974 | " -r を使用して、 対象リビジョンを指定した場合\n" | |||
|
6975 | " (対象指定自体にも、 ブックマークを使用可能)\n" | |||
|
6976 | " そのリビジョンにブックマークが設定されます。" | |||
|
6977 | ||||
|
6978 | msgid "" | |||
|
6979 | " Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" | |||
|
6980 | " push` and :hg:`help pull`). This requires both the local and remote\n" | |||
|
6981 | " repositories to support bookmarks. For versions prior to 1.8, this " | |||
|
6982 | "means\n" | |||
|
6983 | " the bookmarks extension must be enabled.\n" | |||
|
6984 | " " | |||
|
6985 | msgstr "" | |||
|
6986 | " ブックマークは、 リポジトリ間での取り込みや反映が可能です\n" | |||
|
6987 | " (:hg:`help push` および :hg:`help pull` 参照)。\n" | |||
|
6988 | " 但し、 連携するリポジトリの両方が、\n" | |||
|
6989 | " ブックマーク機能に対応している必要があります\n" | |||
|
6990 | " 1.8 版より前の Mercurial の場合、 \n" | |||
|
6991 | " bookmarks エクステンションを有効にしなければなりません。\n" | |||
|
6992 | " " | |||
|
6993 | ||||
|
6994 | msgid "a bookmark of this name does not exist" | |||
|
6995 | msgstr "この名前のブックマークは存在しません" | |||
|
6996 | ||||
|
6997 | msgid "a bookmark of the same name already exists" | |||
|
6998 | msgstr "同じ名前のブックマークがすでに存在します" | |||
|
6999 | ||||
|
7000 | msgid "new bookmark name required" | |||
|
7001 | msgstr "新しいブックマーク名を要求しました" | |||
|
7002 | ||||
|
7003 | msgid "bookmark name required" | |||
|
7004 | msgstr "ブックマーク名を要求しました" | |||
|
7005 | ||||
|
7006 | msgid "bookmark name cannot contain newlines" | |||
|
7007 | msgstr "ブックマーク名に改行を含めません" | |||
|
7008 | ||||
|
7009 | msgid "bookmark names cannot consist entirely of whitespace" | |||
|
7010 | msgstr "空白文字だけで構成されたタグ名は不正です" | |||
|
7011 | ||||
|
7012 | msgid "a bookmark cannot have the name of an existing branch" | |||
|
7013 | msgstr "既存ブランチと同名のブックマークは作成できません" | |||
|
7014 | ||||
|
7015 | msgid "no bookmarks set\n" | |||
|
7016 | msgstr "ブックマークは存在しません\n" | |||
|
7017 | ||||
6954 | msgid "set or show the current branch name" |
|
7018 | msgid "set or show the current branch name" | |
6955 | msgstr "ブランチ名の設定、 ないし現ブランチ名の表示" |
|
7019 | msgstr "ブランチ名の設定、 ないし現ブランチ名の表示" | |
6956 |
|
7020 | |||
@@ -6961,7 +7025,7 b' msgid ""' | |||||
6961 | " recommends that primary development take place on the 'default'\n" |
|
7025 | " recommends that primary development take place on the 'default'\n" | |
6962 | " branch." |
|
7026 | " branch." | |
6963 | msgstr "" |
|
7027 | msgstr "" | |
6964 |
" 引数無しの場合、 現ブランチ名を表示します。 引数が1つ指定された場合、 |
|
7028 | " 引数無しの場合、 現ブランチ名を表示します。 引数が1つ指定された場合、\n" | |
6965 | " 作業領域のブランチ名を設定します(次回コミット時まで、 ブランチは生成\n" |
|
7029 | " 作業領域のブランチ名を設定します(次回コミット時まで、 ブランチは生成\n" | |
6966 | " されません)。 作業時に基本とするブランチには、 'default' ブランチを\n" |
|
7030 | " されません)。 作業時に基本とするブランチには、 'default' ブランチを\n" | |
6967 | " 使用することをお勧めします。" |
|
7031 | " 使用することをお勧めします。" | |
@@ -6970,7 +7034,7 b' msgid ""' | |||||
6970 | " Unless -f/--force is specified, branch will not let you set a\n" |
|
7034 | " Unless -f/--force is specified, branch will not let you set a\n" | |
6971 | " branch name that already exists, even if it's inactive." |
|
7035 | " branch name that already exists, even if it's inactive." | |
6972 | msgstr "" |
|
7036 | msgstr "" | |
6973 |
" -f/--force 指定が無い場合、 例えそれが非アクティブなものであっても、 |
|
7037 | " -f/--force 指定が無い場合、 例えそれが非アクティブなものであっても、\n" | |
6974 | " 既存ブランチと同じ名前は設定できません。" |
|
7038 | " 既存ブランチと同じ名前は設定できません。" | |
6975 |
|
7039 | |||
6976 | msgid "" |
|
7040 | msgid "" | |
@@ -7144,9 +7208,9 b' msgstr ""' | |||||
7144 |
|
7208 | |||
7145 | msgid "" |
|
7209 | msgid "" | |
7146 | " The location of the source is added to the new repository's\n" |
|
7210 | " The location of the source is added to the new repository's\n" | |
7147 | " .hg/hgrc file, as the default to be used for future pulls." |
|
7211 | " ``.hg/hgrc`` file, as the default to be used for future pulls." | |
7148 | msgstr "" |
|
7212 | msgstr "" | |
7149 |
" 将来的な |
|
7213 | " 将来的な :hg:`pull` 実施に備えて、 複製先リポジトリの ``.hg/hgrc``\n" | |
7150 | " ファイルには、 複製元リポジトリ位置が default 名義で記録されます。" |
|
7214 | " ファイルには、 複製元リポジトリ位置が default 名義で記録されます。" | |
7151 |
|
7215 | |||
7152 | msgid " See :hg:`help urls` for valid source format details." |
|
7216 | msgid " See :hg:`help urls` for valid source format details." | |
@@ -7154,11 +7218,12 b' msgstr " \xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe4\xbd\x8d\xe7\xbd\xae\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\xae\xe8\xa9\xb3\xe7\xb4\xb0\xe3\x81\xaf\xe3\x80\x81 :hg:`help urls` \xe3\x82\x92\xe5\x8f\x82\xe7\x85\xa7\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84\xe3\x80\x82"' | |||||
7154 |
|
7218 | |||
7155 | msgid "" |
|
7219 | msgid "" | |
7156 | " It is possible to specify an ``ssh://`` URL as the destination, but no\n" |
|
7220 | " It is possible to specify an ``ssh://`` URL as the destination, but no\n" | |
7157 | " .hg/hgrc and working directory will be created on the remote side.\n" |
|
7221 | " ``.hg/hgrc`` and working directory will be created on the remote side.\n" | |
7158 | " Please see :hg:`help urls` for important details about ``ssh://`` URLs." |
|
7222 | " Please see :hg:`help urls` for important details about ``ssh://`` URLs." | |
7159 | msgstr "" |
|
7223 | msgstr "" | |
7160 |
" 複製先として ``ssh://`` URL 形式を指定することも可能ですが、 |
|
7224 | " 複製先として ``ssh://`` URL 形式を指定することも可能ですが、\n" | |
7161 |
" 遠隔ホスト上では、 .hg/hgrc の作成も、 |
|
7225 | " 遠隔ホスト上では、 ``.hg/hgrc`` の作成も、\n" | |
|
7226 | " 作業領域の更新も行われません。\n" | |||
7162 | " ``ssh://`` URL 形式の詳細は、 :hg:`help urls` を参照してください。" |
|
7227 | " ``ssh://`` URL 形式の詳細は、 :hg:`help urls` を参照してください。" | |
7163 |
|
7228 | |||
7164 | msgid "" |
|
7229 | msgid "" | |
@@ -7185,7 +7250,7 b' msgid ""' | |||||
7185 | " local source repositories." |
|
7250 | " local source repositories." | |
7186 | msgstr "" |
|
7251 | msgstr "" | |
7187 | " -r/--rev 指定付き(ないしは 'hg clone 複製元#リビジョン' 形式)\n" |
|
7252 | " -r/--rev 指定付き(ないしは 'hg clone 複製元#リビジョン' 形式)\n" | |
7188 |
" 複製の場合、 同一ファイルシステム上での複製であっても、 |
|
7253 | " 複製の場合、 同一ファイルシステム上での複製であっても、\n" | |
7189 | " 暗黙的に --pull 指定を伴います。" |
|
7254 | " 暗黙的に --pull 指定を伴います。" | |
7190 |
|
7255 | |||
7191 | msgid "" |
|
7256 | msgid "" | |
@@ -7206,7 +7271,7 b' msgid ""' | |||||
7206 | " In some cases, you can clone repositories and the working directory\n" |
|
7271 | " In some cases, you can clone repositories and the working directory\n" | |
7207 | " using full hardlinks with ::" |
|
7272 | " using full hardlinks with ::" | |
7208 | msgstr "" |
|
7273 | msgstr "" | |
7209 |
" リポジトリの内部管理データと作業領域中のファイル全てに対する、 |
|
7274 | " リポジトリの内部管理データと作業領域中のファイル全てに対する、\n" | |
7210 | " ハードリンクによる複製の作成には、 以下の方法が使えるかも知れません::" |
|
7275 | " ハードリンクによる複製の作成には、 以下の方法が使えるかも知れません::" | |
7211 |
|
7276 | |||
7212 | msgid " $ cp -al REPO REPOCLONE" |
|
7277 | msgid " $ cp -al REPO REPOCLONE" | |
@@ -7247,9 +7312,9 b' msgid ""' | |||||
7247 | " h) tip" |
|
7312 | " h) tip" | |
7248 | msgstr "" |
|
7313 | msgstr "" | |
7249 | " a) -U が指定されるか、 元リポジトリ履歴が空の場合は null リビジョン\n" |
|
7314 | " a) -U が指定されるか、 元リポジトリ履歴が空の場合は null リビジョン\n" | |
7250 |
" b) -u . が指定され、 且つ元リポジトリが同一ホストの場合、 |
|
7315 | " b) -u . が指定され、 且つ元リポジトリが同一ホストの場合、\n" | |
7251 | " 元リポジトリの作業領域の第1親リビジョン\n" |
|
7316 | " 元リポジトリの作業領域の第1親リビジョン\n" | |
7252 |
" c) -u で指定されたリビジョン(ブランチ名が指定された場合、 |
|
7317 | " c) -u で指定されたリビジョン(ブランチ名が指定された場合、\n" | |
7253 | " 当該ブランチの最新ヘッドリビジョン)\n" |
|
7318 | " 当該ブランチの最新ヘッドリビジョン)\n" | |
7254 | " d) -r で指定されたリビジョン\n" |
|
7319 | " d) -r で指定されたリビジョン\n" | |
7255 | " e) -b で指定sれたブランチの最新ヘッドリビジョン\n" |
|
7320 | " e) -b で指定sれたブランチの最新ヘッドリビジョン\n" | |
@@ -7265,12 +7330,13 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xaa\xe3\x81\x84\xe3\x81\x97\xe5\x85\xa8\xe3\x81\xa6\xe3\x81\xae\xe5\xa4\x89\xe6\x9b\xb4\xe5\x86\x85\xe5\xae\xb9\xe3\x81\xae\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xb8\xe3\x81\xae\xe8\xa8\x98\xe9\x8c\xb2"' | |||||
7265 |
|
7330 | |||
7266 | msgid "" |
|
7331 | msgid "" | |
7267 | " Commit changes to the given files into the repository. Unlike a\n" |
|
7332 | " Commit changes to the given files into the repository. Unlike a\n" | |
7268 |
" centralized |
|
7333 | " centralized SCM, this operation is a local operation. See\n" | |
7269 | " :hg:`push` for a way to actively distribute your changes." |
|
7334 | " :hg:`push` for a way to actively distribute your changes." | |
7270 | msgstr "" |
|
7335 | msgstr "" | |
7271 | " 指定されたファイルの変更内容を管理領域に記録(コミット)します。\n" |
|
7336 | " 指定されたファイルの変更内容を、 管理領域に記録 (コミット) します。\n" | |
7272 |
" |
|
7337 | " 中央集権的な構成管理ツールと異なり、\n" | |
7273 | " 対する記録しか行いません。 変更を能動的に公開する方法に関しては\n" |
|
7338 | " この操作で変更が記録されるのは、 手元の管理領域に対してのみです。\n" | |
|
7339 | " 変更を能動的に公開する方法に関しては、\n" | |||
7274 | " :hg:`help push` を参照してください。" |
|
7340 | " :hg:`help push` を参照してください。" | |
7275 |
|
7341 | |||
7276 | msgid "" |
|
7342 | msgid "" | |
@@ -7294,7 +7360,7 b' msgid ""' | |||||
7294 | " ``.hg/last-message.txt``." |
|
7360 | " ``.hg/last-message.txt``." | |
7295 | msgstr "" |
|
7361 | msgstr "" | |
7296 | " コミットメッセージが指定されない場合、 メッセージ入力用のプログラムが\n" |
|
7362 | " コミットメッセージが指定されない場合、 メッセージ入力用のプログラムが\n" | |
7297 |
" 設定に従って起動されます。 コミット処理が失敗した場合でも、 |
|
7363 | " 設定に従って起動されます。 コミット処理が失敗した場合でも、\n" | |
7298 | " 入力したメッセージは ``.hg/last-message.txt`` に保存されます。" |
|
7364 | " 入力したメッセージは ``.hg/last-message.txt`` に保存されます。" | |
7299 |
|
7365 | |||
7300 | msgid "" |
|
7366 | msgid "" | |
@@ -7549,6 +7615,12 b' msgstr "\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe6\x8c\x87\xe5\xae\x9a %s \xe3\x81\xaf\xe4\xb8\x8d\xe6\xad\xa3\xe3\x81\xa7\xe3\x81\x99"' | |||||
7549 | msgid "parse and display a date" |
|
7615 | msgid "parse and display a date" | |
7550 | msgstr "日付の解析および表示" |
|
7616 | msgstr "日付の解析および表示" | |
7551 |
|
7617 | |||
|
7618 | msgid "display the combined ignore pattern" | |||
|
7619 | msgstr "" | |||
|
7620 | ||||
|
7621 | msgid "no ignore patterns found" | |||
|
7622 | msgstr "" | |||
|
7623 | ||||
7552 | msgid "dump the contents of an index file" |
|
7624 | msgid "dump the contents of an index file" | |
7553 | msgstr "インデックスファイルの内容表示" |
|
7625 | msgstr "インデックスファイルの内容表示" | |
7554 |
|
7626 | |||
@@ -7602,8 +7674,8 b' msgid ""' | |||||
7602 | " Internal patcher failure, please report this error to http://mercurial." |
|
7674 | " Internal patcher failure, please report this error to http://mercurial." | |
7603 | "selenic.com/wiki/BugTracker\n" |
|
7675 | "selenic.com/wiki/BugTracker\n" | |
7604 | msgstr "" |
|
7676 | msgstr "" | |
7605 |
" |
|
7677 | "内部パッチツールが機能しません。 http://mercurial.selenic.com/wiki/" | |
7606 | "BugTrackerへのエラー報告にご協力ください\n" |
|
7678 | "BugTracker へのエラー報告にご協力ください\n" | |
7607 |
|
7679 | |||
7608 | msgid "Checking commit editor...\n" |
|
7680 | msgid "Checking commit editor...\n" | |
7609 | msgstr "メッセージ入力用エディタの検証中...\n" |
|
7681 | msgstr "メッセージ入力用エディタの検証中...\n" | |
@@ -7661,7 +7733,7 b' msgid ""' | |||||
7661 | " parent changeset if no revisions are specified." |
|
7733 | " parent changeset if no revisions are specified." | |
7662 | msgstr "" |
|
7734 | msgstr "" | |
7663 | " .. note::\n" |
|
7735 | " .. note::\n" | |
7664 |
" マージ実施リビジョンに対する本コマンドの差分出力が、 |
|
7736 | " マージ実施リビジョンに対する本コマンドの差分出力が、\n" | |
7665 | " 期待と異なる場合があるのは、 対象リビジョンが無指定の場合に\n" |
|
7737 | " 期待と異なる場合があるのは、 対象リビジョンが無指定の場合に\n" | |
7666 | " 比較対象となるのが、 作業領域の第1親に固定されているためです。" |
|
7738 | " 比較対象となるのが、 作業領域の第1親に固定されているためです。" | |
7667 |
|
7739 | |||
@@ -7710,7 +7782,7 b' msgid ""' | |||||
7710 | " first parent only." |
|
7782 | " first parent only." | |
7711 | msgstr "" |
|
7783 | msgstr "" | |
7712 | " .. note::\n" |
|
7784 | " .. note::\n" | |
7713 |
" マージ実施リビジョンに対する本コマンドの差分出力が、 |
|
7785 | " マージ実施リビジョンに対する本コマンドの差分出力が、\n" | |
7714 | " 期待と異なる場合があるのは、 比較対象が対象リビジョンの第1親に\n" |
|
7786 | " 期待と異なる場合があるのは、 比較対象が対象リビジョンの第1親に\n" | |
7715 | " 固定されているためです。" |
|
7787 | " 固定されているためです。" | |
7716 |
|
7788 | |||
@@ -7785,7 +7857,7 b' msgid ""' | |||||
7785 | " entire project history, and it does not delete them from the\n" |
|
7857 | " entire project history, and it does not delete them from the\n" | |
7786 | " working directory." |
|
7858 | " working directory." | |
7787 | msgstr "" |
|
7859 | msgstr "" | |
7788 |
" 本コマンドでの登録除外は、 現ブランチにおける登録除外のみを意味し、 |
|
7860 | " 本コマンドでの登録除外は、 現ブランチにおける登録除外のみを意味し、\n" | |
7789 | " 履歴そのものは保持され続けますし、 作業領域からも削除されません。" |
|
7861 | " 履歴そのものは保持され続けますし、 作業領域からも削除されません。" | |
7790 |
|
7862 | |||
7791 | msgid " To undo a forget before the next commit, see :hg:`add`." |
|
7863 | msgid " To undo a forget before the next commit, see :hg:`add`." | |
@@ -7812,11 +7884,11 b' msgid ""' | |||||
7812 | " working directory. It always prints the revision number in which a\n" |
|
7884 | " working directory. It always prints the revision number in which a\n" | |
7813 | " match appears." |
|
7885 | " match appears." | |
7814 | msgstr "" |
|
7886 | msgstr "" | |
7815 |
" 本コマンドの挙動は Unix の grep とは異なります。 |
|
7887 | " 本コマンドの挙動は Unix の grep とは異なります。\n" | |
7816 |
" Python/Perl 形式のものだけです。 |
|
7888 | " 解釈可能な正規表現は Python/Perl 形式のものだけです。\n" | |
7817 | "で、 \n" |
|
7889 | " 検索対象はリポジトリ内のデータのみで、\n" | |
7818 |
" 作業領域は検索対象には含まれません。 |
|
7890 | " 作業領域は検索対象には含まれません。\n" | |
7819 | " リビジョンを表示します。" |
|
7891 | " パターンに合致する内容が現れたリビジョンを表示します。" | |
7820 |
|
7892 | |||
7821 | msgid "" |
|
7893 | msgid "" | |
7822 | " By default, grep only prints output for the first revision of a\n" |
|
7894 | " By default, grep only prints output for the first revision of a\n" | |
@@ -7854,11 +7926,12 b' msgid ""' | |||||
7854 | " for update and merge operations. Branch heads are changesets that have\n" |
|
7926 | " for update and merge operations. Branch heads are changesets that have\n" | |
7855 | " no child changeset on the same branch." |
|
7927 | " no child changeset on the same branch." | |
7856 | msgstr "" |
|
7928 | msgstr "" | |
7857 |
" リポジトリの「ヘッド」とは、 |
|
7929 | " リポジトリの「ヘッド」とは、\n" | |
7858 | " ことを指します。 改変作業の実施や、 update/merge コマンド実施の際に" |
|
7930 | " 子リビジョンを持たないリビジョンのことです。\n" | |
7859 | "は、 \n" |
|
7931 | " 改変作業の実施や、 update/merge コマンド実施の際には、\n" | |
7860 |
" このリビジョンを対象とするのが一般的です。 |
|
7932 | " このリビジョンを対象とするのが一般的です。\n" | |
7861 | " 同じ名前付きブランチ内に子リビジョンを持たないリビジョンのことです。" |
|
7933 | " 「ブランチヘッド」とは、 同じ名前付きブランチ内に、\n" | |
|
7934 | " 子リビジョンを持たないリビジョンのことです。" | |||
7862 |
|
7935 | |||
7863 | msgid "" |
|
7936 | msgid "" | |
7864 | " If one or more REVs are given, only branch heads on the branches\n" |
|
7937 | " If one or more REVs are given, only branch heads on the branches\n" | |
@@ -7886,7 +7959,7 b' msgid ""' | |||||
7886 | "only\n" |
|
7959 | "only\n" | |
7887 | " changesets without children will be shown." |
|
7960 | " changesets without children will be shown." | |
7888 | msgstr "" |
|
7961 | msgstr "" | |
7889 |
" -t/--topo 指定時には、 名前付きブランチに関する判定は無視され、 |
|
7962 | " -t/--topo 指定時には、 名前付きブランチに関する判定は無視され、\n" | |
7890 | " 単に子リビジョンを持たないリビジョンが表示されます。" |
|
7963 | " 単に子リビジョンを持たないリビジョンが表示されます。" | |
7891 |
|
7964 | |||
7892 | msgid "" |
|
7965 | msgid "" | |
@@ -7935,8 +8008,8 b' msgstr ""' | |||||
7935 | "全コマンドの一覧は \"hg help\" で、 コマンド詳細は \"hg -v\" で表示されます" |
|
8008 | "全コマンドの一覧は \"hg help\" で、 コマンド詳細は \"hg -v\" で表示されます" | |
7936 |
|
8009 | |||
7937 | #, python-format |
|
8010 | #, python-format | |
7938 | msgid "use \"hg -v help%s\" to show aliases and global options" |
|
8011 | msgid "use \"hg -v help%s\" to show builtin aliases and global options" | |
7939 |
msgstr "別名およびグローバルオプションは \"hg -v help%s\" |
|
8012 | msgstr "組み込み別名およびグローバルオプションの表示は \"hg -v help%s\"" | |
7940 |
|
8013 | |||
7941 | #, python-format |
|
8014 | #, python-format | |
7942 | msgid "use \"hg -v help %s\" to show global options" |
|
8015 | msgid "use \"hg -v help %s\" to show global options" | |
@@ -8082,7 +8155,7 b' msgid ""' | |||||
8082 | " message." |
|
8155 | " message." | |
8083 | msgstr "" |
|
8156 | msgstr "" | |
8084 | " 電子メールから直接パッチを取り込むことも可能です。 添付ファイル\n" |
|
8157 | " 電子メールから直接パッチを取り込むことも可能です。 添付ファイル\n" | |
8085 |
" 形式のパッチであっても取り込み可能です(但し、 text/plain ないし |
|
8158 | " 形式のパッチであっても取り込み可能です(但し、 text/plain ないし\n" | |
8086 | " text/x-patch 型でなければなりません)。 作成者およびコミットログが無い\n" |
|
8159 | " text/x-patch 型でなければなりません)。 作成者およびコミットログが無い\n" | |
8087 | " 場合、 電子メールの From および Subject ヘッダ値が使用されます。\n" |
|
8160 | " 場合、 電子メールの From および Subject ヘッダ値が使用されます。\n" | |
8088 | " 最初のパッチデータに先立つ text/plain ボディは、 コミットログに追記\n" |
|
8161 | " 最初のパッチデータに先立つ text/plain ボディは、 コミットログに追記\n" | |
@@ -8108,7 +8181,7 b' msgid ""' | |||||
8108 | msgstr "" |
|
8181 | msgstr "" | |
8109 | " --exact が指定された場合、 作業領域をパッチの親リビジョンに更新して\n" |
|
8182 | " --exact が指定された場合、 作業領域をパッチの親リビジョンに更新して\n" | |
8110 | " からパッチを適用しますが、 作成されたリビジョンのハッシュ値が、 パッチ\n" |
|
8183 | " からパッチを適用しますが、 作成されたリビジョンのハッシュ値が、 パッチ\n" | |
8111 |
" に記録された値と異なる場合、 取り込みは実施されません。 この現象は、 |
|
8184 | " に記録された値と異なる場合、 取り込みは実施されません。 この現象は、\n" | |
8112 | " 利用する文字符号化の問題や、 パッチのテキスト部分の不足などが原因で\n" |
|
8185 | " 利用する文字符号化の問題や、 パッチのテキスト部分の不足などが原因で\n" | |
8113 | " 発生する可能性があります。" |
|
8186 | " 発生する可能性があります。" | |
8114 |
|
8187 | |||
@@ -8116,7 +8189,7 b' msgid ""' | |||||
8116 | " With -s/--similarity, hg will attempt to discover renames and\n" |
|
8189 | " With -s/--similarity, hg will attempt to discover renames and\n" | |
8117 | " copies in the patch in the same way as 'addremove'." |
|
8190 | " copies in the patch in the same way as 'addremove'." | |
8118 | msgstr "" |
|
8191 | msgstr "" | |
8119 |
" -s/--similarity が指定された場合、 'hg addremove' と同様な方針で、 |
|
8192 | " -s/--similarity が指定された場合、 'hg addremove' と同様な方針で、\n" | |
8120 | " パッチによる変更結果から、 改名や複製を検出します。" |
|
8193 | " パッチによる変更結果から、 改名や複製を検出します。" | |
8121 |
|
8194 | |||
8122 | msgid "" |
|
8195 | msgid "" | |
@@ -8179,6 +8252,9 b' msgstr ""' | |||||
8179 | msgid "cannot combine --bundle and --subrepos" |
|
8252 | msgid "cannot combine --bundle and --subrepos" | |
8180 | msgstr "--bundle と --subrepos は組み合わせられません" |
|
8253 | msgstr "--bundle と --subrepos は組み合わせられません" | |
8181 |
|
8254 | |||
|
8255 | msgid "remote doesn't support bookmarks\n" | |||
|
8256 | msgstr "連携先リポジトリはブックマークが未サポートです\n" | |||
|
8257 | ||||
8182 | msgid "create a new repository in the given directory" |
|
8258 | msgid "create a new repository in the given directory" | |
8183 | msgstr "指定されたディレクトリでの新規リポジトリの作成" |
|
8259 | msgstr "指定されたディレクトリでの新規リポジトリの作成" | |
8184 |
|
8260 | |||
@@ -8289,9 +8365,9 b' msgid ""' | |||||
8289 | " will appear in files:." |
|
8365 | " will appear in files:." | |
8290 | msgstr "" |
|
8366 | msgstr "" | |
8291 | " .. note::\n" |
|
8367 | " .. note::\n" | |
8292 |
" マージ実施リビジョンに対する -p/--patch 指定による差分出力が、 |
|
8368 | " マージ実施リビジョンに対する -p/--patch 指定による差分出力が、\n" | |
8293 | " 期待と異なる場合があるのは、 比較対象が対象リビジョンの第1親に\n" |
|
8369 | " 期待と異なる場合があるのは、 比較対象が対象リビジョンの第1親に\n" | |
8294 |
" 固定されているためです。 ファイル一覧が予期せぬ内容となるのは、 |
|
8370 | " 固定されているためです。 ファイル一覧が予期せぬ内容となるのは、\n" | |
8295 | " 親同士で内容が異なるファイルのみが列挙されるためです。" |
|
8371 | " 親同士で内容が異なるファイルのみが列挙されるためです。" | |
8296 |
|
8372 | |||
8297 | msgid "output the current or given revision of the project manifest" |
|
8373 | msgid "output the current or given revision of the project manifest" | |
@@ -8303,14 +8379,14 b' msgid ""' | |||||
8303 | " is used, or the null revision if no revision is checked out." |
|
8379 | " is used, or the null revision if no revision is checked out." | |
8304 | msgstr "" |
|
8380 | msgstr "" | |
8305 | " 指定リビジョンにおける構成管理対象ファイルの一覧を表示します。\n" |
|
8381 | " 指定リビジョンにおける構成管理対象ファイルの一覧を表示します。\n" | |
8306 |
" リビジョン指定が無い場合、 作業領域の(第1)親リビジョンか、 |
|
8382 | " リビジョン指定が無い場合、 作業領域の(第1)親リビジョンか、\n" | |
8307 | " 作業領域の更新前なら null が使用されます。" |
|
8383 | " 作業領域の更新前なら null が使用されます。" | |
8308 |
|
8384 | |||
8309 | msgid "" |
|
8385 | msgid "" | |
8310 | " With -v, print file permissions, symlink and executable bits.\n" |
|
8386 | " With -v, print file permissions, symlink and executable bits.\n" | |
8311 | " With --debug, print file revision hashes." |
|
8387 | " With --debug, print file revision hashes." | |
8312 | msgstr "" |
|
8388 | msgstr "" | |
8313 |
" -v が指定された場合、 ファイルアクセス権やシンボリックリンク、 |
|
8389 | " -v が指定された場合、 ファイルアクセス権やシンボリックリンク、\n" | |
8314 | " 実行可能ビットといったものも表示されます。\n" |
|
8390 | " 実行可能ビットといったものも表示されます。\n" | |
8315 | " --debug が指定された場合、 各ファイルのリビジョンのハッシュ値が\n" |
|
8391 | " --debug が指定された場合、 各ファイルのリビジョンのハッシュ値が\n" | |
8316 | " 表示されます。" |
|
8392 | " 表示されます。" | |
@@ -8333,7 +8409,7 b' msgid ""' | |||||
8333 | msgstr "" |
|
8409 | msgstr "" | |
8334 | " 両方の親リビジョンに対して差分のあるファイルは、 次回コミットの際には\n" |
|
8410 | " 両方の親リビジョンに対して差分のあるファイルは、 次回コミットの際には\n" | |
8335 | " 変更されたものとして記録されますので、 必要以上の変更が実施される前に\n" |
|
8411 | " 変更されたものとして記録されますので、 必要以上の変更が実施される前に\n" | |
8336 |
" コミットを実施してください。 このコミット時に生成されるリビジョンは、 |
|
8412 | " コミットを実施してください。 このコミット時に生成されるリビジョンは、\n" | |
8337 | " 親リビジョンを2つ持つリビジョンとなります。" |
|
8413 | " 親リビジョンを2つ持つリビジョンとなります。" | |
8338 |
|
8414 | |||
8339 | msgid "" |
|
8415 | msgid "" | |
@@ -8351,7 +8427,7 b' msgid ""' | |||||
8351 | " head, the other head is merged with by default. Otherwise, an\n" |
|
8427 | " head, the other head is merged with by default. Otherwise, an\n" | |
8352 | " explicit revision with which to merge with must be provided." |
|
8428 | " explicit revision with which to merge with must be provided." | |
8353 | msgstr "" |
|
8429 | msgstr "" | |
8354 |
" マージ対象リビジョンの指定が無く、 作業領域の親リビジョンがヘッドで、 |
|
8430 | " マージ対象リビジョンの指定が無く、 作業領域の親リビジョンがヘッドで、\n" | |
8355 | " 且つ現行ブランチがもう1つだけヘッドを持つ場合、 そのヘッドがマージ\n" |
|
8431 | " 且つ現行ブランチがもう1つだけヘッドを持つ場合、 そのヘッドがマージ\n" | |
8356 | " 対象となります。 それ以外の場合は、 明示的なリビジョン指定が必要です。" |
|
8432 | " 対象となります。 それ以外の場合は、 明示的なリビジョン指定が必要です。" | |
8357 |
|
8433 | |||
@@ -8364,7 +8440,7 b' msgid ""' | |||||
8364 | " all changes." |
|
8440 | " all changes." | |
8365 | msgstr "" |
|
8441 | msgstr "" | |
8366 | " コミット前にマージ処理を取り消す場合は、 :hg:`update --clean .`\n" |
|
8442 | " コミット前にマージ処理を取り消す場合は、 :hg:`update --clean .`\n" | |
8367 |
" が使用できますが、 マージ前の親リビジョンの内容で上書きするため、 |
|
8443 | " が使用できますが、 マージ前の親リビジョンの内容で上書きするため、\n" | |
8368 | " 作業領域中の全ての変更内容が失われます。" |
|
8444 | " 作業領域中の全ての変更内容が失われます。" | |
8369 |
|
8445 | |||
8370 | msgid "" |
|
8446 | msgid "" | |
@@ -8481,13 +8557,13 b' msgid ""' | |||||
8481 | " :hg:`bundle`) operations." |
|
8557 | " :hg:`bundle`) operations." | |
8482 | msgstr "" |
|
8558 | msgstr "" | |
8483 | " ``default`` および ``default-push`` は特別な意味を持ちます。\n" |
|
8559 | " ``default`` および ``default-push`` は特別な意味を持ちます。\n" | |
8484 |
" push/pull の際にコマンド行で連携先リポジトリが指定されない場合、 |
|
8560 | " push/pull の際にコマンド行で連携先リポジトリが指定されない場合、\n" | |
8485 |
" これらのパスが使用されます。 ``default-push`` が設定されている場合、 |
|
8561 | " これらのパスが使用されます。 ``default-push`` が設定されている場合、\n" | |
8486 | " ``default-push`` は :hg:`push` で使用され、 ``default`` は\n" |
|
8562 | " ``default-push`` は :hg:`push` で使用され、 ``default`` は\n" | |
8487 |
" :hg:`pull` で使用されます。 ``default-push`` が未設定であれば、 |
|
8563 | " :hg:`pull` で使用されます。 ``default-push`` が未設定であれば、\n" | |
8488 |
" push/pull 共に ``default`` を使用します。 リポジトリの複製では、 |
|
8564 | " push/pull 共に ``default`` を使用します。 リポジトリの複製では、\n" | |
8489 | " 複製元リポジトリが ``default`` として ``.hg/hgrc`` に記録されます。\n" |
|
8565 | " 複製元リポジトリが ``default`` として ``.hg/hgrc`` に記録されます。\n" | |
8490 |
" ``default`` および ``default-push`` は全ての取り込み (例: |
|
8566 | " ``default`` および ``default-push`` は全ての取り込み (例:\n" | |
8491 | " :hg:`incoming`) および反映 (例: :hg:`outgoing`、 :hg:`email` および\n" |
|
8567 | " :hg:`incoming`) および反映 (例: :hg:`outgoing`、 :hg:`email` および\n" | |
8492 | " :hg:`bundle`) 操作において適用されます。" |
|
8568 | " :hg:`bundle`) 操作において適用されます。" | |
8493 |
|
8569 | |||
@@ -8529,7 +8605,7 b' msgid ""' | |||||
8529 | " to add those changes to the repository, you should use :hg:`pull\n" |
|
8605 | " to add those changes to the repository, you should use :hg:`pull\n" | |
8530 | " -r X` where ``X`` is the last changeset listed by :hg:`incoming`." |
|
8606 | " -r X` where ``X`` is the last changeset listed by :hg:`incoming`." | |
8531 | msgstr "" |
|
8607 | msgstr "" | |
8532 |
" :hg:`incoming` を使用することで、 実際の取り込みをせずに、 |
|
8608 | " :hg:`incoming` を使用することで、 実際の取り込みをせずに、\n" | |
8533 | " :hg:`pull` による取り込み対象を確認することができます。 表示された\n" |
|
8609 | " :hg:`pull` による取り込み対象を確認することができます。 表示された\n" | |
8534 | " 内容の取り込みを決断したならば、 :hg:`incoming` 実行で表示された\n" |
|
8610 | " 内容の取り込みを決断したならば、 :hg:`incoming` 実行で表示された\n" | |
8535 | " 最後のリビジョンを ``-r`` の引数にして :hg:`pull -r X` を実行します。" |
|
8611 | " 最後のリビジョンを ``-r`` の引数にして :hg:`pull -r X` を実行します。" | |
@@ -8549,11 +8625,19 b' msgstr ""' | |||||
8549 | " 1 です。\n" |
|
8625 | " 1 です。\n" | |
8550 | " " |
|
8626 | " " | |
8551 |
|
8627 | |||
|
8628 | #, python-format | |||
|
8629 | msgid "remote bookmark %s not found!" | |||
|
8630 | msgstr "連携先にはブックマーク %s がありません!" | |||
|
8631 | ||||
8552 | msgid "" |
|
8632 | msgid "" | |
8553 | "other repository doesn't support revision lookup, so a rev cannot be " |
|
8633 | "other repository doesn't support revision lookup, so a rev cannot be " | |
8554 | "specified." |
|
8634 | "specified." | |
8555 | msgstr "連携先でリビジョンが特定出来ないため、 リビジョンは指定できません" |
|
8635 | msgstr "連携先でリビジョンが特定出来ないため、 リビジョンは指定できません" | |
8556 |
|
8636 | |||
|
8637 | #, python-format | |||
|
8638 | msgid "importing bookmark %s\n" | |||
|
8639 | msgstr "ブックマーク %s の取り込み中\n" | |||
|
8640 | ||||
8557 | msgid "push changes to the specified destination" |
|
8641 | msgid "push changes to the specified destination" | |
8558 | msgstr "指定リポジトリへの変更履歴の反映" |
|
8642 | msgstr "指定リポジトリへの変更履歴の反映" | |
8559 |
|
8643 | |||
@@ -8566,7 +8650,7 b' msgid ""' | |||||
8566 | " This operation is symmetrical to pull: it is identical to a pull\n" |
|
8650 | " This operation is symmetrical to pull: it is identical to a pull\n" | |
8567 | " in the destination repository from the current one." |
|
8651 | " in the destination repository from the current one." | |
8568 | msgstr "" |
|
8652 | msgstr "" | |
8569 |
" これは :hg:`pull` と対称的な操作です:連携先リポジトリにおいて、 |
|
8653 | " これは :hg:`pull` と対称的な操作です:連携先リポジトリにおいて、\n" | |
8570 | " 現リポジトリに対する :hg:`pull` を行った場合と同一の効果を持ちます。" |
|
8654 | " 現リポジトリに対する :hg:`pull` を行った場合と同一の効果を持ちます。" | |
8571 |
|
8655 | |||
8572 | msgid "" |
|
8656 | msgid "" | |
@@ -8621,6 +8705,22 b' msgstr ""' | |||||
8621 | msgid "pushing to %s\n" |
|
8705 | msgid "pushing to %s\n" | |
8622 | msgstr "%s への反映中\n" |
|
8706 | msgstr "%s への反映中\n" | |
8623 |
|
8707 | |||
|
8708 | #, python-format | |||
|
8709 | msgid "exporting bookmark %s\n" | |||
|
8710 | msgstr "ブックマーク %s の反映中\n" | |||
|
8711 | ||||
|
8712 | #, python-format | |||
|
8713 | msgid "deleting remote bookmark %s\n" | |||
|
8714 | msgstr "連携先のブックマーク %s の削除中\n" | |||
|
8715 | ||||
|
8716 | #, python-format | |||
|
8717 | msgid "bookmark %s does not exist on the local or remote repository!\n" | |||
|
8718 | msgstr "ブックマーク %s はいずれのリポジトリにも存在しません!\n" | |||
|
8719 | ||||
|
8720 | #, python-format | |||
|
8721 | msgid "updating bookmark %s failed!\n" | |||
|
8722 | msgstr "ブックマーク %s の更新に失敗!\n" | |||
|
8723 | ||||
8624 | msgid "roll back an interrupted transaction" |
|
8724 | msgid "roll back an interrupted transaction" | |
8625 | msgstr "中断されたトランザクションの取り消し" |
|
8725 | msgstr "中断されたトランザクションの取り消し" | |
8626 |
|
8726 | |||
@@ -8667,9 +8767,9 b' msgid ""' | |||||
8667 | " reported by :hg:`status`). The actions are Warn, Remove (from\n" |
|
8767 | " reported by :hg:`status`). The actions are Warn, Remove (from\n" | |
8668 | " branch) and Delete (from disk)::" |
|
8768 | " branch) and Delete (from disk)::" | |
8669 | msgstr "" |
|
8769 | msgstr "" | |
8670 |
" ファイルの状態(横)とオプション指定(縦)の組み合わせにおける挙動は、 |
|
8770 | " ファイルの状態(横)とオプション指定(縦)の組み合わせにおける挙動は、\n" | |
8671 | " 以下の一覧を参照してください。 ファイルの状態は、 :hg:`status` の表示\n" |
|
8771 | " 以下の一覧を参照してください。 ファイルの状態は、 :hg:`status` の表示\n" | |
8672 |
" に倣い、 追加(Added)[A]、 改変無し(Clean)[C]、 改変有り(Modified)[M] |
|
8772 | " に倣い、 追加(Added)[A]、 改変無し(Clean)[C]、 改変有り(Modified)[M]\n" | |
8673 | " および不在(Missing)[!] で表します。\n" |
|
8773 | " および不在(Missing)[!] で表します。\n" | |
8674 | " 挙動は、 警告(Warn)[W]、 構成管理からの登録除外(Remove)[R] および\n" |
|
8774 | " 挙動は、 警告(Warn)[W]、 構成管理からの登録除外(Remove)[R] および\n" | |
8675 | " 作業領域からの削除(Delete)[D] で表します::" |
|
8775 | " 作業領域からの削除(Delete)[D] で表します::" | |
@@ -8796,7 +8896,7 b' msgid ""' | |||||
8796 | " In the printed list, ``U`` = unresolved and ``R`` = resolved." |
|
8896 | " In the printed list, ``U`` = unresolved and ``R`` = resolved." | |
8797 | msgstr "" |
|
8897 | msgstr "" | |
8798 | " - :hg:`resolve -l`: 衝突が検出されたファイルの解消状況を表示します。\n" |
|
8898 | " - :hg:`resolve -l`: 衝突が検出されたファイルの解消状況を表示します。\n" | |
8799 |
" 一覧表示において `U`` は未解消(Unresolved)を、 |
|
8899 | " 一覧表示において `U`` は未解消(Unresolved)を、\n" | |
8800 | " ``R`` は解消済み(Resolved)を意味します。" |
|
8900 | " ``R`` は解消済み(Resolved)を意味します。" | |
8801 |
|
8901 | |||
8802 | msgid "" |
|
8902 | msgid "" | |
@@ -8805,7 +8905,7 b' msgid ""' | |||||
8805 | " commit after a conflicting merge." |
|
8905 | " commit after a conflicting merge." | |
8806 | msgstr "" |
|
8906 | msgstr "" | |
8807 | " 衝突未解消のファイルがある間はコミットできません。\n" |
|
8907 | " 衝突未解消のファイルがある間はコミットできません。\n" | |
8808 |
" マージにおける衝突解消の際には、 コミット前に |
|
8908 | " マージにおける衝突解消の際には、 コミット前に\n" | |
8809 | " :hg:`resolve -m ...` を実施してください。" |
|
8909 | " :hg:`resolve -m ...` を実施してください。" | |
8810 |
|
8910 | |||
8811 | msgid "" |
|
8911 | msgid "" | |
@@ -8840,7 +8940,7 b' msgstr ""' | |||||
8840 | " 本コマンドは、 あなたの期待するものと違う可能性が高いです。\n" |
|
8940 | " 本コマンドは、 あなたの期待するものと違う可能性が高いです。\n" | |
8841 | " 本コマンドは、 作業領域の親リビジョンはそのままで、 作業領域の\n" |
|
8941 | " 本コマンドは、 作業領域の親リビジョンはそのままで、 作業領域の\n" | |
8842 | " 一部を上書きします。\n" |
|
8942 | " 一部を上書きします。\n" | |
8843 |
" 作業領域の親リビジョンを変更する場合は :hg:`update -r rev` を、 |
|
8943 | " 作業領域の親リビジョンを変更する場合は :hg:`update -r rev` を、\n" | |
8844 | " 他のリビジョンとのマージを取り消す場合は\n" |
|
8944 | " 他のリビジョンとのマージを取り消す場合は\n" | |
8845 | " :hg:`update --clean .` を使用してください。" |
|
8945 | " :hg:`update --clean .` を使用してください。" | |
8846 |
|
8946 | |||
@@ -8855,7 +8955,7 b' msgstr ""' | |||||
8855 | " リビジョン指定が無い場合、 指定されたファイル/ディレクトリを作業\n" |
|
8955 | " リビジョン指定が無い場合、 指定されたファイル/ディレクトリを作業\n" | |
8856 | " 領域の親リビジョン時点の内容へと復旧します。 本コマンドは対象\n" |
|
8956 | " 領域の親リビジョン時点の内容へと復旧します。 本コマンドは対象\n" | |
8857 | " ファイルに対して、 状態を「改変無し」とし、 add/remove/copy/rename\n" |
|
8957 | " ファイルに対して、 状態を「改変無し」とし、 add/remove/copy/rename\n" | |
8858 |
" 実行の効果を打ち消します。 作業領域の親リビジョンが2つある場合は、 |
|
8958 | " 実行の効果を打ち消します。 作業領域の親リビジョンが2つある場合は、\n" | |
8859 | " どちらの内容で復旧するのかを明示的に指定する必要があります。" |
|
8959 | " どちらの内容で復旧するのかを明示的に指定する必要があります。" | |
8860 |
|
8960 | |||
8861 | msgid "" |
|
8961 | msgid "" | |
@@ -8864,7 +8964,7 b' msgid ""' | |||||
8864 | " to \"roll back\" some or all of an earlier change. See :hg:`help\n" |
|
8964 | " to \"roll back\" some or all of an earlier change. See :hg:`help\n" | |
8865 | " dates` for a list of formats valid for -d/--date." |
|
8965 | " dates` for a list of formats valid for -d/--date." | |
8866 | msgstr "" |
|
8966 | msgstr "" | |
8867 |
" -r/--rev が指定された場合、 指定されたファイル/ディレクトリを、 |
|
8967 | " -r/--rev が指定された場合、 指定されたファイル/ディレクトリを、\n" | |
8868 | " 指定されたリビジョン時点の内容へと復旧します。 以前の変更内容の一部\n" |
|
8968 | " 指定されたリビジョン時点の内容へと復旧します。 以前の変更内容の一部\n" | |
8869 | " ないし全部を取り消す用途にも使用できます。 -d/--date での日時表記は\n" |
|
8969 | " ないし全部を取り消す用途にも使用できます。 -d/--date での日時表記は\n" | |
8870 | " :hg:`help dates` を参照してください。" |
|
8970 | " :hg:`help dates` を参照してください。" | |
@@ -8906,6 +9006,9 b' msgstr ""' | |||||
8906 | msgid "you can't specify a revision and a date" |
|
9006 | msgid "you can't specify a revision and a date" | |
8907 | msgstr "リビジョンと日時は同時には指定出来ません" |
|
9007 | msgstr "リビジョンと日時は同時には指定出来ません" | |
8908 |
|
9008 | |||
|
9009 | msgid "uncommitted merge - use \"hg update\", see \"hg help revert\"" | |||
|
9010 | msgstr "マージが未コミットです(\"hg update\" 実施又は \"hg help revert\" 参照)" | |||
|
9011 | ||||
8909 | msgid "no files or directories specified; use --all to revert the whole repo" |
|
9012 | msgid "no files or directories specified; use --all to revert the whole repo" | |
8910 | msgstr "復旧には、 ファイル/ディレクトリか、 --all を指定してください" |
|
9013 | msgstr "復旧には、 ファイル/ディレクトリか、 --all を指定してください" | |
8911 |
|
9014 | |||
@@ -8956,7 +9059,7 b' msgid ""' | |||||
8956 | msgstr "" |
|
9059 | msgstr "" | |
8957 | " トランザクションとは、 新規リビジョンの作成、 ないし外部からの既存\n" |
|
9060 | " トランザクションとは、 新規リビジョンの作成、 ないし外部からの既存\n" | |
8958 | " リビジョンの取り込みにおけるコマンドの改変操作を一括化するものです。\n" |
|
9061 | " リビジョンの取り込みにおけるコマンドの改変操作を一括化するものです。\n" | |
8959 |
" 例えば、 以下のコマンドはいずれもトランザクションを形成するもので、 |
|
9062 | " 例えば、 以下のコマンドはいずれもトランザクションを形成するもので、\n" | |
8960 | " その効果は本コマンドにより巻き戻し可能です:" |
|
9063 | " その効果は本コマンドにより巻き戻し可能です:" | |
8961 |
|
9064 | |||
8962 | msgid "" |
|
9065 | msgid "" | |
@@ -9005,14 +9108,14 b' msgstr "\xe7\x8b\xac\xe7\xab\x8b\xe3\x81\x97\xe3\x81\x9f\xe3\x82\xa6\xe3\x82\xa7\xe3\x83\x96\xe3\x82\xb5\xe3\x83\xbc\xe3\x83\x90\xe3\x81\xae\xe5\xae\x9f\xe8\xa1\x8c\xe9\x96\x8b\xe5\xa7\x8b"' | |||||
9005 |
|
9108 | |||
9006 | msgid "" |
|
9109 | msgid "" | |
9007 | " Start a local HTTP repository browser and pull server. You can use\n" |
|
9110 | " Start a local HTTP repository browser and pull server. You can use\n" | |
9008 | " this for ad-hoc sharing and browing of repositories. It is\n" |
|
9111 | " this for ad-hoc sharing and browsing of repositories. It is\n" | |
9009 | " recommended to use a real web server to serve a repository for\n" |
|
9112 | " recommended to use a real web server to serve a repository for\n" | |
9010 | " longer periods of time." |
|
9113 | " longer periods of time." | |
9011 | msgstr "" |
|
9114 | msgstr "" | |
9012 | " リポジトリ参照と :hg:`pull` のための HTTP サーバを起動します。\n" |
|
9115 | " リポジトリ参照と :hg:`pull` のための HTTP サーバを起動します。\n" | |
9013 |
" この HTTP サーバを用いることで、 |
|
9116 | " この HTTP サーバを用いることで、 リポジトリの共有/参照を、\n" | |
9014 |
" 行うことができます。 リポジトリを長期間公開する際には、 |
|
9117 | " 即席で行うことができます。 リポジトリを長期間公開する際には、\n" | |
9015 | " サーバの使用をお勧めします。" |
|
9118 | " 通常のウェブサーバの使用をお勧めします。" | |
9016 |
|
9119 | |||
9017 | msgid "" |
|
9120 | msgid "" | |
9018 | " Please note that the server does not implement access control.\n" |
|
9121 | " Please note that the server does not implement access control.\n" | |
@@ -9033,7 +9136,7 b' msgid ""' | |||||
9033 | " files." |
|
9136 | " files." | |
9034 | msgstr "" |
|
9137 | msgstr "" | |
9035 | " 特に指定が無い場合、 サーバはアクセスログを標準出力に、 エラーを\n" |
|
9138 | " 特に指定が無い場合、 サーバはアクセスログを標準出力に、 エラーを\n" | |
9036 |
" 標準エラー出力に表示します。 ログをファイルに記録する場合は、 |
|
9139 | " 標準エラー出力に表示します。 ログをファイルに記録する場合は、\n" | |
9037 | " -A/--accesslog や -E/--errorlog で指定します。" |
|
9140 | " -A/--accesslog や -E/--errorlog で指定します。" | |
9038 |
|
9141 | |||
9039 | msgid "" |
|
9142 | msgid "" | |
@@ -9062,12 +9165,12 b' msgid ""' | |||||
9062 | " Unless options described with \"show only ...\" are given, the\n" |
|
9165 | " Unless options described with \"show only ...\" are given, the\n" | |
9063 | " options -mardu are used." |
|
9166 | " options -mardu are used." | |
9064 | msgstr "" |
|
9167 | msgstr "" | |
9065 |
" 作業領域のファイル状態を表示します。 名前(パターン)指定のある場合、 |
|
9168 | " 作業領域のファイル状態を表示します。 名前(パターン)指定のある場合、\n" | |
9066 |
" その名前に合致するファイルのみが表示されます。 変更無し(clean)、 |
|
9169 | " その名前に合致するファイルのみが表示されます。 変更無し(clean)、\n" | |
9067 |
" 無視(ignored)ないし複製(copy)・改名(rename)の元ファイルに関しては、 |
|
9170 | " 無視(ignored)ないし複製(copy)・改名(rename)の元ファイルに関しては、\n" | |
9068 |
" それぞれ -c/--clean、 -i/--ignored ないし -C/--copy が指定されるか、 |
|
9171 | " それぞれ -c/--clean、 -i/--ignored ないし -C/--copy が指定されるか、\n" | |
9069 | " あるいは -A/--all が指定されない限り表示されません。\n" |
|
9172 | " あるいは -A/--all が指定されない限り表示されません。\n" | |
9070 |
" いずれの表示対象選択オプションも指定されない場合、 |
|
9173 | " いずれの表示対象選択オプションも指定されない場合、\n" | |
9071 | " -m -a -r -d -u が指定されたものとみなします。" |
|
9174 | " -m -a -r -d -u が指定されたものとみなします。" | |
9072 |
|
9175 | |||
9073 | msgid "" |
|
9176 | msgid "" | |
@@ -9087,7 +9190,7 b' msgstr ""' | |||||
9087 | " .. note::\n" |
|
9190 | " .. note::\n" | |
9088 | " 権限設定の変更やマージが行われた場合、 差分表示から期待される\n" |
|
9191 | " 権限設定の変更やマージが行われた場合、 差分表示から期待される\n" | |
9089 | " 結果とは異なる状態が表示される可能性があります。\n" |
|
9192 | " 結果とは異なる状態が表示される可能性があります。\n" | |
9090 |
" 標準的な差分形式は権限変更の情報を含みませんし、 |
|
9193 | " 標準的な差分形式は権限変更の情報を含みませんし、\n" | |
9091 | " マージ実施リビジョンに対しては、 一方の親リビジョンとの差分\n" |
|
9194 | " マージ実施リビジョンに対しては、 一方の親リビジョンとの差分\n" | |
9092 | " しか表示しないためです。" |
|
9195 | " しか表示しないためです。" | |
9093 |
|
9196 | |||
@@ -9193,7 +9296,7 b' msgstr "\xe8\xa1\x9d\xe7\xaa\x81\xe6\x9c\xaa\xe8\xa7\xa3\xe6\xb1\xba\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab %d"' | |||||
9193 |
|
9296 | |||
9194 | #, python-format |
|
9297 | #, python-format | |
9195 | msgid "%d subrepos" |
|
9298 | msgid "%d subrepos" | |
9196 |
msgstr " |
|
9299 | msgstr "副リポジトリ数 %d" | |
9197 |
|
9300 | |||
9198 | msgid " (merge)" |
|
9301 | msgid " (merge)" | |
9199 | msgstr " (マージ)" |
|
9302 | msgstr " (マージ)" | |
@@ -9226,11 +9329,19 b' msgid "update: %d new changesets, %d bra' | |||||
9226 | msgstr "update 候補 : %d の新規リビジョン、 %d のブランチヘッド(マージ)\n" |
|
9329 | msgstr "update 候補 : %d の新規リビジョン、 %d のブランチヘッド(マージ)\n" | |
9227 |
|
9330 | |||
9228 | msgid "1 or more incoming" |
|
9331 | msgid "1 or more incoming" | |
9229 | msgstr "1つ以上のリビジョンの取り込み" |
|
9332 | msgstr "取り込み対象リビジョン(incoming)あり" | |
9230 |
|
9333 | |||
9231 | #, python-format |
|
9334 | #, python-format | |
9232 | msgid "%d outgoing" |
|
9335 | msgid "%d outgoing" | |
9233 |
msgstr "%d 個の |
|
9336 | msgstr "%d 個の反映候補リビジョン(outgoing)" | |
|
9337 | ||||
|
9338 | #, python-format | |||
|
9339 | msgid "%d incoming bookmarks" | |||
|
9340 | msgstr "%d 個の取り込み候補ブックマーク(incoming)" | |||
|
9341 | ||||
|
9342 | #, python-format | |||
|
9343 | msgid "%d outgoing bookmarks" | |||
|
9344 | msgstr "%d 個の更新候補ブックマーク(outgoing)" | |||
9234 |
|
9345 | |||
9235 | #, python-format |
|
9346 | #, python-format | |
9236 | msgid "remote: %s\n" |
|
9347 | msgid "remote: %s\n" | |
@@ -9248,38 +9359,54 b' msgstr " \xe7\x89\xb9\xe5\xae\x9a\xe3\x81\xae\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xab\xe3\x80\x81 \xe6\x8c\x87\xe5\xae\x9a\xe3\x81\x95\xe3\x82\x8c\xe3\x81\x9f\xe5\x90\x8d\xe5\x89\x8d\xe3\x82\x92\xe4\xbb\x98\xe3\x81\x91\xe3\x81\xbe\xe3\x81\x99\xe3\x80\x82"' | |||||
9248 | msgid "" |
|
9359 | msgid "" | |
9249 | " Tags are used to name particular revisions of the repository and are\n" |
|
9360 | " Tags are used to name particular revisions of the repository and are\n" | |
9250 | " very useful to compare different revisions, to go back to significant\n" |
|
9361 | " very useful to compare different revisions, to go back to significant\n" | |
9251 | " earlier versions or to mark branch points as releases, etc." |
|
9362 | " earlier versions or to mark branch points as releases, etc. Changing\n" | |
9252 | msgstr "" |
|
9363 | " an existing tag is normally disallowed; use -f/--force to override." | |
9253 | " リポジトリ中の特定のリビジョンに付けられた名前であるタグは、 リビジョン\n" |
|
9364 | msgstr "" | |
9254 | " 間での比較や、 重要なリビジョンの参照、 又はリリースの際の分岐点に対す" |
|
9365 | " タグの用途は、 リポジトリ中の特定リビジョンへの名前付けであり、\n" | |
9255 | "る\n" |
|
9366 | " リビジョン間での比較や、 重要なリビジョンの参照、\n" | |
9256 | " 目印といった用途などに使用することが出来ます。" |
|
9367 | " リリース時の分岐点に対する目印、 などの用途に使用出来ます。\n" | |
|
9368 | " 既存タグの改変は、 通常では出来ません。 -f/--force の指定が必要です" | |||
9257 |
|
9369 | |||
9258 | msgid "" |
|
9370 | msgid "" | |
9259 | " If no revision is given, the parent of the working directory is\n" |
|
9371 | " If no revision is given, the parent of the working directory is\n" | |
9260 | " used, or tip if no revision is checked out." |
|
9372 | " used, or tip if no revision is checked out." | |
9261 | msgstr "" |
|
9373 | msgstr "" | |
9262 |
" リビジョンが指定されない場合、 作業領域の親リビジョン |
|
9374 | " 対象リビジョンが指定されない場合、 作業領域の親リビジョンが\n" | |
9263 | "前\n" |
|
9375 | " (作業領域更新前なら tip が) タグ付けの対象となります。" | |
9264 | " なら tip がタグ付けの対象となります。" |
|
|||
9265 |
|
9376 | |||
9266 | msgid "" |
|
9377 | msgid "" | |
9267 | " To facilitate version control, distribution, and merging of tags,\n" |
|
9378 | " To facilitate version control, distribution, and merging of tags,\n" | |
9268 | " they are stored as a file named \".hgtags\" which is managed\n" |
|
9379 | " they are stored as a file named \".hgtags\" which is managed similarly\n" | |
9269 |
" |
|
9380 | " to other project files and can be hand-edited if necessary. This\n" | |
9270 | " necessary. The file '.hg/localtags' is used for local tags (not\n" |
|
9381 | " also means that tagging creates a new commit. The file\n" | |
9271 | " shared among repositories)." |
|
9382 | " \".hg/localtags\" is used for local tags (not shared among\n" | |
9272 | msgstr "" |
|
9383 | " repositories)." | |
9273 | " 分散構成管理におけるタグ付けの集約を容易にするために、 構成管理下にある\n" |
|
9384 | msgstr "" | |
9274 | " 他のファイルと同様に、 タグの情報は \".hgtags\" ファイルで管理され、 \n" |
|
9385 | " 分散構成管理におけるタグ付けの集約を容易にするために、\n" | |
9275 | " 必要であれば手動での編集も可能です。 ローカルタグは '.hg/localtags' で\n" |
|
9386 | " 構成管理下にある他のファイルと同様に、\n" | |
9276 | " 管理されます(リポジトリ間で共有されることはありません)" |
|
9387 | " タグの情報は \".hgtags\" ファイルで管理され、\n" | |
|
9388 | " 必要であれば手動での編集も可能です。\n" | |||
|
9389 | " これは、 タグ付け操作が、 コミット処理を伴うことを意味します。\n" | |||
|
9390 | " ローカルタグは '.hg/localtags' で管理されます\n" | |||
|
9391 | " (リポジトリ間で共有されることはありません)" | |||
|
9392 | ||||
|
9393 | msgid "" | |||
|
9394 | " Tag commits are usually made at the head of a branch. If the parent\n" | |||
|
9395 | " of the working directory is not a branch head, :hg:`tag` aborts; use\n" | |||
|
9396 | " -f/--force to force the tag commit to be based on a non-head\n" | |||
|
9397 | " changeset." | |||
|
9398 | msgstr "" | |||
|
9399 | " タグ付け操作は、 ブランチのヘッドにおいて実施されるのが一般的です。\n" | |||
|
9400 | " 作業領域の親リビジョンが、 ブランチのヘッドでは無い場合、\n" | |||
|
9401 | " :hg:`tag` 実行は中断されます。\n" | |||
|
9402 | " ヘッド以外のリビジョンにおいて、 タグ付けを実施する場合は、\n" | |||
|
9403 | " -f/--force を指定してください。" | |||
9277 |
|
9404 | |||
9278 | msgid "" |
|
9405 | msgid "" | |
9279 | " Since tag names have priority over branch names during revision\n" |
|
9406 | " Since tag names have priority over branch names during revision\n" | |
9280 | " lookup, using an existing branch name as a tag name is discouraged." |
|
9407 | " lookup, using an existing branch name as a tag name is discouraged." | |
9281 | msgstr "" |
|
9408 | msgstr "" | |
9282 |
" リビジョン特定において、 タグ名はブランチ名よりも優先度が高いので、 |
|
9409 | " リビジョン特定において、 タグ名はブランチ名よりも優先度が高いので、\n" | |
9283 | " 既存ブランチと同名のタグの使用は止めましょう。" |
|
9410 | " 既存ブランチと同名のタグの使用は止めましょう。" | |
9284 |
|
9411 | |||
9285 | msgid "tag names must be unique" |
|
9412 | msgid "tag names must be unique" | |
@@ -9307,6 +9434,12 b' msgstr "\xe3\x82\xbf\xe3\x82\xb0 \'%s\' \xe3\x81\xaf\xe3\x83\xad\xe3\x83\xbc\xe3\x82\xab\xe3\x83\xab\xe3\x81\xaa\xe3\x82\xbf\xe3\x82\xb0\xe3\x81\xa7\xe3\x81\xaf\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
9307 | msgid "tag '%s' already exists (use -f to force)" |
|
9434 | msgid "tag '%s' already exists (use -f to force)" | |
9308 | msgstr "タグ '%s' は存在します(強制実行する場合は -f を指定してください)" |
|
9435 | msgstr "タグ '%s' は存在します(強制実行する場合は -f を指定してください)" | |
9309 |
|
9436 | |||
|
9437 | msgid "uncommitted merge" | |||
|
9438 | msgstr "マージが未コミットです" | |||
|
9439 | ||||
|
9440 | msgid "not at a branch head (use -f to force)" | |||
|
9441 | msgstr "親リビジョンがブランチのヘッドではありません(強制実行は -f 指定)" | |||
|
9442 | ||||
9310 | msgid "list repository tags" |
|
9443 | msgid "list repository tags" | |
9311 | msgstr "リポジトリ中のタグ一覧の表示" |
|
9444 | msgstr "リポジトリ中のタグ一覧の表示" | |
9312 |
|
9445 | |||
@@ -9375,8 +9508,8 b' msgid ""' | |||||
9375 | " found, the working directory is updated to the specified\n" |
|
9508 | " found, the working directory is updated to the specified\n" | |
9376 | " changeset." |
|
9509 | " changeset." | |
9377 | msgstr "" |
|
9510 | msgstr "" | |
9378 |
" 指定リビジョンが、 作業領域の親リビジョンの直系の子孫でない場合、 |
|
9511 | " 指定リビジョンが、 作業領域の親リビジョンの直系の子孫でない場合、\n" | |
9379 |
" 作業領域の更新は中断されます。 -c/--check が指定された場合、 |
|
9512 | " 作業領域の更新は中断されます。 -c/--check が指定された場合、\n" | |
9380 | " 作業領域中の未コミット変更の有無を確認し、 変更が無かった場合には\n" |
|
9513 | " 作業領域中の未コミット変更の有無を確認し、 変更が無かった場合には\n" | |
9381 | " 作業領域を指定リビジョンで更新します。" |
|
9514 | " 作業領域を指定リビジョンで更新します。" | |
9382 |
|
9515 | |||
@@ -9396,8 +9529,8 b' msgid ""' | |||||
9396 | " are preserved." |
|
9529 | " are preserved." | |
9397 | msgstr "" |
|
9530 | msgstr "" | |
9398 | " 1. -c/--check と -C/--clean のいずれも指定されず、 指定リビジョンが\n" |
|
9531 | " 1. -c/--check と -C/--clean のいずれも指定されず、 指定リビジョンが\n" | |
9399 |
" 作業領域の親リビジョンにとって直系の先祖ないし子孫であった場合、 |
|
9532 | " 作業領域の親リビジョンにとって直系の先祖ないし子孫であった場合、\n" | |
9400 |
" 未コミット変更の内容は指定リビジョンへとマージされ、 |
|
9533 | " 未コミット変更の内容は指定リビジョンへとマージされ、\n" | |
9401 | " マージ結果は未コミットのまま作業領域に残ります。\n" |
|
9534 | " マージ結果は未コミットのまま作業領域に残ります。\n" | |
9402 | " 別の(名前無し)ブランチ上にあるリビジョンなど、 直系の先祖/子孫\n" |
|
9535 | " 別の(名前無し)ブランチ上にあるリビジョンなど、 直系の先祖/子孫\n" | |
9403 | " 以外が指定された場合、 更新は中断され、 未コミット変更は残ります。" |
|
9536 | " 以外が指定された場合、 更新は中断され、 未コミット変更は残ります。" | |
@@ -9413,7 +9546,7 b' msgid ""' | |||||
9413 | " 3. With the -C/--clean option, uncommitted changes are discarded and\n" |
|
9546 | " 3. With the -C/--clean option, uncommitted changes are discarded and\n" | |
9414 | " the working directory is updated to the requested changeset." |
|
9547 | " the working directory is updated to the requested changeset." | |
9415 | msgstr "" |
|
9548 | msgstr "" | |
9416 |
" 3. -C/--clean が指定された場合、 未コミット変更は破棄され、 |
|
9549 | " 3. -C/--clean が指定された場合、 未コミット変更は破棄され、\n" | |
9417 | " 作業領域は指定のリビジョンで更新されます。" |
|
9550 | " 作業領域は指定のリビジョンで更新されます。" | |
9418 |
|
9551 | |||
9419 | msgid "" |
|
9552 | msgid "" | |
@@ -9427,7 +9560,7 b' msgid ""' | |||||
9427 | " If you want to update just one file to an older changeset, use\n" |
|
9560 | " If you want to update just one file to an older changeset, use\n" | |
9428 | " :hg:`revert`." |
|
9561 | " :hg:`revert`." | |
9429 | msgstr "" |
|
9562 | msgstr "" | |
9430 |
" 特定のファイルだけを以前の状態に戻す場合は :hg:`revert` |
|
9563 | " 特定のファイルだけを以前の状態に戻す場合は :hg:`revert`\n" | |
9431 | " を使用してください。" |
|
9564 | " を使用してください。" | |
9432 |
|
9565 | |||
9433 | msgid "cannot specify both -c/--check and -C/--clean" |
|
9566 | msgid "cannot specify both -c/--check and -C/--clean" | |
@@ -9516,7 +9649,7 b' msgid "set the charset encoding mode"' | |||||
9516 | msgstr "文字エンコーディングのモード設定" |
|
9649 | msgstr "文字エンコーディングのモード設定" | |
9517 |
|
9650 | |||
9518 | msgid "always print a traceback on exception" |
|
9651 | msgid "always print a traceback on exception" | |
9519 |
msgstr "例外 |
|
9652 | msgstr "例外発生の際に常にトレースバックを表示" | |
9520 |
|
9653 | |||
9521 | msgid "time how long the command takes" |
|
9654 | msgid "time how long the command takes" | |
9522 | msgstr "コマンド実行の所要時間を計測" |
|
9655 | msgstr "コマンド実行の所要時間を計測" | |
@@ -9539,6 +9672,9 b' msgstr "SSH \xe9\x80\xa3\xe6\x90\xba\xe3\x81\xa7\xe4\xbd\xbf\xe7\x94\xa8\xe3\x81\x99\xe3\x82\x8b ssh \xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89"' | |||||
9539 | msgid "specify hg command to run on the remote side" |
|
9672 | msgid "specify hg command to run on the remote side" | |
9540 | msgstr "遠隔ホスト側で実行される hg コマンド" |
|
9673 | msgstr "遠隔ホスト側で実行される hg コマンド" | |
9541 |
|
9674 | |||
|
9675 | msgid "do not verify server certificate (ignoring web.cacerts config)" | |||
|
9676 | msgstr "サーバ証明書の検証省略(web.cacerts 設定の無視)" | |||
|
9677 | ||||
9542 | msgid "PATTERN" |
|
9678 | msgid "PATTERN" | |
9543 | msgstr "パターン" |
|
9679 | msgstr "パターン" | |
9544 |
|
9680 | |||
@@ -9695,6 +9831,18 b' msgstr "\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xab\xe3\x82\x88\xe3\x82\x8b\xe4\xbd\x9c\xe6\xa5\xad\xe9\xa0\x98\xe5\x9f\x9f\xe5\x86\x85\xe5\xae\xb9\xe3\x81\xae\xe6\x9b\xb4\xe6\x96\xb0\xe3\x82\x92\xe6\x8a\x91\xe6\xad\xa2"' | |||||
9695 | msgid "[-gbsr] [-U] [-c CMD] [REV]" |
|
9831 | msgid "[-gbsr] [-U] [-c CMD] [REV]" | |
9696 | msgstr "[-gbsr] [-U] [-c CMD] [REV]" |
|
9832 | msgstr "[-gbsr] [-U] [-c CMD] [REV]" | |
9697 |
|
9833 | |||
|
9834 | msgid "force" | |||
|
9835 | msgstr "強制実施" | |||
|
9836 | ||||
|
9837 | msgid "delete a given bookmark" | |||
|
9838 | msgstr "指定ブックマークの削除" | |||
|
9839 | ||||
|
9840 | msgid "rename a given bookmark" | |||
|
9841 | msgstr "指定ブックマークの改名" | |||
|
9842 | ||||
|
9843 | msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" | |||
|
9844 | msgstr "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" | |||
|
9845 | ||||
9698 | msgid "set branch name even if it shadows an existing branch" |
|
9846 | msgid "set branch name even if it shadows an existing branch" | |
9699 | msgstr "同名既存ブランチが存在する場合でもブランチ作成を実施" |
|
9847 | msgstr "同名既存ブランチが存在する場合でもブランチ作成を実施" | |
9700 |
|
9848 | |||
@@ -9830,6 +9978,9 b' msgstr "FILE REV"' | |||||
9830 | msgid "[PATH]" |
|
9978 | msgid "[PATH]" | |
9831 | msgstr "[PATH]" |
|
9979 | msgstr "[PATH]" | |
9832 |
|
9980 | |||
|
9981 | msgid "revlog format" | |||
|
9982 | msgstr "" | |||
|
9983 | ||||
9833 | msgid "REPO NAMESPACE [KEY OLD NEW]" |
|
9984 | msgid "REPO NAMESPACE [KEY OLD NEW]" | |
9834 | msgstr "REPO NAMESPACE [KEY OLD NEW]" |
|
9985 | msgstr "REPO NAMESPACE [KEY OLD NEW]" | |
9835 |
|
9986 | |||
@@ -9970,6 +10121,9 b' msgstr "\xe3\x83\x90\xe3\x83\xb3\xe3\x83\x89\xe3\x83\xab\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xae\xe6\x9b\xb8\xe3\x81\x8d\xe5\x87\xba\xe3\x81\x97\xe5\x85\x88"' | |||||
9970 | msgid "a remote changeset intended to be added" |
|
10121 | msgid "a remote changeset intended to be added" | |
9971 | msgstr "取り込み対象リビジョン" |
|
10122 | msgstr "取り込み対象リビジョン" | |
9972 |
|
10123 | |||
|
10124 | msgid "compare bookmarks" | |||
|
10125 | msgstr "ブックマークの比較" | |||
|
10126 | ||||
9973 | msgid "a specific branch you would like to pull" |
|
10127 | msgid "a specific branch you would like to pull" | |
9974 | msgstr "取り込み対象ブランチ" |
|
10128 | msgstr "取り込み対象ブランチ" | |
9975 |
|
10129 | |||
@@ -10066,12 +10220,21 b' msgstr "\xe6\x96\xb0\xe8\xa6\x8f\xe5\x8f\x96\xe3\x82\x8a\xe8\xbe\xbc\xe3\x81\xbf\xe3\x81\xae\xe9\x9a\x9b\xe3\x81\xab\xe3\x81\xaf\xe4\xbd\x9c\xe6\xa5\xad\xe9\xa0\x98\xe5\x9f\x9f\xe3\x82\x92\xe6\x96\xb0\xe8\xa6\x8f\xe3\x81\xae\xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81\xe3\x83\x98\xe3\x83\x83\xe3\x83\x89\xe3\x81\xa7\xe6\x9b\xb4\xe6\x96\xb0"' | |||||
10066 | msgid "run even when remote repository is unrelated" |
|
10220 | msgid "run even when remote repository is unrelated" | |
10067 | msgstr "連携先が無関係なリポジトリでも実行" |
|
10221 | msgstr "連携先が無関係なリポジトリでも実行" | |
10068 |
|
10222 | |||
|
10223 | msgid "BOOKMARK" | |||
|
10224 | msgstr "ブックマーク" | |||
|
10225 | ||||
|
10226 | msgid "bookmark to pull" | |||
|
10227 | msgstr "取り込み対象ブックマーク" | |||
|
10228 | ||||
10069 | msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" |
|
10229 | msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" | |
10070 | msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" |
|
10230 | msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" | |
10071 |
|
10231 | |||
10072 | msgid "force push" |
|
10232 | msgid "force push" | |
10073 | msgstr "反映先にヘッドが増える場合でも実施" |
|
10233 | msgstr "反映先にヘッドが増える場合でも実施" | |
10074 |
|
10234 | |||
|
10235 | msgid "bookmark to push" | |||
|
10236 | msgstr "反映対象ブックマーク" | |||
|
10237 | ||||
10075 | msgid "allow pushing a new branch" |
|
10238 | msgid "allow pushing a new branch" | |
10076 | msgstr "新規ブランチの反映を許可" |
|
10239 | msgstr "新規ブランチの反映を許可" | |
10077 |
|
10240 | |||
@@ -10207,8 +10370,8 b' msgstr "\xe5\xbd\x93\xe8\xa9\xb2\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xa8\xe3\x81\xae\xe5\xb7\xae\xe5\x88\x86\xe3\x81\xa7\xe7\x8a\xb6\xe6\x85\x8b\xe3\x82\x92\xe5\x88\xa4\xe5\xae\x9a"' | |||||
10207 | msgid "list the changed files of a revision" |
|
10370 | msgid "list the changed files of a revision" | |
10208 | msgstr "指定リビジョンにおける更新ファイルの一覧" |
|
10371 | msgstr "指定リビジョンにおける更新ファイルの一覧" | |
10209 |
|
10372 | |||
10210 |
msgid "r |
|
10373 | msgid "force tag" | |
10211 |
msgstr " |
|
10374 | msgstr "タグ付けの強制実施" | |
10212 |
|
10375 | |||
10213 | msgid "make the tag local" |
|
10376 | msgid "make the tag local" | |
10214 | msgstr "ローカルタグとして作成" |
|
10377 | msgstr "ローカルタグとして作成" | |
@@ -10394,7 +10557,7 b' msgid "you should pull and merge or use ' | |||||
10394 | msgstr "pull と merge を実施するか、 push -f で強制実行してください" |
|
10557 | msgstr "pull と merge を実施するか、 push -f で強制実行してください" | |
10395 |
|
10558 | |||
10396 | msgid "did you forget to merge? use push -f to force" |
|
10559 | msgid "did you forget to merge? use push -f to force" | |
10397 |
msgstr "マージは済んでいますか |
|
10560 | msgstr "マージは済んでいますか? push -f で強制実行できます" | |
10398 |
|
10561 | |||
10399 | msgid "note: unsynced remote changes!\n" |
|
10562 | msgid "note: unsynced remote changes!\n" | |
10400 | msgstr "注意: 連携先での変更点が取り込まれていません!\n" |
|
10563 | msgstr "注意: 連携先での変更点が取り込まれていません!\n" | |
@@ -10469,10 +10632,10 b' msgid "hg: unknown command \'%s\'\\n"' | |||||
10469 | msgstr "hg: 未知のコマンド '%s'\n" |
|
10632 | msgstr "hg: 未知のコマンド '%s'\n" | |
10470 |
|
10633 | |||
10471 | msgid "(did you forget to compile extensions?)\n" |
|
10634 | msgid "(did you forget to compile extensions?)\n" | |
10472 |
msgstr "(エクステンションのコンパイルを忘れていませんか |
|
10635 | msgstr "(エクステンションのコンパイルを忘れていませんか?)\n" | |
10473 |
|
10636 | |||
10474 | msgid "(is your Python install correct?)\n" |
|
10637 | msgid "(is your Python install correct?)\n" | |
10475 |
msgstr "(Python は正しくインストールされていますか |
|
10638 | msgstr "(Python は正しくインストールされていますか?)\n" | |
10476 |
|
10639 | |||
10477 | #, python-format |
|
10640 | #, python-format | |
10478 | msgid "abort: error: %s\n" |
|
10641 | msgid "abort: error: %s\n" | |
@@ -10495,7 +10658,7 b' msgid "abort: out of memory\\n"' | |||||
10495 | msgstr "中断: メモリ不足\n" |
|
10658 | msgstr "中断: メモリ不足\n" | |
10496 |
|
10659 | |||
10497 | msgid "** unknown exception encountered, please report by visiting\n" |
|
10660 | msgid "** unknown exception encountered, please report by visiting\n" | |
10498 |
msgstr "** 予期せぬ例外が |
|
10661 | msgstr "** 予期せぬ例外が発生しました\n" | |
10499 |
|
10662 | |||
10500 | msgid "** http://mercurial.selenic.com/wiki/BugTracker\n" |
|
10663 | msgid "** http://mercurial.selenic.com/wiki/BugTracker\n" | |
10501 | msgstr "" |
|
10664 | msgstr "" | |
@@ -10520,6 +10683,11 b' msgstr "\'%s\' \xe3\x82\x92\xe5\x88\xa5\xe5\x90\x8d\xe3\x81\xab\xe6\x8c\x81\xe3\x81\xa4\xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89\xe3\x81\xaf\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93\\n"' | |||||
10520 |
|
10683 | |||
10521 | #, python-format |
|
10684 | #, python-format | |
10522 | msgid "" |
|
10685 | msgid "" | |
|
10686 | "No argument found for substitution of %i variable in alias '%s' definition." | |||
|
10687 | msgstr "%i 変数の置換に対応する引数がありません(別名 '%s' 定義)" | |||
|
10688 | ||||
|
10689 | #, python-format | |||
|
10690 | msgid "" | |||
10523 | "error in definition for alias '%s': %s may only be given on the command " |
|
10691 | "error in definition for alias '%s': %s may only be given on the command " | |
10524 | "line\n" |
|
10692 | "line\n" | |
10525 | msgstr "別名定義 '%s' のエラー: %s はコマンド行での直接指定限定です\n" |
|
10693 | msgstr "別名定義 '%s' のエラー: %s はコマンド行での直接指定限定です\n" | |
@@ -10578,7 +10746,7 b' msgid ""' | |||||
10578 | "misc/lsprof/" |
|
10746 | "misc/lsprof/" | |
10579 | msgstr "" |
|
10747 | msgstr "" | |
10580 | "lsprof が利用できません - http://codespeak.net/svn/user/arigo/hack/misc/" |
|
10748 | "lsprof が利用できません - http://codespeak.net/svn/user/arigo/hack/misc/" | |
10581 | "lsprof/からインストールしてください" |
|
10749 | "lsprof/ からインストールしてください" | |
10582 |
|
10750 | |||
10583 | #, python-format |
|
10751 | #, python-format | |
10584 | msgid "*** failed to import extension %s from %s: %s\n" |
|
10752 | msgid "*** failed to import extension %s from %s: %s\n" | |
@@ -10589,6 +10757,10 b' msgid "*** failed to import extension %s' | |||||
10589 | msgstr "*** %s のインポートに失敗: %s\n" |
|
10757 | msgstr "*** %s のインポートに失敗: %s\n" | |
10590 |
|
10758 | |||
10591 | #, python-format |
|
10759 | #, python-format | |
|
10760 | msgid "warning: error finding commands in %s\n" | |||
|
10761 | msgstr "警告: ファイル %s でのコマンド解析中にエラー発生\n" | |||
|
10762 | ||||
|
10763 | #, python-format | |||
10592 | msgid "couldn't find merge tool %s\n" |
|
10764 | msgid "couldn't find merge tool %s\n" | |
10593 | msgstr "マージツール %s が見つかりません\n" |
|
10765 | msgstr "マージツール %s が見つかりません\n" | |
10594 |
|
10766 | |||
@@ -10610,7 +10782,7 b' msgid ""' | |||||
10610 | "keep (l)ocal or take (o)ther?" |
|
10782 | "keep (l)ocal or take (o)ther?" | |
10611 | msgstr "" |
|
10783 | msgstr "" | |
10612 | " %s のマージに適切なツールが見つかりません\n" |
|
10784 | " %s のマージに適切なツールが見つかりません\n" | |
10613 |
"ど |
|
10785 | "どちらの内容を採用しますか? 作業領域:(l)ocal マージ対象:(o)ther" | |
10614 |
|
10786 | |||
10615 | msgid "&Local" |
|
10787 | msgid "&Local" | |
10616 | msgstr "&Local" |
|
10788 | msgstr "&Local" | |
@@ -10632,7 +10804,7 b' msgstr "%s.premerge \xe3\x81\xaf\xe7\x84\xa1\xe5\x8a\xb9\xe3\x81\xa7\xe3\x81\x99(\'%s\' \xe3\x81\xaf\xe7\x9c\x9f\xe5\x81\xbd\xe3\x81\xaa\xe3\x81\x84\xe3\x81\x97 %s \xe3\x81\xae\xe3\x81\x84\xe3\x81\x9a\xe3\x82\x8c\xe3\x81\xa7\xe3\x82\x82\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93)"' | |||||
10632 |
|
10804 | |||
10633 | #, python-format |
|
10805 | #, python-format | |
10634 | msgid "was merge of '%s' successful (yn)?" |
|
10806 | msgid "was merge of '%s' successful (yn)?" | |
10635 | msgstr "'%s' のマージは成功しましたか?(y/n) " |
|
10807 | msgstr "'%s' のマージは成功しましたか? (y/n) " | |
10636 |
|
10808 | |||
10637 | #, python-format |
|
10809 | #, python-format | |
10638 | msgid "" |
|
10810 | msgid "" | |
@@ -10640,7 +10812,7 b' msgid ""' | |||||
10640 | "was merge successful (yn)?" |
|
10812 | "was merge successful (yn)?" | |
10641 | msgstr "" |
|
10813 | msgstr "" | |
10642 | " マージ結果ファイル %s は未変更に見えます\n" |
|
10814 | " マージ結果ファイル %s は未変更に見えます\n" | |
10643 |
"マージ成功とみなしますか |
|
10815 | "マージ成功とみなしますか? (y/n)" | |
10644 |
|
10816 | |||
10645 | #, python-format |
|
10817 | #, python-format | |
10646 | msgid "merging %s failed!\n" |
|
10818 | msgid "merging %s failed!\n" | |
@@ -10733,9 +10905,8 b' msgstr ""' | |||||
10733 | "- ``%USERPROFILE%\\mercurial.ini``\n" |
|
10905 | "- ``%USERPROFILE%\\mercurial.ini``\n" | |
10734 | "- ``%HOME%\\.hgrc``\n" |
|
10906 | "- ``%HOME%\\.hgrc``\n" | |
10735 | "- ``%HOME%\\mercurial.ini``\n" |
|
10907 | "- ``%HOME%\\mercurial.ini``\n" | |
10736 |
"- ``C:\\mercurial\\mercurial.ini`` (regkey |
|
10908 | "- ``C:\\mercurial\\mercurial.ini`` (regkey, hgrc.d\\, mercurial.ini 不在時)\n" | |
10737 | "時\n" |
|
10909 | "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (hgrc.d\\, mercurial.ini 不在" | |
10738 | "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (hgrc.d\\ 、 mercurial.ini 不在" |
|
|||
10739 | "時)\n" |
|
10910 | "時)\n" | |
10740 | "- ``<インストール先>\\hgrc.d\\*.rc`` (mercurial.ini 不在時)\n" |
|
10911 | "- ``<インストール先>\\hgrc.d\\*.rc`` (mercurial.ini 不在時)\n" | |
10741 | "- ``<インストール先>\\mercurial.ini``" |
|
10912 | "- ``<インストール先>\\mercurial.ini``" | |
@@ -10762,7 +10933,7 b' msgid ""' | |||||
10762 | "If there is a per-repository configuration file which is not owned by\n" |
|
10933 | "If there is a per-repository configuration file which is not owned by\n" | |
10763 | "the active user, Mercurial will warn you that the file is skipped::" |
|
10934 | "the active user, Mercurial will warn you that the file is skipped::" | |
10764 | msgstr "" |
|
10935 | msgstr "" | |
10765 |
"実行ユーザ以外が所有となっているリポジトリ毎設定ファイルがある場合、 |
|
10936 | "実行ユーザ以外が所有となっているリポジトリ毎設定ファイルがある場合、\n" | |
10766 | "Mercurial は当該ファイルを読み込まない旨の警告を表示します::" |
|
10937 | "Mercurial は当該ファイルを読み込まない旨の警告を表示します::" | |
10767 |
|
10938 | |||
10768 | msgid "" |
|
10939 | msgid "" | |
@@ -10811,7 +10982,7 b' msgid ""' | |||||
10811 | "description of the possible configuration values:" |
|
10982 | "description of the possible configuration values:" | |
10812 | msgstr "" |
|
10983 | msgstr "" | |
10813 | "上記記述はそれぞれ、 ``ui.username`` および ``ui.verbose`` として\n" |
|
10984 | "上記記述はそれぞれ、 ``ui.username`` および ``ui.verbose`` として\n" | |
10814 |
"参照されます。 設定ファイルで指定可能な値の詳細に関しては、 |
|
10985 | "参照されます。 設定ファイルで指定可能な値の詳細に関しては、\n" | |
10815 | "hgrc のマニュアルページを参照してください:" |
|
10986 | "hgrc のマニュアルページを参照してください:" | |
10816 |
|
10987 | |||
10817 | msgid "" |
|
10988 | msgid "" | |
@@ -10926,7 +11097,7 b' msgid ""' | |||||
10926 | msgstr "" |
|
11097 | msgstr "" | |
10927 | "Mercurial は、 別の構成管理ツールである git に由来する拡張差分形式にも\n" |
|
11098 | "Mercurial は、 別の構成管理ツールである git に由来する拡張差分形式にも\n" | |
10928 | "対応しており、 この形式は従来の差分形式の持つ制限を解消しています。\n" |
|
11099 | "対応しており、 この形式は従来の差分形式の持つ制限を解消しています。\n" | |
10929 |
"但し、 普及しているツールの幾つかが git 差分形式に対応していないため、 |
|
11100 | "但し、 普及しているツールの幾つかが git 差分形式に対応していないため、\n" | |
10930 | "Mercurial は指定が無い場合はこの形式では出力しません。" |
|
11101 | "Mercurial は指定が無い場合はこの形式では出力しません。" | |
10931 |
|
11102 | |||
10932 | msgid "" |
|
11103 | msgid "" | |
@@ -10938,9 +11109,9 b' msgid ""' | |||||
10938 | "pull) are not affected by this, because they use an internal binary\n" |
|
11109 | "pull) are not affected by this, because they use an internal binary\n" | |
10939 | "format for communicating changes." |
|
11110 | "format for communicating changes." | |
10940 | msgstr "" |
|
11111 | msgstr "" | |
10941 |
"つまり、 Mercurial が(:hg:`export` 等で)生成した標準の差分形式は、 |
|
11112 | "つまり、 Mercurial が(:hg:`export` 等で)生成した標準の差分形式は、\n" | |
10942 |
"他のリポジトリに対して適用した場合、 上述した情報の欠落があることから、 |
|
11113 | "他のリポジトリに対して適用した場合、 上述した情報の欠落があることから、\n" | |
10943 |
"ファイルの複製・改名をはじめとする上記の制限に類する操作に関しては、 |
|
11114 | "ファイルの複製・改名をはじめとする上記の制限に類する操作に関しては、\n" | |
10944 | "十分注意する必要があります。 :hg:`push` や :hg:`pull` のような\n" |
|
11115 | "十分注意する必要があります。 :hg:`push` や :hg:`pull` のような\n" | |
10945 | "Mercurial の内部形式で実施される操作に関しては、 バイナリ形式で変更\n" |
|
11116 | "Mercurial の内部形式で実施される操作に関しては、 バイナリ形式で変更\n" | |
10946 | "情報の授受を行うことから、 情報の欠落に関しては心配する必要はありません。" |
|
11117 | "情報の授受を行うことから、 情報の欠落に関しては心配する必要はありません。" | |
@@ -10953,7 +11124,7 b' msgid ""' | |||||
10953 | msgstr "" |
|
11124 | msgstr "" | |
10954 | "Mercurial から git 拡張差分形式の出力を得るには、 受理可能なコマンドに\n" |
|
11125 | "Mercurial から git 拡張差分形式の出力を得るには、 受理可能なコマンドに\n" | |
10955 | "対して --git を指定するか、 設定ファイルの [diff] セクションに\n" |
|
11126 | "対して --git を指定するか、 設定ファイルの [diff] セクションに\n" | |
10956 |
"'git = True' 記述を追加してください。 :hg:`import` や |
|
11127 | "'git = True' 記述を追加してください。 :hg:`import` や\n" | |
10957 | "mq エクステンションを使用する場合は、 この指定は不要です。\n" |
|
11128 | "mq エクステンションを使用する場合は、 この指定は不要です。\n" | |
10958 |
|
11129 | |||
10959 | msgid "" |
|
11130 | msgid "" | |
@@ -10965,11 +11136,12 b' msgid ""' | |||||
10965 | " Windows) is searched." |
|
11136 | " Windows) is searched." | |
10966 | msgstr "" |
|
11137 | msgstr "" | |
10967 | "HG\n" |
|
11138 | "HG\n" | |
10968 |
" 'hg' コマンドへのパス。 フック/エクステンション |
|
11139 | " 'hg' コマンドへのパス。 フック/エクステンション、\n" | |
10969 | "の\n" |
|
11140 | " ないし外部ツールの起動の際に自動的に設定されます。\n" | |
10970 |
" |
|
11141 | " 未設定や空の場合は、\n" | |
10971 |
" hg 実行可能ファイルの名前 |
|
11142 | " frozen 形式の hg 実行可能ファイルの名前が設定されるか、\n" | |
10972 | " ファイルが検索されます(Windows の場合、 PATHEXT 環境変数に設定された\n" |
|
11143 | " 'hg' という名前の実行可能ファイルが検索されます\n" | |
|
11144 | " (Windows の場合、 PATHEXT 環境変数に設定された\n" | |||
10973 | " COM/EXE/BAT/CMD 等の拡張子付き)。" |
|
11145 | " COM/EXE/BAT/CMD 等の拡張子付き)。" | |
10974 |
|
11146 | |||
10975 | msgid "" |
|
11147 | msgid "" | |
@@ -10977,9 +11149,8 b' msgid ""' | |||||
10977 | " This is the name of the editor to run when committing. See EDITOR." |
|
11149 | " This is the name of the editor to run when committing. See EDITOR." | |
10978 | msgstr "" |
|
11150 | msgstr "" | |
10979 | "HGEDITOR\n" |
|
11151 | "HGEDITOR\n" | |
10980 |
" コミットの際のメッセージ入力を行うためのエディタの名前。 |
|
11152 | " コミットの際のメッセージ入力を行うためのエディタの名前。\n" | |
10981 | "数\n" |
|
11153 | " EDITOR 環境変数についても参照してください。" | |
10982 | " についても参照してください。" |
|
|||
10983 |
|
11154 | |||
10984 | msgid " (deprecated, use configuration file)" |
|
11155 | msgid " (deprecated, use configuration file)" | |
10985 | msgstr " (非推奨: 設定ファイル経由で指定してください)" |
|
11156 | msgstr " (非推奨: 設定ファイル経由で指定してください)" | |
@@ -10992,7 +11163,7 b' msgid ""' | |||||
10992 | " be overridden with the --encoding command-line option." |
|
11163 | " be overridden with the --encoding command-line option." | |
10993 | msgstr "" |
|
11164 | msgstr "" | |
10994 | "HGENCODING\n" |
|
11165 | "HGENCODING\n" | |
10995 |
" Mercurial によるロケール自動検出の上書き。 この設定は、 ユーザ名、 |
|
11166 | " Mercurial によるロケール自動検出の上書き。 この設定は、 ユーザ名、\n" | |
10996 | " コミットメッセージ、 タグ名およびブランチ名を内部データ形式に変換する\n" |
|
11167 | " コミットメッセージ、 タグ名およびブランチ名を内部データ形式に変換する\n" | |
10997 | " 際に使用されます。 この環境変数設定は、 コマンドラインでの --encoding\n" |
|
11168 | " 際に使用されます。 この環境変数設定は、 コマンドラインでの --encoding\n" | |
10998 | " 使用により、 更に上書きすることが出来ます。" |
|
11169 | " 使用により、 更に上書きすることが出来ます。" | |
@@ -11008,7 +11179,7 b' msgid ""' | |||||
11008 | msgstr "" |
|
11179 | msgstr "" | |
11009 | "HGENCODINGMODE\n" |
|
11180 | "HGENCODINGMODE\n" | |
11010 | " ユーザからの指定値を内部データ形式に変換する際に、 指定の符号化と\n" |
|
11181 | " ユーザからの指定値を内部データ形式に変換する際に、 指定の符号化と\n" | |
11011 |
" 合致しない文字が検出された場合の Mercurial の挙動の指定。 無指定時は、 |
|
11182 | " 合致しない文字が検出された場合の Mercurial の挙動の指定。 無指定時は、\n" | |
11012 | " 「指定の符号化と合致しない場合は処理中断」を意味する \"strict\" が指定\n" |
|
11183 | " 「指定の符号化と合致しない場合は処理中断」を意味する \"strict\" が指定\n" | |
11013 | " されたものとみなします。 他には、 「未知の文字の置き換え」を意味する\n" |
|
11184 | " されたものとみなします。 他には、 「未知の文字の置き換え」を意味する\n" | |
11014 | " \"replace\" と、 「未知の文字の切り捨て」を意味する \"ignore\" が指定\n" |
|
11185 | " \"replace\" と、 「未知の文字の切り捨て」を意味する \"ignore\" が指定\n" | |
@@ -11023,6 +11194,14 b' msgid ""' | |||||
11023 | " narrow, set this variable to \"wide\" if such characters cause\n" |
|
11194 | " narrow, set this variable to \"wide\" if such characters cause\n" | |
11024 | " formatting problems." |
|
11195 | " formatting problems." | |
11025 | msgstr "" |
|
11196 | msgstr "" | |
|
11197 | "HGENCODINGAMBIGUOUS\n" | |||
|
11198 | " 表示幅が\"曖昧な\"文字に対する Mercurial の挙動を決定します。\n" | |||
|
11199 | " 例えば、 east asian 文字集合における、 アクセント付きの Latin\n" | |||
|
11200 | " 文字などがこれに該当します。\n" | |||
|
11201 | " 指定が無い場合、 Mercurial は曖昧な文字の幅を\n" | |||
|
11202 | " 1文字分 (narrow) とみなします。\n" | |||
|
11203 | " この手の文字が表示上の問題となる場合は、 本環境変数を \"wide\"\n" | |||
|
11204 | " に設定してください。" | |||
11026 |
|
11205 | |||
11027 | msgid "" |
|
11206 | msgid "" | |
11028 | "HGMERGE\n" |
|
11207 | "HGMERGE\n" | |
@@ -11031,10 +11210,10 b' msgid ""' | |||||
11031 | " ancestor file." |
|
11210 | " ancestor file." | |
11032 | msgstr "" |
|
11211 | msgstr "" | |
11033 | "HGMERGE\n" |
|
11212 | "HGMERGE\n" | |
11034 |
" マージの際の衝突解消に使用するコマンド。 |
|
11213 | " マージの際の衝突解消に使用するコマンド。\n" | |
11035 | "は、 \n" |
|
11214 | " 指定されたコマンドの起動には、\n" | |
11036 |
" 作業領域のファイル、 マージ対象別リビジョンのファイル、 |
|
11215 | " 作業領域のファイル、 マージ対象別リビジョンのファイル、\n" | |
11037 | " 両者の親リビジョンのファイルを表す3つの引数が指定されます。" |
|
11216 | " 両者の親リビジョンのファイルを表す、 3つの引数が指定されます。" | |
11038 |
|
11217 | |||
11039 | msgid "" |
|
11218 | msgid "" | |
11040 | "HGRCPATH\n" |
|
11219 | "HGRCPATH\n" | |
@@ -11047,7 +11226,7 b' msgstr ""' | |||||
11047 | " 設定ファイル読込のための、 ファイルないしディレクトリの一覧の指定。\n" |
|
11226 | " 設定ファイル読込のための、 ファイルないしディレクトリの一覧の指定。\n" | |
11048 | " 一覧要素の区切り記号は、 Unix なら \":\"、 WIndows なら \";\" です。\n" |
|
11227 | " 一覧要素の区切り記号は、 Unix なら \":\"、 WIndows なら \";\" です。\n" | |
11049 | " HGRCPATH 環境変数が設定されていない場合、 各稼働環境に応じた\n" |
|
11228 | " HGRCPATH 環境変数が設定されていない場合、 各稼働環境に応じた\n" | |
11050 |
" 読み込み先から読み込まれます。 空の値が設定されている場合、 |
|
11229 | " 読み込み先から読み込まれます。 空の値が設定されている場合、\n" | |
11051 | " 現リポジトリの .hg/hgrc のみが読み込まれます。" |
|
11230 | " 現リポジトリの .hg/hgrc のみが読み込まれます。" | |
11052 |
|
11231 | |||
11053 | msgid " For each element in HGRCPATH:" |
|
11232 | msgid " For each element in HGRCPATH:" | |
@@ -11070,11 +11249,11 b' msgid ""' | |||||
11070 | msgstr "" |
|
11249 | msgstr "" | |
11071 | "HGPLAIN\n" |
|
11250 | "HGPLAIN\n" | |
11072 | " この環境変数が設定された場合、 Mercurial の表示設定を変更し得る\n" |
|
11251 | " この環境変数が設定された場合、 Mercurial の表示設定を変更し得る\n" | |
11073 |
" 設定ファイル中の記述が全て無視されます。 |
|
11252 | " 設定ファイル中の記述が全て無視されます。\n" | |
11074 | " verbose モード、 debug モード、 quiet モード、 tracebacks や各国語設定" |
|
11253 | " encoding や defaults の指定、 verbose モード、 debug モード、\n" | |
11075 | "が\n" |
|
11254 | " quiet モード、 tracebacks や各国語設定が対象となります。\n" | |
11076 |
" |
|
11255 | " ユーザ設定を温存したままで、\n" | |
11077 | " 使用する場合に有用です。" |
|
11256 | " ツール等から Mercurial を使用する場合に有用です。" | |
11078 |
|
11257 | |||
11079 | msgid "" |
|
11258 | msgid "" | |
11080 | " Equivalent options set via command line flags or environment\n" |
|
11259 | " Equivalent options set via command line flags or environment\n" | |
@@ -11139,13 +11318,12 b' msgid ""' | |||||
11139 | " defaults to 'vi'." |
|
11318 | " defaults to 'vi'." | |
11140 | msgstr "" |
|
11319 | msgstr "" | |
11141 | "EDITOR\n" |
|
11320 | "EDITOR\n" | |
11142 |
" コミット時のメッセージのように、 エディタでファイルを開き、 |
|
11321 | " コミット時のメッセージのように、 エディタでファイルを開き、\n" | |
11143 | "る\n" |
|
11322 | " ユーザによる編集を促す状況があります。\n" | |
11144 |
" |
|
11323 | " そこで使用されるエディタは、 HGEDITOR、 VISUAL\n" | |
11145 | "VISUAL\n" |
|
|||
11146 | " あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n" |
|
11324 | " あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n" | |
11147 |
" 最初の空で無い値に設定された環境変数の値を使用します。 |
|
11325 | " 最初の空で無い値に設定された環境変数の値を使用します。\n" | |
11148 | " (あるいは空)の場合は、 'vi' が使用されます。" |
|
11326 | " いずれも未設定 (あるいは空) の場合は、 'vi' が使用されます。" | |
11149 |
|
11327 | |||
11150 | msgid "" |
|
11328 | msgid "" | |
11151 | "PYTHONPATH\n" |
|
11329 | "PYTHONPATH\n" | |
@@ -11153,7 +11331,7 b' msgid ""' | |||||
11153 | " set appropriately if this Mercurial is not installed system-wide.\n" |
|
11331 | " set appropriately if this Mercurial is not installed system-wide.\n" | |
11154 | msgstr "" |
|
11332 | msgstr "" | |
11155 | "PYTHONPATH\n" |
|
11333 | "PYTHONPATH\n" | |
11156 |
" Mercurial が当該システムの共有領域にインストールされていない場合、 |
|
11334 | " Mercurial が当該システムの共有領域にインストールされていない場合、\n" | |
11157 | " Python が必要なモジュールを読み込むためには、 この環境変数の設定が\n" |
|
11335 | " Python が必要なモジュールを読み込むためには、 この環境変数の設定が\n" | |
11158 | " 必要です。\n" |
|
11336 | " 必要です。\n" | |
11159 |
|
11337 | |||
@@ -11165,7 +11343,7 b' msgid ""' | |||||
11165 | msgstr "" |
|
11343 | msgstr "" | |
11166 | "Mercurial には、 新規機能を「エクステンション」という機構を用いて\n" |
|
11344 | "Mercurial には、 新規機能を「エクステンション」という機構を用いて\n" | |
11167 | "追加する仕組みが備わっています。 エクステンションでは、 コマンドの\n" |
|
11345 | "追加する仕組みが備わっています。 エクステンションでは、 コマンドの\n" | |
11168 |
"新規追加、 既存コマンドへのオプションの追加、 コマンドの挙動の変更、 |
|
11346 | "新規追加、 既存コマンドへのオプションの追加、 コマンドの挙動の変更、\n" | |
11169 | "フックの実装といったことが可能です。" |
|
11347 | "フックの実装といったことが可能です。" | |
11170 |
|
11348 | |||
11171 | msgid "" |
|
11349 | msgid "" | |
@@ -11189,8 +11367,8 b' msgid ""' | |||||
11189 | "Python search path, create an entry for it in your configuration file,\n" |
|
11367 | "Python search path, create an entry for it in your configuration file,\n" | |
11190 | "like this::" |
|
11368 | "like this::" | |
11191 | msgstr "" |
|
11369 | msgstr "" | |
11192 |
"\"foo\" というエクステンションを有効化するには、 |
|
11370 | "\"foo\" というエクステンションを有効化するには、\n" | |
11193 |
"Mercurial 同梱のものであろうと、 Python の検索パス中のものであろうと、 |
|
11371 | "Mercurial 同梱のものであろうと、 Python の検索パス中のものであろうと、\n" | |
11194 | "設定ファイルにおいて以下のような記述が必要です::" |
|
11372 | "設定ファイルにおいて以下のような記述が必要です::" | |
11195 |
|
11373 | |||
11196 | msgid "" |
|
11374 | msgid "" | |
@@ -11257,8 +11435,8 b' msgstr ""' | |||||
11257 | " リビジョンを親として、 新規に作成された子リビジョンのこと。\n" |
|
11435 | " リビジョンを親として、 新規に作成された子リビジョンのこと。\n" | |
11258 | " これは「位相的 (topological) ブランチ」と呼ばれます。\n" |
|
11436 | " これは「位相的 (topological) ブランチ」と呼ばれます。\n" | |
11259 | " ('Branch, topological' 参照) 位相的ブランチに名前が付与された場合は\n" |
|
11437 | " ('Branch, topological' 参照) 位相的ブランチに名前が付与された場合は\n" | |
11260 |
" 「名前付きブランチ」と呼ばれます。 名前を持たない位相的ブランチは、 |
|
11438 | " 「名前付きブランチ」と呼ばれます。 名前を持たない位相的ブランチは、\n" | |
11261 |
" 「名前無しブランチ」と呼ばれます。 'Branch, anonymous' および |
|
11439 | " 「名前無しブランチ」と呼ばれます。 'Branch, anonymous' および\n" | |
11262 | " 'Branch, named' も参照のこと。" |
|
11440 | " 'Branch, named' も参照のこと。" | |
11263 |
|
11441 | |||
11264 | msgid "" |
|
11442 | msgid "" | |
@@ -11271,7 +11449,7 b' msgid ""' | |||||
11271 | " using bookmarks or clones and anonymous branches." |
|
11449 | " using bookmarks or clones and anonymous branches." | |
11272 | msgstr "" |
|
11450 | msgstr "" | |
11273 | " ブランチは、 別のリポジトリとの間での連携 (反映/取り込み) の際に\n" |
|
11451 | " ブランチは、 別のリポジトリとの間での連携 (反映/取り込み) の際に\n" | |
11274 |
" 連携先で生成されたリビジョンが新規ヘッドとして取り込まれることで、 |
|
11452 | " 連携先で生成されたリビジョンが新規ヘッドとして取り込まれることで、\n" | |
11275 | " 生成される場合があります。 「ブランチ」という呼称は、 利用者が独立して\n" |
|
11453 | " 生成される場合があります。 「ブランチ」という呼称は、 利用者が独立して\n" | |
11276 | " 開発を行う過程を指すのに使用される場合があります。 このような相互に\n" |
|
11454 | " 開発を行う過程を指すのに使用される場合があります。 このような相互に\n" | |
11277 | " 独立した開発は、 名前付きブランチを明示的に作成して実施されることも\n" |
|
11455 | " 独立した開発は、 名前付きブランチを明示的に作成して実施されることも\n" | |
@@ -11353,8 +11531,8 b' msgstr ""' | |||||
11353 | " [名前付きブランチ] 同一のブランチ名を持つリビジョンの集合のこと。\n" |
|
11531 | " [名前付きブランチ] 同一のブランチ名を持つリビジョンの集合のこと。\n" | |
11354 | " 名前付きブランチに属するリビジョンの子リビジョンは、 同じ名前付き\n" |
|
11532 | " 名前付きブランチに属するリビジョンの子リビジョンは、 同じ名前付き\n" | |
11355 | " ブランチに属します。 明示的に指定することで、 子リビジョンを別な\n" |
|
11533 | " ブランチに属します。 明示的に指定することで、 子リビジョンを別な\n" | |
11356 |
" 名前付きブランチに所属させることも可能です。 ブランチ管理の詳細は、 |
|
11534 | " 名前付きブランチに所属させることも可能です。 ブランチ管理の詳細は、\n" | |
11357 |
" :hg:`help branch`、 :hg:`help branches` および |
|
11535 | " :hg:`help branch`、 :hg:`help branches` および\n" | |
11358 | " :hg:`commit --close-branch` を参照のこと。" |
|
11536 | " :hg:`commit --close-branch` を参照のこと。" | |
11359 |
|
11537 | |||
11360 | msgid "" |
|
11538 | msgid "" | |
@@ -11366,7 +11544,7 b' msgid ""' | |||||
11366 | " further changesets are added to that previous branch, then that\n" |
|
11544 | " further changesets are added to that previous branch, then that\n" | |
11367 | " previous branch will be a branch in name only." |
|
11545 | " previous branch will be a branch in name only." | |
11368 | msgstr "" |
|
11546 | msgstr "" | |
11369 |
" 名前付きブランチは、 リポジトリの履歴を構成するリビジョン群を、 |
|
11547 | " 名前付きブランチは、 リポジトリの履歴を構成するリビジョン群を、\n" | |
11370 | " 重複の無い部分集合へと分割する、 名前空間の一種とも言えます。\n" |
|
11548 | " 重複の無い部分集合へと分割する、 名前空間の一種とも言えます。\n" | |
11371 | " 名前付きブランチは、 必ずしも位相的ブランチである必要はありません。\n" |
|
11549 | " 名前付きブランチは、 必ずしも位相的ブランチである必要はありません。\n" | |
11372 | " 任意の名前付きブランチ(default でも可)のヘッドとなるリビジョンを\n" |
|
11550 | " 任意の名前付きブランチ(default でも可)のヘッドとなるリビジョンを\n" | |
@@ -11404,7 +11582,7 b' msgid ""' | |||||
11404 | msgstr "" |
|
11582 | msgstr "" | |
11405 | "Changelog\n" |
|
11583 | "Changelog\n" | |
11406 | " [変更履歴/チェンジログ] 各リビジョンの内容を、 リポジトリに登録された\n" |
|
11584 | " [変更履歴/チェンジログ] 各リビジョンの内容を、 リポジトリに登録された\n" | |
11407 |
" 順に記録したもの。 記録内容には、 識別用ハッシュ値、 作成者名、 |
|
11585 | " 順に記録したもの。 記録内容には、 識別用ハッシュ値、 作成者名、\n" | |
11408 | " コミットログ、 日付および変更対象ファイルの一覧が含まれます。" |
|
11586 | " コミットログ、 日付および変更対象ファイルの一覧が含まれます。" | |
11409 |
|
11587 | |||
11410 | msgid "" |
|
11588 | msgid "" | |
@@ -11415,7 +11593,7 b' msgstr ""' | |||||
11415 | " [チェンジセット] 変更内容の記録に使用する、 リポジトリ状態の\n" |
|
11593 | " [チェンジセット] 変更内容の記録に使用する、 リポジトリ状態の\n" | |
11416 | " スナップショット。 ※ 訳注: 歴史的な経緯から、 チェンジセットと\n" |
|
11594 | " スナップショット。 ※ 訳注: 歴史的な経緯から、 チェンジセットと\n" | |
11417 | " リビジョンは通常、 同じ意味で使用されるケースが多いです。 日本語訳の\n" |
|
11595 | " リビジョンは通常、 同じ意味で使用されるケースが多いです。 日本語訳の\n" | |
11418 |
" 際には、 複数ファイルに渡る差分一式のことを指す場合はチェンジセット、 |
|
11596 | " 際には、 複数ファイルに渡る差分一式のことを指す場合はチェンジセット、\n" | |
11419 | " リポジトリに登録されることで履歴中の位置が確定済みのチェンジセット\n" |
|
11597 | " リポジトリに登録されることで履歴中の位置が確定済みのチェンジセット\n" | |
11420 | " のことはリビジョン、 と呼称することが多いですが、 必ずしも統一\n" |
|
11598 | " のことはリビジョン、 と呼称することが多いですが、 必ずしも統一\n" | |
11421 | " されている訳ではありません。 'Revision' も参照のこと。" |
|
11599 | " されている訳ではありません。 'Revision' も参照のこと。" | |
@@ -11430,7 +11608,7 b' msgstr ""' | |||||
11430 | " [子チェンジセット/子リビジョン] 「親リビジョン」の対義語。\n" |
|
11608 | " [子チェンジセット/子リビジョン] 「親リビジョン」の対義語。\n" | |
11431 | " リビジョン P がリビジョン C の親リビジョンである場合、 C は P の\n" |
|
11609 | " リビジョン P がリビジョン C の親リビジョンである場合、 C は P の\n" | |
11432 | " 子リビジョンとなります。 1つの親リビジョンに対して、 子リビジョンの\n" |
|
11610 | " 子リビジョンとなります。 1つの親リビジョンに対して、 子リビジョンの\n" | |
11433 |
" 数には上限がありません。 訳注: 親/子関係を持つ、 ということは、 |
|
11611 | " 数には上限がありません。 訳注: 親/子関係を持つ、 ということは、\n" | |
11434 | " 履歴中の位置が確定していることを意味するため、 ここでは敢えて\n" |
|
11612 | " 履歴中の位置が確定していることを意味するため、 ここでは敢えて\n" | |
11435 | " changeset を「リビジョン」と訳しています。 'Changeset' も参照のこと。" |
|
11613 | " changeset を「リビジョン」と訳しています。 'Changeset' も参照のこと。" | |
11436 |
|
11614 | |||
@@ -11525,7 +11703,7 b' msgid ""' | |||||
11525 | msgstr "" |
|
11703 | msgstr "" | |
11526 | "Clone\n" |
|
11704 | "Clone\n" | |
11527 | " (名詞) [複製(リポジトリ)] あるリポジトリから、 全体ないし一部を複製\n" |
|
11705 | " (名詞) [複製(リポジトリ)] あるリポジトリから、 全体ないし一部を複製\n" | |
11528 |
" したリポジトリのこと。 部分複製リポジトリの持つ変更履歴は、 |
|
11706 | " したリポジトリのこと。 部分複製リポジトリの持つ変更履歴は、\n" | |
11529 | " 指定リビジョンとその祖先から構成されます。" |
|
11707 | " 指定リビジョンとその祖先から構成されます。" | |
11530 |
|
11708 | |||
11531 | msgid " Example: \"Is your clone up to date?\"." |
|
11709 | msgid " Example: \"Is your clone up to date?\"." | |
@@ -11552,7 +11730,7 b' msgid ""' | |||||
11552 | msgstr "" |
|
11730 | msgstr "" | |
11553 | "Commit\n" |
|
11731 | "Commit\n" | |
11554 | " (名詞) [コミット] リビジョンの別称。 ※ 訳注: コミット済み\n" |
|
11732 | " (名詞) [コミット] リビジョンの別称。 ※ 訳注: コミット済み\n" | |
11555 |
" ということは、 履歴中の位置が確定していることを意味するため、 |
|
11733 | " ということは、 履歴中の位置が確定していることを意味するため、\n" | |
11556 | " ここでは敢えて changeset を「リビジョン」と訳しています。\n" |
|
11734 | " ここでは敢えて changeset を「リビジョン」と訳しています。\n" | |
11557 | " 'Changeset' も参照のこと。" |
|
11735 | " 'Changeset' も参照のこと。" | |
11558 |
|
11736 | |||
@@ -11566,7 +11744,7 b' msgid ""' | |||||
11566 | " changeset, creating a new changeset in the repository." |
|
11744 | " changeset, creating a new changeset in the repository." | |
11567 | msgstr "" |
|
11745 | msgstr "" | |
11568 | " (動詞) [コミットする] 変更内容をリポジトリに記録する操作のこと。\n" |
|
11746 | " (動詞) [コミットする] 変更内容をリポジトリに記録する操作のこと。\n" | |
11569 |
" コミットの際には、 コミット対象ファイルの作業領域中の内容と、 |
|
11747 | " コミットの際には、 コミット対象ファイルの作業領域中の内容と、\n" | |
11570 | " 親リビジョン時点における内容との差分が確認され、 新規のリビジョンが\n" |
|
11748 | " 親リビジョン時点における内容との差分が確認され、 新規のリビジョンが\n" | |
11571 | " リポジトリに作成されます。" |
|
11749 | " リポジトリに作成されます。" | |
11572 |
|
11750 | |||
@@ -12131,7 +12309,7 b' msgid ""' | |||||
12131 | "individually, or provided as a topologically continuous range,\n" |
|
12309 | "individually, or provided as a topologically continuous range,\n" | |
12132 | "separated by the \":\" character." |
|
12310 | "separated by the \":\" character." | |
12133 | msgstr "" |
|
12311 | msgstr "" | |
12134 |
"Mercurial に複数のリビジョンを指定する場合の方法には、 |
|
12312 | "Mercurial に複数のリビジョンを指定する場合の方法には、\n" | |
12135 | "個々のリビジョンをそれぞれ指定する方法以外にも、 \":\" を区切り\n" |
|
12313 | "個々のリビジョンをそれぞれ指定する方法以外にも、 \":\" を区切り\n" | |
12136 | "記号にした範囲指定による方法があります。" |
|
12314 | "記号にした範囲指定による方法があります。" | |
12137 |
|
12315 | |||
@@ -12170,7 +12348,7 b' msgid ""' | |||||
12170 | "By default, Mercurial treats filenames as shell-style extended glob\n" |
|
12348 | "By default, Mercurial treats filenames as shell-style extended glob\n" | |
12171 | "patterns." |
|
12349 | "patterns." | |
12172 | msgstr "" |
|
12350 | msgstr "" | |
12173 |
"特に指定の無い場合、 Mercurial は指定されたファイル名に対して、 |
|
12351 | "特に指定の無い場合、 Mercurial は指定されたファイル名に対して、\n" | |
12174 | "shell 形式の拡張ワイルドカード合致を行います。" |
|
12352 | "shell 形式の拡張ワイルドカード合致を行います。" | |
12175 |
|
12353 | |||
12176 | msgid "Alternate pattern notations must be specified explicitly." |
|
12354 | msgid "Alternate pattern notations must be specified explicitly." | |
@@ -12181,8 +12359,8 b' msgid ""' | |||||
12181 | "``path:``. These path names must completely match starting at the\n" |
|
12359 | "``path:``. These path names must completely match starting at the\n" | |
12182 | "current repository root." |
|
12360 | "current repository root." | |
12183 | msgstr "" |
|
12361 | msgstr "" | |
12184 |
"パターン合致を行わずに、 指定された名前をそのまま使用する場合、 |
|
12362 | "パターン合致を行わずに、 指定された名前をそのまま使用する場合、\n" | |
12185 |
"名前の前に ``path:`` を記述します。 この形式を使用する場合、 |
|
12363 | "名前の前に ``path:`` を記述します。 この形式を使用する場合、\n" | |
12186 | "リポジトリのルートからのパスと完全に一致しなければなりません。" |
|
12364 | "リポジトリのルートからのパスと完全に一致しなければなりません。" | |
12187 |
|
12365 | |||
12188 | msgid "" |
|
12366 | msgid "" | |
@@ -12209,6 +12387,19 b' msgstr ""' | |||||
12209 | "正規表現形式では、 リポジトリのルートからの合致とみなされます。\n" |
|
12387 | "正規表現形式では、 リポジトリのルートからの合致とみなされます。\n" | |
12210 | "(訳注: .hgignore での指定では付与「されません」ので注意が必要です)。" |
|
12388 | "(訳注: .hgignore での指定では付与「されません」ので注意が必要です)。" | |
12211 |
|
12389 | |||
|
12390 | msgid "" | |||
|
12391 | "To read name patterns from a file, use ``listfile:`` or ``listfile0:``.\n" | |||
|
12392 | "The latter expects null delimited patterns while the former expects line\n" | |||
|
12393 | "feeds. Each string read from the file is itself treated as a file\n" | |||
|
12394 | "pattern." | |||
|
12395 | msgstr "" | |||
|
12396 | "ファイルからパターンを読み込む場合は、\n" | |||
|
12397 | "``listfile:`` ないし ``listfile0:`` を使用します。\n" | |||
|
12398 | "前者が改行でパターンを区切るのに対して、\n" | |||
|
12399 | "後者は null 文字でパターンを区切ります。\n" | |||
|
12400 | "ファイルから読み込まれた個々のパターンは、\n" | |||
|
12401 | "file パターンとして扱われます。" | |||
|
12402 | ||||
12212 | msgid "Plain examples::" |
|
12403 | msgid "Plain examples::" | |
12213 | msgstr "パターン合致未使用例::" |
|
12404 | msgstr "パターン合致未使用例::" | |
12214 |
|
12405 | |||
@@ -12234,19 +12425,27 b' msgid ""' | |||||
12234 | msgstr "" |
|
12425 | msgstr "" | |
12235 | " glob:*.c 現ディレクトリ直下で、 名前が \".c\" で終わるもの\n" |
|
12426 | " glob:*.c 現ディレクトリ直下で、 名前が \".c\" で終わるもの\n" | |
12236 | " *.c 現ディレクトリ直下で、 名前が \".c\" で終わるもの\n" |
|
12427 | " *.c 現ディレクトリ直下で、 名前が \".c\" で終わるもの\n" | |
12237 |
" **.c 現ディレクトリないしその配下のディレクトリにおいて、 |
|
12428 | " **.c 現ディレクトリないしその配下のディレクトリにおいて、\n" | |
12238 | " 名前が \".c\" で終わるもの\n" |
|
12429 | " 名前が \".c\" で終わるもの\n" | |
12239 | " foo/*.c foo ディレクトリ直下で、 名前が \".c\" で終わるもの\n" |
|
12430 | " foo/*.c foo ディレクトリ直下で、 名前が \".c\" で終わるもの\n" | |
12240 |
" foo/**.c foo ディレクトリないしその配下のディレクトリにおいて、 |
|
12431 | " foo/**.c foo ディレクトリないしその配下のディレクトリにおいて、\n" | |
12241 | " 名前が \".c\" で終わるもの" |
|
12432 | " 名前が \".c\" で終わるもの" | |
12242 |
|
12433 | |||
12243 | msgid "Regexp examples::" |
|
12434 | msgid "Regexp examples::" | |
12244 | msgstr "正規表現指定例::" |
|
12435 | msgstr "正規表現指定例::" | |
12245 |
|
12436 | |||
12246 | msgid "" |
|
12437 | msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository" | |
12247 | " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" |
|
12438 | msgstr " re:.*\\.c$ 任意のディレクトリの、 名前が \".c\" で終わるもの" | |
12248 | msgstr "" |
|
12439 | ||
12249 | " re:.*\\.c$ 作業領域中の任意の位置で、 名前が \".c\" で終わるもの\n" |
|
12440 | msgid "File examples::" | |
|
12441 | msgstr "ファイル読み込み例::" | |||
|
12442 | ||||
|
12443 | msgid "" | |||
|
12444 | " listfile:list.txt read list from list.txt with one file pattern per line\n" | |||
|
12445 | " listfile0:list.txt read list from list.txt with null byte delimiters\n" | |||
|
12446 | msgstr "" | |||
|
12447 | " listfile:list.txt 1行1 file パターンで list.txt から読み込み\n" | |||
|
12448 | " listfile0:list.txt null 文字区切りで file パターンを読み込み\n" | |||
12250 |
|
12449 | |||
12251 | msgid "Mercurial supports several ways to specify individual revisions." |
|
12450 | msgid "Mercurial supports several ways to specify individual revisions." | |
12252 | msgstr "Mercurial に個々のリビジョン指定する際には複数の記法が使用できます。" |
|
12451 | msgstr "Mercurial に個々のリビジョン指定する際には複数の記法が使用できます。" | |
@@ -12297,7 +12496,7 b' msgid ""' | |||||
12297 | "revision of an empty repository, and the parent of revision 0." |
|
12496 | "revision of an empty repository, and the parent of revision 0." | |
12298 | msgstr "" |
|
12497 | msgstr "" | |
12299 | "「空リビジョン」を意味する名前 \"null\" は、 特別な名前として予約\n" |
|
12498 | "「空リビジョン」を意味する名前 \"null\" は、 特別な名前として予約\n" | |
12300 |
"されています。 空リポジトリにおけるリビジョンはこのリビジョンで、 |
|
12499 | "されています。 空リポジトリにおけるリビジョンはこのリビジョンで、\n" | |
12301 | "リビジョン 0 の親は \"null\" リビジョンです。" |
|
12500 | "リビジョン 0 の親は \"null\" リビジョンです。" | |
12302 |
|
12501 | |||
12303 | msgid "" |
|
12502 | msgid "" | |
@@ -12563,7 +12762,10 b' msgid ""' | |||||
12563 | ":commit: commit creates a consistent snapshot of the state of the\n" |
|
12762 | ":commit: commit creates a consistent snapshot of the state of the\n" | |
12564 | " entire project and its subrepositories. It does this by first\n" |
|
12763 | " entire project and its subrepositories. It does this by first\n" | |
12565 | " attempting to commit all modified subrepositories, then recording\n" |
|
12764 | " attempting to commit all modified subrepositories, then recording\n" | |
12566 |
" their state and finally committing it in the parent |
|
12765 | " their state and finally committing it in the parent\n" | |
|
12766 | " repository. Mercurial can be made to abort if any subrepository\n" | |||
|
12767 | " content is modified by setting \"ui.commitsubrepos=no\" in a\n" | |||
|
12768 | " configuration file (see :hg:`help config`)." | |||
12567 | msgstr "" |
|
12769 | msgstr "" | |
12568 |
|
12770 | |||
12569 | msgid "" |
|
12771 | msgid "" | |
@@ -12684,11 +12886,12 b' msgid ":author: String. The unmodified a' | |||||
12684 | msgstr ":author: 文字列。 リビジョンの作者名(記録情報そのまま)。" |
|
12886 | msgstr ":author: 文字列。 リビジョンの作者名(記録情報そのまま)。" | |
12685 |
|
12887 | |||
12686 | msgid "" |
|
12888 | msgid "" | |
12687 |
":branches: |
|
12889 | ":branches: List of strings. The name of the branch on which the\n" | |
12688 |
" committed. Will be empty if the branch name was |
|
12890 | " changeset was committed. Will be empty if the branch name was\n" | |
12689 | msgstr "" |
|
12891 | " default." | |
12690 | ":branches: 文字列。 リビジョンの属するブランチ名。 所属ブランチが\n" |
|
12892 | msgstr "" | |
12691 | " default の場合は空文字列。" |
|
12893 | ":branches: 文字列列挙。 リビジョンの属するブランチ名。\n" | |
|
12894 | " 所属ブランチが default の場合は空。" | |||
12692 |
|
12895 | |||
12693 | msgid ":children: List of strings. The children of the changeset." |
|
12896 | msgid ":children: List of strings. The children of the changeset." | |
12694 | msgstr ":children: 文字列列挙。 リビジョンの子供。" |
|
12897 | msgstr ":children: 文字列列挙。 リビジョンの子供。" | |
@@ -12725,7 +12928,7 b' msgid ""' | |||||
12725 | ":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n" |
|
12928 | ":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n" | |
12726 | " only if the --copied switch is set." |
|
12929 | " only if the --copied switch is set." | |
12727 | msgstr "" |
|
12930 | msgstr "" | |
12728 |
":file_copies_switch: 文字列列挙。 \"file_copies\" と同義だが、 |
|
12931 | ":file_copies_switch: 文字列列挙。 \"file_copies\" と同義だが、\n" | |
12729 | " --copied 指定のある時のみ表示。" |
|
12932 | " --copied 指定のある時のみ表示。" | |
12730 |
|
12933 | |||
12731 | msgid ":file_mods: List of strings. Files modified by this changeset." |
|
12934 | msgid ":file_mods: List of strings. Files modified by this changeset." | |
@@ -12769,7 +12972,7 b' msgstr ""' | |||||
12769 | "含めたい場合、 可読化するための「フィルター」を使用します。\n" |
|
12972 | "含めたい場合、 可読化するための「フィルター」を使用します。\n" | |
12770 | "「フィルター」とは、 入力値に基づいて文字列を生成する機能です。\n" |
|
12973 | "「フィルター」とは、 入力値に基づいて文字列を生成する機能です。\n" | |
12771 | "一覧系の入力に対して文字列名のフィルターを適用する場合、 最初に stringify\n" |
|
12974 | "一覧系の入力に対して文字列名のフィルターを適用する場合、 最初に stringify\n" | |
12772 |
"フィルターを適用してください。 複数のフィルターを連ねることで、 |
|
12975 | "フィルターを適用してください。 複数のフィルターを連ねることで、\n" | |
12773 | "様々な出力を得ることができます::" |
|
12976 | "様々な出力を得ることができます::" | |
12774 |
|
12977 | |||
12775 | msgid "" |
|
12978 | msgid "" | |
@@ -12786,7 +12989,7 b' msgid ""' | |||||
12786 | ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" |
|
12989 | ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" | |
12787 | " every line except the last." |
|
12990 | " every line except the last." | |
12788 | msgstr "" |
|
12991 | msgstr "" | |
12789 |
":addbreaks: 文字列。 最終行を除く各行の行末に XHTML の |
|
12992 | ":addbreaks: 文字列。 最終行を除く各行の行末に XHTML の\n" | |
12790 | " \"<br />\" タグを追加します。" |
|
12993 | " \"<br />\" タグを追加します。" | |
12791 |
|
12994 | |||
12792 | msgid "" |
|
12995 | msgid "" | |
@@ -12952,29 +13155,30 b' msgid ""' | |||||
12952 | " file://local/filesystem/path[#revision]\n" |
|
13155 | " file://local/filesystem/path[#revision]\n" | |
12953 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
13156 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" | |
12954 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
13157 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" | |
12955 |
" ssh://[user |
|
13158 | " ssh://[user@]host[:port]/[path][#revision]" | |
12956 | msgstr "" |
|
13159 | msgstr "" | |
12957 | " local/filesystem/path[#revision]\n" |
|
13160 | " local/filesystem/path[#revision]\n" | |
12958 | " file://local/filesystem/path[#revision]\n" |
|
13161 | " file://local/filesystem/path[#revision]\n" | |
12959 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
13162 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" | |
12960 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
13163 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" | |
12961 |
" ssh://[user |
|
13164 | " ssh://[user@]host[:port]/[path][#revision]" | |
12962 |
|
13165 | |||
12963 | msgid "" |
|
13166 | msgid "" | |
12964 | "Paths in the local filesystem can either point to Mercurial\n" |
|
13167 | "Paths in the local filesystem can either point to Mercurial\n" | |
12965 | "repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n" |
|
13168 | "repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n" | |
12966 | "incoming --bundle`)." |
|
13169 | "incoming --bundle`). See also :hg:`help paths`." | |
12967 | msgstr "" |
|
13170 | msgstr "" | |
12968 |
"ローカルファイルシステム上のパスが指す先は、 |
|
13171 | "ローカルファイルシステム上のパスが指す先は、\n" | |
12969 | "バンドルファイル(:hg:`bundle` ないし :hg:`incoming --bundle` で生成)でも\n" |
|
13172 | "Mercurial のリポジトリでも、 バンドルファイル\n" | |
12970 | "構いません。" |
|
13173 | "(:hg:`bundle` ないし :hg:`incoming --bundle` で生成)\n" | |
|
13174 | "でも構いません。 :hg:`help paths` も参照してください。" | |||
12971 |
|
13175 | |||
12972 | msgid "" |
|
13176 | msgid "" | |
12973 | "An optional identifier after # indicates a particular branch, tag, or\n" |
|
13177 | "An optional identifier after # indicates a particular branch, tag, or\n" | |
12974 | "changeset to use from the remote repository. See also :hg:`help\n" |
|
13178 | "changeset to use from the remote repository. See also :hg:`help\n" | |
12975 | "revisions`." |
|
13179 | "revisions`." | |
12976 | msgstr "" |
|
13180 | msgstr "" | |
12977 |
"連携先リポジトリ指定において、 '#' 記号に続けて識別子を指定することで、 |
|
13181 | "連携先リポジトリ指定において、 '#' 記号に続けて識別子を指定することで、\n" | |
12978 | "特定のブランチ、 タグないしチェンジセットを指定することが出来ます。\n" |
|
13182 | "特定のブランチ、 タグないしチェンジセットを指定することが出来ます。\n" | |
12979 | ":hg:`help revisions` も参照してください。" |
|
13183 | ":hg:`help revisions` も参照してください。" | |
12980 |
|
13184 | |||
@@ -13042,7 +13246,7 b' msgid ""' | |||||
13042 | "These URLs can all be stored in your configuration file with path\n" |
|
13246 | "These URLs can all be stored in your configuration file with path\n" | |
13043 | "aliases under the [paths] section like so::" |
|
13247 | "aliases under the [paths] section like so::" | |
13044 | msgstr "" |
|
13248 | msgstr "" | |
13045 |
"連携先 URL は、 設定ファイルの [paths] セクションで、 |
|
13249 | "連携先 URL は、 設定ファイルの [paths] セクションで、\n" | |
13046 | "別名を付けて記述することが出来ます::" |
|
13250 | "別名を付けて記述することが出来ます::" | |
13047 |
|
13251 | |||
13048 | msgid "" |
|
13252 | msgid "" | |
@@ -13094,7 +13298,7 b' msgstr ""' | |||||
13094 | " こちらが優先されます。\n" |
|
13298 | " こちらが優先されます。\n" | |
13095 |
|
13299 | |||
13096 | msgid "remote branch lookup not supported" |
|
13300 | msgid "remote branch lookup not supported" | |
13097 |
msgstr "連携先リポジトリ |
|
13301 | msgstr "連携先リポジトリはブランチ検索機能が未サポートです" | |
13098 |
|
13302 | |||
13099 | msgid "dirstate branch not accessible" |
|
13303 | msgid "dirstate branch not accessible" | |
13100 | msgstr "dirstate のブランチ情報にアクセスできません" |
|
13304 | msgstr "dirstate のブランチ情報にアクセスできません" | |
@@ -13127,10 +13331,10 b' msgstr "\xe8\xa4\x87\xe8\xa3\xbd\xe5\x85\x88 \'%s\' \xe3\x81\xaf\xe7\xa9\xba\xe3\x81\xa7\xe3\x81\xaf\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
13127 | msgid "" |
|
13331 | msgid "" | |
13128 | "src repository does not support revision lookup and so doesn't support clone " |
|
13332 | "src repository does not support revision lookup and so doesn't support clone " | |
13129 | "by revision" |
|
13333 | "by revision" | |
13130 |
msgstr "指定の複製元 |
|
13334 | msgstr "指定の複製元は、 リビジョン指定付き複製が未サポートです" | |
13131 |
|
13335 | |||
13132 | msgid "clone from remote to remote not supported" |
|
13336 | msgid "clone from remote to remote not supported" | |
13133 |
msgstr "リモートからリモートの複製は |
|
13337 | msgstr "リモートからリモートの複製は未サポートです" | |
13134 |
|
13338 | |||
13135 | #, python-format |
|
13339 | #, python-format | |
13136 | msgid "updating to branch %s\n" |
|
13340 | msgid "updating to branch %s\n" | |
@@ -13154,6 +13358,10 b' msgid "(branch merge, don\'t forget to co' | |||||
13154 | msgstr "(マージ結果の commit を忘れずに)\n" |
|
13358 | msgstr "(マージ結果の commit を忘れずに)\n" | |
13155 |
|
13359 | |||
13156 | #, python-format |
|
13360 | #, python-format | |
|
13361 | msgid "config file %s not found!" | |||
|
13362 | msgstr "設定ファイル %s が見つかりません!" | |||
|
13363 | ||||
|
13364 | #, python-format | |||
13157 | msgid "error reading %s/.hg/hgrc: %s\n" |
|
13365 | msgid "error reading %s/.hg/hgrc: %s\n" | |
13158 | msgstr "%s/.hg/hgrc の読み込みに失敗: %s\n" |
|
13366 | msgstr "%s/.hg/hgrc の読み込みに失敗: %s\n" | |
13159 |
|
13367 | |||
@@ -13203,7 +13411,7 b' msgstr "\xe3\x82\xa8\xe3\x83\xa9\xe3\x83\xbc: \xe3\x83\x95\xe3\x83\x83\xe3\x82\xaf %s \xe3\x81\xae\xe5\xa4\xb1\xe6\x95\x97: %s\\n"' | |||||
13203 |
|
13411 | |||
13204 | #, python-format |
|
13412 | #, python-format | |
13205 | msgid "error: %s hook raised an exception: %s\n" |
|
13413 | msgid "error: %s hook raised an exception: %s\n" | |
13206 |
msgstr "エラー: フック %s による例外 |
|
13414 | msgstr "エラー: フック %s による例外発生: %s\n" | |
13207 |
|
13415 | |||
13208 | #, python-format |
|
13416 | #, python-format | |
13209 | msgid "%s hook failed" |
|
13417 | msgid "%s hook failed" | |
@@ -13230,10 +13438,10 b' msgstr "\xe4\xba\x88\xe6\x9c\x9f\xe3\x81\x9b\xe3\x81\xac\xe6\x8e\xa5\xe7\xb6\x9a\xe7\xb5\x82\xe4\xba\x86"' | |||||
13230 |
|
13438 | |||
13231 | #, python-format |
|
13439 | #, python-format | |
13232 | msgid "unsupported URL component: \"%s\"" |
|
13440 | msgid "unsupported URL component: \"%s\"" | |
13233 |
msgstr "URL 要素 \"%s\" は |
|
13441 | msgstr "URL 要素 \"%s\" は未サポートです" | |
13234 |
|
13442 | |||
13235 | msgid "operation not supported over http" |
|
13443 | msgid "operation not supported over http" | |
13236 |
msgstr "http リポジトリでは |
|
13444 | msgstr "http リポジトリでは未サポートの機能です" | |
13237 |
|
13445 | |||
13238 | msgid "authorization failed" |
|
13446 | msgid "authorization failed" | |
13239 | msgstr "認証に失敗" |
|
13447 | msgstr "認証に失敗" | |
@@ -13293,13 +13501,17 b' msgstr "%s\xe3\x81\xa8\xe3\x81\x84\xe3\x81\x86\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xaf\xe6\x97\xa2\xe3\x81\xab\xe5\xad\x98\xe5\x9c\xa8\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x99"' | |||||
13293 |
|
13501 | |||
13294 | #, python-format |
|
13502 | #, python-format | |
13295 | msgid "requirement '%s' not supported" |
|
13503 | msgid "requirement '%s' not supported" | |
13296 |
msgstr "必須機能 '%s' |
|
13504 | msgstr "必須機能 '%s' が未サポートです" | |
13297 |
|
13505 | |||
13298 | #, python-format |
|
13506 | #, python-format | |
13299 | msgid ".hg/sharedpath points to nonexistent directory %s" |
|
13507 | msgid ".hg/sharedpath points to nonexistent directory %s" | |
13300 | msgstr ".hg/sharedpath の参照先 %s は存在しません" |
|
13508 | msgstr ".hg/sharedpath の参照先 %s は存在しません" | |
13301 |
|
13509 | |||
13302 | #, python-format |
|
13510 | #, python-format | |
|
13511 | msgid "warning: ignoring unknown working parent %s!\n" | |||
|
13512 | msgstr "警告: 作業領域の親 '%s' が未知のリビジョンです!\n" | |||
|
13513 | ||||
|
13514 | #, python-format | |||
13303 | msgid "%r cannot be used in a tag name" |
|
13515 | msgid "%r cannot be used in a tag name" | |
13304 | msgstr "%r はタグ名に使用できません" |
|
13516 | msgstr "%r はタグ名に使用できません" | |
13305 |
|
13517 | |||
@@ -13328,12 +13540,12 b' msgid "no interrupted transaction availa' | |||||
13328 | msgstr "中断されたトランザクションはありません\n" |
|
13540 | msgstr "中断されたトランザクションはありません\n" | |
13329 |
|
13541 | |||
13330 | #, python-format |
|
13542 | #, python-format | |
13331 |
msgid "r |
|
13543 | msgid "repository tip rolled back to revision %s (undo %s: %s)\n" | |
13332 |
msgstr "リビジョン %s |
|
13544 | msgstr "tip をリビジョン %s に巻き戻しました (取り消し %s: %s)\n" | |
13333 |
|
13545 | |||
13334 | #, python-format |
|
13546 | #, python-format | |
13335 |
msgid "r |
|
13547 | msgid "repository tip rolled back to revision %s (undo %s)\n" | |
13336 |
msgstr "リビジョン %s |
|
13548 | msgstr "tip をリビジョン %s に巻き戻しました (取り消し %s)\n" | |
13337 |
|
13549 | |||
13338 | msgid "rolling back unknown transaction\n" |
|
13550 | msgid "rolling back unknown transaction\n" | |
13339 | msgstr "未知のトランザクションの巻き戻し中\n" |
|
13551 | msgstr "未知のトランザクションの巻き戻し中\n" | |
@@ -13342,6 +13554,14 b' msgstr "\xe6\x9c\xaa\xe7\x9f\xa5\xe3\x81\xae\xe3\x83\x88\xe3\x83\xa9\xe3\x83\xb3\xe3\x82\xb6\xe3\x82\xaf\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe5\xb7\xbb\xe3\x81\x8d\xe6\x88\xbb\xe3\x81\x97\xe4\xb8\xad\\n"' | |||||
13342 | msgid "Named branch could not be reset, current branch still is: %s\n" |
|
13554 | msgid "Named branch could not be reset, current branch still is: %s\n" | |
13343 | msgstr "名前つきブランチはリセットできませんので、 %s のままです\n" |
|
13555 | msgstr "名前つきブランチはリセットできませんので、 %s のままです\n" | |
13344 |
|
13556 | |||
|
13557 | #, python-format | |||
|
13558 | msgid "working directory now based on revisions %d and %d\n" | |||
|
13559 | msgstr "%d と %d が作業領域の親リビジョンになりました\n" | |||
|
13560 | ||||
|
13561 | #, python-format | |||
|
13562 | msgid "working directory now based on revision %d\n" | |||
|
13563 | msgstr "%d が作業領域の親リビジョンになりました\n" | |||
|
13564 | ||||
13345 | msgid "no rollback information available\n" |
|
13565 | msgid "no rollback information available\n" | |
13346 | msgstr "利用可能なロールバック情報がありません\n" |
|
13566 | msgstr "利用可能なロールバック情報がありません\n" | |
13347 |
|
13567 | |||
@@ -13357,12 +13577,20 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa \'%s\'"' | |||||
13357 | msgid "working directory of %s" |
|
13577 | msgid "working directory of %s" | |
13358 | msgstr "%s の作業領域" |
|
13578 | msgstr "%s の作業領域" | |
13359 |
|
13579 | |||
|
13580 | #, python-format | |||
|
13581 | msgid "warning: can't find ancestor for '%s' copied from '%s'!\n" | |||
|
13582 | msgstr "警告: '%s'('%s' からの複製)の祖先が見つかりません\n" | |||
|
13583 | ||||
13360 | msgid "cannot partially commit a merge (do not specify files or patterns)" |
|
13584 | msgid "cannot partially commit a merge (do not specify files or patterns)" | |
13361 | msgstr "マージの部分コミットはできません(ファイル名/パターンは指定できません)" |
|
13585 | msgstr "マージの部分コミットはできません(ファイル名/パターンは指定できません)" | |
13362 |
|
13586 | |||
13363 | msgid "can't commit subrepos without .hgsub" |
|
13587 | msgid "can't commit subrepos without .hgsub" | |
13364 | msgstr ".hgsub の無い副リポジトリはコミットできません" |
|
13588 | msgstr ".hgsub の無い副リポジトリはコミットできません" | |
13365 |
|
13589 | |||
|
13590 | #, python-format | |||
|
13591 | msgid "uncommitted changes in subrepo %s" | |||
|
13592 | msgstr "副リポジトリ %s に未コミット変更があります" | |||
|
13593 | ||||
13366 | msgid "file not found!" |
|
13594 | msgid "file not found!" | |
13367 | msgstr "ファイルが見つかりません!" |
|
13595 | msgstr "ファイルが見つかりません!" | |
13368 |
|
13596 | |||
@@ -13393,41 +13621,42 b' msgstr "\xe5\x85\xa8\xe3\x83\x81\xe3\x82\xa7\xe3\x83\xb3\xe3\x82\xb8\xe3\x82\xbb\xe3\x83\x83\xe3\x83\x88\xe3\x82\x92\xe5\x8f\x96\xe5\xbe\x97\xe4\xb8\xad\\n"' | |||||
13393 | msgid "" |
|
13621 | msgid "" | |
13394 | "partial pull cannot be done because other repository doesn't support " |
|
13622 | "partial pull cannot be done because other repository doesn't support " | |
13395 | "changegroupsubset." |
|
13623 | "changegroupsubset." | |
13396 | msgstr "" |
|
13624 | msgstr "連携先の changegroupsubset 機能未対応により、 部分取り込みできません。" | |
13397 | "連携先の changegroupsubset 機能未対応により、 部分取り込みできません。" |
|
13625 | ||
|
13626 | #, python-format | |||
|
13627 | msgid "updating bookmark %s\n" | |||
|
13628 | msgstr "ブックマーク %s の更新中\n" | |||
|
13629 | ||||
|
13630 | #, python-format | |||
|
13631 | msgid "not updating divergent bookmark %s\n" | |||
|
13632 | msgstr "衝突するブックマーク %s は更新しません\n" | |||
13398 |
|
13633 | |||
13399 | #, python-format |
|
13634 | #, python-format | |
13400 | msgid "%d changesets found\n" |
|
13635 | msgid "%d changesets found\n" | |
13401 | msgstr "%d 個のチェンジセット\n" |
|
13636 | msgstr "%d 個のチェンジセット\n" | |
13402 |
|
13637 | |||
13403 |
msgid "bundling |
|
13638 | msgid "bundling" | |
13404 |
msgstr " |
|
13639 | msgstr "バンドル生成中" | |
13405 |
|
13640 | |||
13406 |
msgid " |
|
13641 | msgid "manifests" | |
13407 |
msgstr " |
|
13642 | msgstr "マニフェスト" | |
13408 |
|
||||
13409 | msgid "bundling manifests" |
|
|||
13410 | msgstr "マニフェストをバンドルに追加中" |
|
|||
13411 |
|
13643 | |||
13412 | #, python-format |
|
13644 | #, python-format | |
13413 | msgid "empty or missing revlog for %s" |
|
13645 | msgid "empty or missing revlog for %s" | |
13414 | msgstr "%s に対するリビジョンログが空ないし不在です" |
|
13646 | msgstr "%s に対するリビジョンログが空ないし不在です" | |
13415 |
|
13647 | |||
13416 | msgid "bundling files" |
|
|||
13417 | msgstr "ファイルをバンドルに追加中" |
|
|||
13418 |
|
||||
13419 | msgid "adding changesets\n" |
|
13648 | msgid "adding changesets\n" | |
13420 | msgstr "チェンジセットを追加中\n" |
|
13649 | msgstr "チェンジセットを追加中\n" | |
13421 |
|
13650 | |||
|
13651 | msgid "chunks" | |||
|
13652 | msgstr "チャンク" | |||
|
13653 | ||||
13422 | msgid "received changelog group is empty" |
|
13654 | msgid "received changelog group is empty" | |
13423 | msgstr "受信した変更履歴は空です" |
|
13655 | msgstr "受信した変更履歴は空です" | |
13424 |
|
13656 | |||
13425 | msgid "adding manifests\n" |
|
13657 | msgid "adding manifests\n" | |
13426 | msgstr "マニフェストを追加中\n" |
|
13658 | msgstr "マニフェストを追加中\n" | |
13427 |
|
13659 | |||
13428 | msgid "manifests" |
|
|||
13429 | msgstr "マニフェスト" |
|
|||
13430 |
|
||||
13431 | msgid "adding file changes\n" |
|
13660 | msgid "adding file changes\n" | |
13432 | msgstr "ファイルの変更を追加中\n" |
|
13661 | msgstr "ファイルの変更を追加中\n" | |
13433 |
|
13662 | |||
@@ -13447,7 +13676,7 b' msgid "added %d changesets with %d chang' | |||||
13447 | msgstr "%d のチェンジセット(%d の変更を %d ファイルに適用)を追加%s\n" |
|
13676 | msgstr "%d のチェンジセット(%d の変更を %d ファイルに適用)を追加%s\n" | |
13448 |
|
13677 | |||
13449 | msgid "Unexpected response from remote server:" |
|
13678 | msgid "Unexpected response from remote server:" | |
13450 |
msgstr "連携先のサーバから予期しない返信: |
|
13679 | msgstr "連携先のサーバから予期しない返信:" | |
13451 |
|
13680 | |||
13452 | msgid "operation forbidden by server" |
|
13681 | msgid "operation forbidden by server" | |
13453 | msgstr "その処理はサーバで禁止されています" |
|
13682 | msgstr "その処理はサーバで禁止されています" | |
@@ -13469,6 +13698,12 b' msgstr "%d \xe5\x80\x8b\xe3\x81\xae\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe8\xbb\xa2\xe9\x80\x81(\xe3\x83\x87\xe3\x83\xbc\xe3\x82\xbf\xe9\x87\x8f %s)\\n"' | |||||
13469 | msgid "transferred %s in %.1f seconds (%s/sec)\n" |
|
13698 | msgid "transferred %s in %.1f seconds (%s/sec)\n" | |
13470 | msgstr "%s を %.1f 秒で送信しました(%s/秒)\n" |
|
13699 | msgstr "%s を %.1f 秒で送信しました(%s/秒)\n" | |
13471 |
|
13700 | |||
|
13701 | msgid "can't use TLS: Python SSL support not installed" | |||
|
13702 | msgstr "TLS を利用できません: Python SSL サポートがインストールされていません" | |||
|
13703 | ||||
|
13704 | msgid "(using smtps)\n" | |||
|
13705 | msgstr "(SMTP を使用)\n" | |||
|
13706 | ||||
13472 | msgid "smtp.host not configured - cannot send mail" |
|
13707 | msgid "smtp.host not configured - cannot send mail" | |
13473 | msgstr "設定ファイルに smtp.host 指定がありません - メール送信に失敗" |
|
13708 | msgstr "設定ファイルに smtp.host 指定がありません - メール送信に失敗" | |
13474 |
|
13709 | |||
@@ -13476,11 +13711,8 b' msgstr "\xe8\xa8\xad\xe5\xae\x9a\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xab smtp.host \xe6\x8c\x87\xe5\xae\x9a\xe3\x81\x8c\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93 - \xe3\x83\xa1\xe3\x83\xbc\xe3\x83\xab\xe9\x80\x81\xe4\xbf\xa1\xe3\x81\xab\xe5\xa4\xb1\xe6\x95\x97"' | |||||
13476 | msgid "sending mail: smtp host %s, port %s\n" |
|
13711 | msgid "sending mail: smtp host %s, port %s\n" | |
13477 | msgstr "メール送信中: SMTP ホスト %s、 ポート番号 %s\n" |
|
13712 | msgstr "メール送信中: SMTP ホスト %s、 ポート番号 %s\n" | |
13478 |
|
13713 | |||
13479 | msgid "can't use TLS: Python SSL support not installed" |
|
13714 | msgid "(using starttls)\n" | |
13480 | msgstr "TLS を利用できません: Python SSL サポートがインストールされていません" |
|
13715 | msgstr "(starttls を使用)\n" | |
13481 |
|
||||
13482 | msgid "(using tls)\n" |
|
|||
13483 | msgstr "(TLS を使用中)\n" |
|
|||
13484 |
|
13716 | |||
13485 | #, python-format |
|
13717 | #, python-format | |
13486 | msgid "(authenticating to mail server as %s)\n" |
|
13718 | msgid "(authenticating to mail server as %s)\n" | |
@@ -13521,6 +13753,10 b' msgid "invalid pattern"' | |||||
13521 | msgstr "不正パターン" |
|
13753 | msgstr "不正パターン" | |
13522 |
|
13754 | |||
13523 | #, python-format |
|
13755 | #, python-format | |
|
13756 | msgid "unable to read file list (%s)" | |||
|
13757 | msgstr "一覧ファイル(%s)が読み込めません" | |||
|
13758 | ||||
|
13759 | #, python-format | |||
13524 | msgid "diff context lines count must be an integer, not %r" |
|
13760 | msgid "diff context lines count must be an integer, not %r" | |
13525 | msgstr "差分コンテキストでの行数指定が不正です: %r" |
|
13761 | msgstr "差分コンテキストでの行数指定が不正です: %r" | |
13526 |
|
13762 | |||
@@ -13540,16 +13776,16 b' msgid ""' | |||||
13540 | "(n)one, e(x)ec or sym(l)ink?" |
|
13776 | "(n)one, e(x)ec or sym(l)ink?" | |
13541 | msgstr "" |
|
13777 | msgstr "" | |
13542 | "ファイル %s のビット設定に衝突があります\n" |
|
13778 | "ファイル %s のビット設定に衝突があります\n" | |
13543 |
"どの設定にしますか?無効:(n)one |
|
13779 | "どの設定にしますか? 無効:(n)one 実行可能:e(x)ec リンク:sym(l)ink" | |
13544 |
|
13780 | |||
13545 | msgid "&None" |
|
13781 | msgid "&None" | |
13546 |
msgstr " |
|
13782 | msgstr "&None" | |
13547 |
|
13783 | |||
13548 | msgid "E&xec" |
|
13784 | msgid "E&xec" | |
13549 |
msgstr " |
|
13785 | msgstr "E&xec" | |
13550 |
|
13786 | |||
13551 | msgid "Sym&link" |
|
13787 | msgid "Sym&link" | |
13552 | msgstr "シンボリックリンク (&L)" |
|
13788 | msgstr "Sym&link" | |
13553 |
|
13789 | |||
13554 | msgid "resolving manifests\n" |
|
13790 | msgid "resolving manifests\n" | |
13555 | msgstr "管理ファイル一覧を解決しています\n" |
|
13791 | msgstr "管理ファイル一覧を解決しています\n" | |
@@ -13560,7 +13796,7 b' msgid ""' | |||||
13560 | "use (c)hanged version or (d)elete?" |
|
13796 | "use (c)hanged version or (d)elete?" | |
13561 | msgstr "" |
|
13797 | msgstr "" | |
13562 | "変更したファイル %s は別リビジョンで登録除外されています\n" |
|
13798 | "変更したファイル %s は別リビジョンで登録除外されています\n" | |
13563 |
"どちらを採用しますか?変更:(c)hange |
|
13799 | "どちらを採用しますか? 変更:(c)hange 登録除外:(d)elete" | |
13564 |
|
13800 | |||
13565 | msgid "&Changed" |
|
13801 | msgid "&Changed" | |
13566 | msgstr "&Changed" |
|
13802 | msgstr "&Changed" | |
@@ -13574,7 +13810,7 b' msgid ""' | |||||
13574 | "use (c)hanged version or leave (d)eleted?" |
|
13810 | "use (c)hanged version or leave (d)eleted?" | |
13575 | msgstr "" |
|
13811 | msgstr "" | |
13576 | "リモートで変更された %s はローカルで削除されています\n" |
|
13812 | "リモートで変更された %s はローカルで削除されています\n" | |
13577 | "変更されたもの(c)hangedを使用しますか?それとも削除(d)eleteしますか?" |
|
13813 | "どちらを採用しますか? 変更:(c)hanged 削除:(d)elete" | |
13578 |
|
13814 | |||
13579 | msgid "&Deleted" |
|
13815 | msgid "&Deleted" | |
13580 | msgstr "&Deleted" |
|
13816 | msgstr "&Deleted" | |
@@ -13611,6 +13847,10 b' msgstr "\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xb8\xe3\x81\xaf\xe4\xb8\x8d\xe8\xa6\x81\xe3\x81\xa7\xe3\x81\x99(\'hg update\' \xe3\x81\x8b \'hg heads\' \xe3\x82\x92\xe4\xbd\xbf\xe7\x94\xa8\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84)"' | |||||
13611 | msgid "outstanding uncommitted changes (use 'hg status' to list changes)" |
|
13847 | msgid "outstanding uncommitted changes (use 'hg status' to list changes)" | |
13612 | msgstr "未コミット変更があります('hg status' で変更一覧表示可能)" |
|
13848 | msgstr "未コミット変更があります('hg status' で変更一覧表示可能)" | |
13613 |
|
13849 | |||
|
13850 | #, python-format | |||
|
13851 | msgid "outstanding uncommitted changes in subrepository '%s'" | |||
|
13852 | msgstr "副リポジトリ %s に未コミット変更あり" | |||
|
13853 | ||||
13614 | msgid "crosses branches (merge branches or use --clean to discard changes)" |
|
13854 | msgid "crosses branches (merge branches or use --clean to discard changes)" | |
13615 | msgstr "" |
|
13855 | msgstr "" | |
13616 | "ブランチ横断の更新 (マージするか、 --clean 指定で変更を破棄してください)" |
|
13856 | "ブランチ横断の更新 (マージするか、 --clean 指定で変更を破棄してください)" | |
@@ -13713,7 +13953,7 b' msgstr "\xe4\xb8\x8d\xe6\xad\xa3\xe3\x81\xaa\xe3\x83\x91\xe3\x83\x83\xe3\x83\x81: %s %s"' | |||||
13713 |
|
13953 | |||
13714 | #, python-format |
|
13954 | #, python-format | |
13715 | msgid "unsupported parser state: %s" |
|
13955 | msgid "unsupported parser state: %s" | |
13716 |
msgstr "サポート |
|
13956 | msgstr "未サポートなパーサ状態です: %s" | |
13717 |
|
13957 | |||
13718 | #, python-format |
|
13958 | #, python-format | |
13719 | msgid "patch command failed: %s" |
|
13959 | msgid "patch command failed: %s" | |
@@ -13755,7 +13995,7 b' msgstr "\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe9\x99\xa4\xe5\xa4\x96\xe3\x81\xab\xe5\xa4\xb1\xe6\x95\x97: \xe9\x83\xa8\xe5\x88\x86\xe7\x9a\x84\xe3\x81\xaa\xe3\x83\x90\xe3\x83\xb3\xe3\x83\x89\xe3\x83\xab\xe3\x82\x92 \'%s\' \xe3\x81\xab\xe4\xbf\x9d\xe5\xad\x98\\n"' | |||||
13755 |
|
13995 | |||
13756 | #, python-format |
|
13996 | #, python-format | |
13757 | msgid "cannot %s; remote repository does not support the %r capability" |
|
13997 | msgid "cannot %s; remote repository does not support the %r capability" | |
13758 |
msgstr "%s できません。 |
|
13998 | msgstr "%s ができません。 連携先は機能 %r が未サポートです" | |
13759 |
|
13999 | |||
13760 | #, python-format |
|
14000 | #, python-format | |
13761 | msgid "unknown compression type %r" |
|
14001 | msgid "unknown compression type %r" | |
@@ -13854,18 +14094,19 b' msgid "rev expects a number"' | |||||
13854 | msgstr "rev 指定は数値でなければなりません" |
|
14094 | msgstr "rev 指定は数値でなければなりません" | |
13855 |
|
14095 | |||
13856 | msgid "" |
|
14096 | msgid "" | |
13857 | "``p1(set)``\n" |
|
14097 | "``p1([set])``\n" | |
13858 | " First parent of changesets in set." |
|
14098 | " First parent of changesets in set, or the working directory." | |
13859 | msgstr "" |
|
14099 | msgstr "" | |
13860 |
|
14100 | |||
13861 | msgid "" |
|
14101 | msgid "" | |
13862 | "``p2(set)``\n" |
|
14102 | "``p2([set])``\n" | |
13863 | " Second parent of changesets in set." |
|
14103 | " Second parent of changesets in set, or the working directory." | |
13864 | msgstr "" |
|
14104 | msgstr "" | |
13865 |
|
14105 | |||
13866 | msgid "" |
|
14106 | msgid "" | |
13867 | "``parents(set)``\n" |
|
14107 | "``parents([set])``\n" | |
13868 |
" The set of all parents for all changesets in set |
|
14108 | " The set of all parents for all changesets in set, or the working " | |
|
14109 | "directory." | |||
13869 | msgstr "" |
|
14110 | msgstr "" | |
13870 |
|
14111 | |||
13871 | msgid "" |
|
14112 | msgid "" | |
@@ -14137,6 +14378,19 b' msgstr "tagged \xe6\x8c\x87\xe5\xae\x9a\xe3\x81\xab\xe3\x81\xaf\xe5\xbc\x95\xe6\x95\xb0\xe3\x81\x8c\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
14137 | msgid "the argument to tag must be a string" |
|
14378 | msgid "the argument to tag must be a string" | |
14138 | msgstr "tag 指定は文字列でなければなりません" |
|
14379 | msgstr "tag 指定は文字列でなければなりません" | |
14139 |
|
14380 | |||
|
14381 | msgid "" | |||
|
14382 | "``bookmark([name])``\n" | |||
|
14383 | " The named bookmark or all bookmarks." | |||
|
14384 | msgstr "" | |||
|
14385 | ||||
|
14386 | #. i18n: "bookmark" is a keyword | |||
|
14387 | msgid "bookmark takes one or no arguments" | |||
|
14388 | msgstr "bookmark 指定には1個ないし2個の引数が必要です" | |||
|
14389 | ||||
|
14390 | #. i18n: "bookmark" is a keyword | |||
|
14391 | msgid "the argument to bookmark must be a string" | |||
|
14392 | msgstr "" | |||
|
14393 | ||||
14140 | msgid "can't negate that" |
|
14394 | msgid "can't negate that" | |
14141 | msgstr "負値にできません" |
|
14395 | msgstr "負値にできません" | |
14142 |
|
14396 | |||
@@ -14197,6 +14451,10 b' msgid "invalid entry in fncache, line %s' | |||||
14197 | msgstr "ファイル名キャッシュに不正なエントリ: %s 行目" |
|
14451 | msgstr "ファイル名キャッシュに不正なエントリ: %s 行目" | |
14198 |
|
14452 | |||
14199 | #, python-format |
|
14453 | #, python-format | |
|
14454 | msgid "warning: subrepo spec file %s not found\n" | |||
|
14455 | msgstr "警告: 副リポジトリの spec ファイル %s が見つかりません\n" | |||
|
14456 | ||||
|
14457 | #, python-format | |||
14200 | msgid "subrepo spec file %s not found" |
|
14458 | msgid "subrepo spec file %s not found" | |
14201 | msgstr "副リポジトリの spec ファイル %s が見つかりません" |
|
14459 | msgstr "副リポジトリの spec ファイル %s が見つかりません" | |
14202 |
|
14460 | |||
@@ -14212,8 +14470,8 b' msgid ""' | |||||
14212 | " subrepository sources for %s differ\n" |
|
14470 | " subrepository sources for %s differ\n" | |
14213 | "use (l)ocal source (%s) or (r)emote source (%s)?" |
|
14471 | "use (l)ocal source (%s) or (r)emote source (%s)?" | |
14214 | msgstr "" |
|
14472 | msgstr "" | |
14215 |
" |
|
14473 | " 副リポジトリ %s で差分が検出されました\n" | |
14216 |
"どちら |
|
14474 | "どちらを採用しますか? 手元(%s):(l)ocal 遠隔(%s):(r)emote" | |
14217 |
|
14475 | |||
14218 | msgid "&Remote" |
|
14476 | msgid "&Remote" | |
14219 | msgstr "&Remote" |
|
14477 | msgstr "&Remote" | |
@@ -14223,26 +14481,46 b' msgid ""' | |||||
14223 | " local changed subrepository %s which remote removed\n" |
|
14481 | " local changed subrepository %s which remote removed\n" | |
14224 | "use (c)hanged version or (d)elete?" |
|
14482 | "use (c)hanged version or (d)elete?" | |
14225 | msgstr "" |
|
14483 | msgstr "" | |
14226 |
" |
|
14484 | "副リポジトリで変更したファイル %s は、 遠隔では登録除外されています\n" | |
14227 |
"どちらを採用しますか?変更:(c)hange |
|
14485 | "どちらを採用しますか? 変更:(c)hange 登録除外:(d)elete" | |
14228 |
|
14486 | |||
14229 | #, python-format |
|
14487 | #, python-format | |
14230 | msgid "" |
|
14488 | msgid "" | |
14231 | " remote changed subrepository %s which local removed\n" |
|
14489 | " remote changed subrepository %s which local removed\n" | |
14232 | "use (c)hanged version or (d)elete?" |
|
14490 | "use (c)hanged version or (d)elete?" | |
14233 | msgstr "" |
|
14491 | msgstr "" | |
14234 |
" |
|
14492 | "副リポジトリで登録除外されたファイル %s は、 遠隔では変更されています\n" | |
14235 |
"どちらを採用しますか?変更:(c)hange |
|
14493 | "どちらを採用しますか? 変更:(c)hange 登録除外:(d)elete" | |
|
14494 | ||||
|
14495 | #, python-format | |||
|
14496 | msgid "" | |||
|
14497 | " subrepository sources for %s differ\n" | |||
|
14498 | "use (l)ocal source (%s) or (r)emote source (%s)?\n" | |||
|
14499 | msgstr "" | |||
|
14500 | " 副リポジトリ %s の作業領域で差分が検出されました\n" | |||
|
14501 | "どちらを採用しますか? 手元(%s):(l)ocal 遠隔(%s):(r)emote\n" | |||
|
14502 | ||||
|
14503 | #, python-format | |||
|
14504 | msgid "" | |||
|
14505 | " subrepository sources for %s differ (in checked out version)\n" | |||
|
14506 | "use (l)ocal source (%s) or (r)emote source (%s)?\n" | |||
|
14507 | msgstr "" | |||
|
14508 | " 副リポジトリ %s のリビジョンに差分が検出されました\n" | |||
|
14509 | "どちらを採用しますか? 手元(%s):(l)ocal 遠隔(%s):(r)emote\n" | |||
14236 |
|
14510 | |||
14237 | #, python-format |
|
14511 | #, python-format | |
14238 | msgid "default path for subrepository %s not found" |
|
14512 | msgid "default path for subrepository %s not found" | |
14239 |
msgstr " |
|
14513 | msgstr "副リポジトリ %s の が見つかりません" | |
14240 |
|
14514 | |||
14241 | #, python-format |
|
14515 | #, python-format | |
14242 | msgid "unknown subrepo type %s" |
|
14516 | msgid "unknown subrepo type %s" | |
14243 | msgstr "未知の副リポジトリ種別 '%s'" |
|
14517 | msgstr "未知の副リポジトリ種別 '%s'" | |
14244 |
|
14518 | |||
14245 | #, python-format |
|
14519 | #, python-format | |
|
14520 | msgid "archiving (%s)" | |||
|
14521 | msgstr "アーカイブ中 (%s)" | |||
|
14522 | ||||
|
14523 | #, python-format | |||
14246 | msgid "warning: error \"%s\" in subrepository \"%s\"\n" |
|
14524 | msgid "warning: error \"%s\" in subrepository \"%s\"\n" | |
14247 | msgstr "警告: エラー \"%s\" が副リポジトリ \"%s\" で発生\n" |
|
14525 | msgstr "警告: エラー \"%s\" が副リポジトリ \"%s\" で発生\n" | |
14248 |
|
14526 | |||
@@ -14266,6 +14544,39 b' msgid "not removing repo %s because it h' | |||||
14266 | msgstr "変更が含まれているため、 リポジトリ %s は削除されません\n" |
|
14544 | msgstr "変更が含まれているため、 リポジトリ %s は削除されません\n" | |
14267 |
|
14545 | |||
14268 | #, python-format |
|
14546 | #, python-format | |
|
14547 | msgid "cloning subrepo %s\n" | |||
|
14548 | msgstr "副リポジトリ %s を複製中\n" | |||
|
14549 | ||||
|
14550 | #, python-format | |||
|
14551 | msgid "pulling subrepo %s\n" | |||
|
14552 | msgstr "副リポジトリ %s の更新取り込み中\n" | |||
|
14553 | ||||
|
14554 | #, python-format | |||
|
14555 | msgid "revision %s does not exist in subrepo %s\n" | |||
|
14556 | msgstr "リビジョン %s は副リポジトリ %s には存在しません\n" | |||
|
14557 | ||||
|
14558 | #, python-format | |||
|
14559 | msgid "checking out detached HEAD in subrepo %s\n" | |||
|
14560 | msgstr "" | |||
|
14561 | ||||
|
14562 | msgid "check out a git branch if you intend to make changes\n" | |||
|
14563 | msgstr "" | |||
|
14564 | ||||
|
14565 | #, python-format | |||
|
14566 | msgid "unrelated git branch checked out in subrepo %s\n" | |||
|
14567 | msgstr "副リポジトリ %s は、 無関係な git ブランチで更新されています\n" | |||
|
14568 | ||||
|
14569 | #, python-format | |||
|
14570 | msgid "pushing branch %s of subrepo %s\n" | |||
|
14571 | msgstr "ブランチ %s を副リポジトリ %s から反映中\n" | |||
|
14572 | ||||
|
14573 | #, python-format | |||
|
14574 | msgid "" | |||
|
14575 | "no branch checked out in subrepo %s\n" | |||
|
14576 | "cannot push revision %s" | |||
|
14577 | msgstr "" | |||
|
14578 | ||||
|
14579 | #, python-format | |||
14269 | msgid "%s, line %s: %s\n" |
|
14580 | msgid "%s, line %s: %s\n" | |
14270 | msgstr "%s %s行目: %s\n" |
|
14581 | msgstr "%s %s行目: %s\n" | |
14271 |
|
14582 | |||
@@ -14276,25 +14587,39 b' msgstr "\xe3\x82\xa8\xe3\x83\xb3\xe3\x83\x88\xe3\x83\xaa\xe3\x82\x92\xe8\xaa\xad\xe3\x81\xbf\xe8\xbe\xbc\xe3\x82\x81\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
14276 | msgid "node '%s' is not well formed" |
|
14587 | msgid "node '%s' is not well formed" | |
14277 | msgstr "'%s' というノードはフォーマットが不適切です" |
|
14588 | msgstr "'%s' というノードはフォーマットが不適切です" | |
14278 |
|
14589 | |||
14279 |
msgid ".hg/ |
|
14590 | msgid ".hg/cache/tags is corrupt, rebuilding it\n" | |
14280 |
msgstr ".hg/ |
|
14591 | msgstr ".hg/cache/tags が無効なため再構築中\n" | |
|
14592 | ||||
|
14593 | #, python-format | |||
|
14594 | msgid "unknown method '%s'" | |||
|
14595 | msgstr "不明な処理 '%s' が指定されました" | |||
|
14596 | ||||
|
14597 | msgid "expected a symbol" | |||
|
14598 | msgstr "シンボル指定が必要です" | |||
|
14599 | ||||
|
14600 | #, python-format | |||
|
14601 | msgid "unknown function '%s'" | |||
|
14602 | msgstr "不明な関数 '%s' が指定されました" | |||
|
14603 | ||||
|
14604 | msgid "expected template specifier" | |||
|
14605 | msgstr "テンプレート指定が必要です" | |||
|
14606 | ||||
|
14607 | #, python-format | |||
|
14608 | msgid "filter %s expects one argument" | |||
|
14609 | msgstr "フィルタ %s は引数が1つ必要です" | |||
14281 |
|
14610 | |||
14282 | msgid "unmatched quotes" |
|
14611 | msgid "unmatched quotes" | |
14283 | msgstr "引用符の対応関係が不正です" |
|
14612 | msgstr "引用符の対応関係が不正です" | |
14284 |
|
14613 | |||
14285 | #, python-format |
|
14614 | #, python-format | |
14286 | msgid "error expanding '%s%%%s'" |
|
|||
14287 | msgstr "'%s%%%s' 展開の失敗" |
|
|||
14288 |
|
||||
14289 | #, python-format |
|
|||
14290 | msgid "unknown filter '%s'" |
|
|||
14291 | msgstr "'%s' は未知のフィルタです" |
|
|||
14292 |
|
||||
14293 | #, python-format |
|
|||
14294 | msgid "style not found: %s" |
|
14615 | msgid "style not found: %s" | |
14295 | msgstr "スタイルが見つかりません: %s" |
|
14616 | msgstr "スタイルが見つかりません: %s" | |
14296 |
|
14617 | |||
14297 | #, python-format |
|
14618 | #, python-format | |
|
14619 | msgid "\"%s\" not in template map" | |||
|
14620 | msgstr "\"%s\" はキーワードとして認識できません" | |||
|
14621 | ||||
|
14622 | #, python-format | |||
14298 | msgid "template file %s: %s" |
|
14623 | msgid "template file %s: %s" | |
14299 | msgstr "テンプレートファイル %s: %s" |
|
14624 | msgstr "テンプレートファイル %s: %s" | |
14300 |
|
14625 | |||
@@ -14360,6 +14685,10 b' msgstr "\xe3\x83\x91\xe3\x82\xb9\xe3\x83\xaf\xe3\x83\xbc\xe3\x83\x89: "' | |||||
14360 | msgid "edit failed" |
|
14685 | msgid "edit failed" | |
14361 | msgstr "編集に失敗" |
|
14686 | msgstr "編集に失敗" | |
14362 |
|
14687 | |||
|
14688 | #, python-format | |||
|
14689 | msgid "ignoring invalid [auth] key '%s'\n" | |||
|
14690 | msgstr "不正な [auth] セクションのキー'%s' を無視します\n" | |||
|
14691 | ||||
14363 | msgid "http authorization required" |
|
14692 | msgid "http authorization required" | |
14364 | msgstr "HTTP 認証に失敗" |
|
14693 | msgstr "HTTP 認証に失敗" | |
14365 |
|
14694 | |||
@@ -14381,9 +14710,8 b' msgstr "\xe3\x83\xa6\xe3\x83\xbc\xe3\x82\xb6:"' | |||||
14381 | msgid "http auth: user %s, password %s\n" |
|
14710 | msgid "http auth: user %s, password %s\n" | |
14382 | msgstr "HTTP 認証: ユーザ名 %s, パスワード %s\n" |
|
14711 | msgstr "HTTP 認証: ユーザ名 %s, パスワード %s\n" | |
14383 |
|
14712 | |||
14384 | #, python-format |
|
14713 | msgid "kb" | |
14385 | msgid "ignoring invalid [auth] key '%s'\n" |
|
14714 | msgstr "キロバイト" | |
14386 | msgstr "不正な [auth] セクションのキー'%s' を無視します\n" |
|
|||
14387 |
|
14715 | |||
14388 | msgid "certificate checking requires Python 2.6" |
|
14716 | msgid "certificate checking requires Python 2.6" | |
14389 | msgstr "証明書検証には Python 2.6 が必要です" |
|
14717 | msgstr "証明書検証には Python 2.6 が必要です" | |
@@ -14395,20 +14723,50 b' msgstr "\xe8\xa8\xbc\xe6\x98\x8e\xe6\x9b\xb8\xe3\x81\x8c\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xa6\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
14395 | msgid "certificate is for %s" |
|
14723 | msgid "certificate is for %s" | |
14396 | msgstr "%s 用の証明書ファイル" |
|
14724 | msgstr "%s 用の証明書ファイル" | |
14397 |
|
14725 | |||
14398 | msgid "no commonName found in certificate" |
|
14726 | msgid "IDN in certificate not supported" | |
14399 | msgstr "証明書に commonName が含まれていません" |
|
14727 | msgstr "証明書の IDN は未サポートです" | |
14400 |
|
14728 | |||
14401 | #, python-format |
|
14729 | msgid "no commonName or subjectAltName found in certificate" | |
14402 | msgid "%s certificate error: %s" |
|
14730 | msgstr "証明書に commonName や subjectAltName が含まれていません" | |
14403 | msgstr "%s 用の証明書検証が失敗: %s" |
|
14731 | ||
|
14732 | #, python-format | |||
|
14733 | msgid "%s certificate error: %s (use --insecure to connect insecurely)" | |||
|
14734 | msgstr "%s の証明書不正: %s (非セキュア接続で継続するなら --insecure 指定)" | |||
|
14735 | ||||
|
14736 | #, python-format | |||
|
14737 | msgid "invalid certificate for %s with fingerprint %s" | |||
|
14738 | msgstr "%s の証明書(fingerprint は %s)が不正" | |||
|
14739 | ||||
|
14740 | #, python-format | |||
|
14741 | msgid "" | |||
|
14742 | "warning: %s certificate with fingerprint %s not verified (check " | |||
|
14743 | "hostfingerprints or web.cacerts config setting)\n" | |||
|
14744 | msgstr "" | |||
|
14745 | "警告: %s の証明書(fingerprint は %s)検証は省略 (設定ファイルの " | |||
|
14746 | "hostfingerprints ないし web.cacerts 設定を確認のこと)\n" | |||
|
14747 | ||||
|
14748 | #, python-format | |||
|
14749 | msgid "no certificate for %s with configured hostfingerprint" | |||
|
14750 | msgstr "hostfingerprint 設定された %s の証明書が取得できません" | |||
|
14751 | ||||
|
14752 | #, python-format | |||
|
14753 | msgid "" | |||
|
14754 | "warning: %s certificate not verified (check web.cacerts config setting)\n" | |||
|
14755 | msgstr "" | |||
|
14756 | "警告: %s の証明書検証は省略 (設定ファイルの hostfingerprints ないし web." | |||
|
14757 | "cacerts 設定を確認のこと)\n" | |||
14404 |
|
14758 | |||
14405 | #, python-format |
|
14759 | #, python-format | |
14406 | msgid "command '%s' failed: %s" |
|
14760 | msgid "command '%s' failed: %s" | |
14407 | msgstr "コマンド '%s' 失敗: %s" |
|
14761 | msgstr "コマンド '%s' 失敗: %s" | |
14408 |
|
14762 | |||
14409 | #, python-format |
|
14763 | #, python-format | |
|
14764 | msgid "path ends in directory separator: %s" | |||
|
14765 | msgstr "パスの末尾が区切り文字です: %s" | |||
|
14766 | ||||
|
14767 | #, python-format | |||
14410 | msgid "path contains illegal component: %s" |
|
14768 | msgid "path contains illegal component: %s" | |
14411 |
msgstr "パスに不正な |
|
14769 | msgstr "パスに不正な要素が含まれています: %s" | |
14412 |
|
14770 | |||
14413 | #, python-format |
|
14771 | #, python-format | |
14414 | msgid "path %r is inside repo %r" |
|
14772 | msgid "path %r is inside repo %r" | |
@@ -14418,12 +14776,16 b' msgstr "\xe3\x83\x91\xe3\x82\xb9 %r \xe3\x81\xaf\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa %r \xe5\x86\x85\xe3\x81\xab\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x99"' | |||||
14418 | msgid "path %r traverses symbolic link %r" |
|
14776 | msgid "path %r traverses symbolic link %r" | |
14419 | msgstr "パス %r はシンボリックリンク '%r' が含まれています" |
|
14777 | msgstr "パス %r はシンボリックリンク '%r' が含まれています" | |
14420 |
|
14778 | |||
14421 | msgid "Hardlinks not supported" |
|
|||
14422 | msgstr "ハードリンクはサポートしていません" |
|
|||
14423 |
|
||||
14424 | #, python-format |
|
14779 | #, python-format | |
14425 | msgid "could not symlink to %r: %s" |
|
14780 | msgid "could not symlink to %r: %s" | |
14426 |
msgstr "%r |
|
14781 | msgstr "%r に対してシンボリックリンクできません: %s" | |
|
14782 | ||||
|
14783 | msgid "check your clock" | |||
|
14784 | msgstr "システムの時刻設定を確認してください" | |||
|
14785 | ||||
|
14786 | #, python-format | |||
|
14787 | msgid "negative timestamp: %d" | |||
|
14788 | msgstr "負のタイムスタンプ: %d" | |||
14427 |
|
14789 | |||
14428 | #, python-format |
|
14790 | #, python-format | |
14429 | msgid "invalid date: %r" |
|
14791 | msgid "invalid date: %r" | |
@@ -14434,6 +14796,10 b' msgid "date exceeds 32 bits: %d"' | |||||
14434 | msgstr "日付が32ビットを超えています: %d" |
|
14796 | msgstr "日付が32ビットを超えています: %d" | |
14435 |
|
14797 | |||
14436 | #, python-format |
|
14798 | #, python-format | |
|
14799 | msgid "negative date value: %d" | |||
|
14800 | msgstr "負の日付情報: %d" | |||
|
14801 | ||||
|
14802 | #, python-format | |||
14437 | msgid "impossible time zone offset: %d" |
|
14803 | msgid "impossible time zone offset: %d" | |
14438 | msgstr "あり得ないタイムゾーン: %d" |
|
14804 | msgstr "あり得ないタイムゾーン: %d" | |
14439 |
|
14805 | |||
@@ -14652,17 +15018,14 b' msgstr "\xe4\xb8\x8d\xe6\x95\xb4\xe5\x90\x88\xe3\x81\x8c %d \xe4\xbb\xb6\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x99!\\n"' | |||||
14652 | msgid "(first damaged changeset appears to be %d)\n" |
|
15018 | msgid "(first damaged changeset appears to be %d)\n" | |
14653 | msgstr "(最初の不整合は %d の模様)\n" |
|
15019 | msgstr "(最初の不整合は %d の模様)\n" | |
14654 |
|
15020 | |||
14655 | msgid "user name not available - set USERNAME environment variable" |
|
|||
14656 | msgstr "ユーザ名が利用できません - 環境変数 USERNAME を設定してください" |
|
|||
14657 |
|
||||
14658 | msgid "look up remote revision" |
|
15021 | msgid "look up remote revision" | |
14659 | msgstr "連携先でのリビジョンの検索" |
|
15022 | msgstr "連携先でのリビジョンの検索" | |
14660 |
|
15023 | |||
|
15024 | msgid "push failed (unexpected response):" | |||
|
15025 | msgstr "履歴反映に失敗(未知のレスポンス):" | |||
|
15026 | ||||
14661 | msgid "look up remote changes" |
|
15027 | msgid "look up remote changes" | |
14662 | msgstr "連携先での変更の検索" |
|
15028 | msgstr "連携先での変更の検索" | |
14663 |
|
15029 | |||
14664 | msgid "push failed:" |
|
15030 | msgid "push failed:" | |
14665 | msgstr "履歴反映に失敗:" |
|
15031 | msgstr "履歴反映に失敗:" | |
14666 |
|
||||
14667 | msgid "push failed (unexpected response):" |
|
|||
14668 | msgstr "履歴反映に失敗(未知のレスポンス):" |
|
@@ -7093,8 +7093,12 b' msgid "cannot create new bundle reposito' | |||||
7093 | msgstr "não é possível criar novo repositório de bundle" |
|
7093 | msgstr "não é possível criar novo repositório de bundle" | |
7094 |
|
7094 | |||
7095 | #, python-format |
|
7095 | #, python-format | |
7096 |
msgid " |
|
7096 | msgid "stream ended unexpectedly (got %d bytes, expected %d)" | |
7097 |
msgstr " |
|
7097 | msgstr "dados recebidos terminaram inesperadamente (%d bytes obtidos, %d esperados)" | |
|
7098 | ||||
|
7099 | #, python-format | |||
|
7100 | msgid "invalid chunk length %d" | |||
|
7101 | msgstr "comprimento de trecho inválido %d" | |||
7098 |
|
7102 | |||
7099 | #, python-format |
|
7103 | #, python-format | |
7100 | msgid "%s: not a Mercurial bundle" |
|
7104 | msgid "%s: not a Mercurial bundle" | |
@@ -9044,6 +9048,9 b' msgstr ""' | |||||
9044 | msgid "cannot combine --bundle and --subrepos" |
|
9048 | msgid "cannot combine --bundle and --subrepos" | |
9045 | msgstr "não é possível combinar --bundle e --subrepos" |
|
9049 | msgstr "não é possível combinar --bundle e --subrepos" | |
9046 |
|
9050 | |||
|
9051 | msgid "remote doesn't support bookmarks\n" | |||
|
9052 | msgstr "o repositório remoto não suporta marcadores\n" | |||
|
9053 | ||||
9047 | msgid "create a new repository in the given directory" |
|
9054 | msgid "create a new repository in the given directory" | |
9048 | msgstr "cria um novo repositório no diretório pedido" |
|
9055 | msgstr "cria um novo repositório no diretório pedido" | |
9049 |
|
9056 | |||
@@ -10148,6 +10155,14 b' msgid "%d outgoing"' | |||||
10148 | msgstr "%d de saída" |
|
10155 | msgstr "%d de saída" | |
10149 |
|
10156 | |||
10150 | #, python-format |
|
10157 | #, python-format | |
|
10158 | msgid "%d incoming bookmarks" | |||
|
10159 | msgstr "%d marcadores a serem trazidos" | |||
|
10160 | ||||
|
10161 | #, python-format | |||
|
10162 | msgid "%d outgoing bookmarks" | |||
|
10163 | msgstr "%d marcadores a serem enviados" | |||
|
10164 | ||||
|
10165 | #, python-format | |||
10151 | msgid "remote: %s\n" |
|
10166 | msgid "remote: %s\n" | |
10152 | msgstr "remoto: %s\n" |
|
10167 | msgstr "remoto: %s\n" | |
10153 |
|
10168 | |||
@@ -14870,12 +14885,12 b' msgid "no interrupted transaction availa' | |||||
14870 | msgstr "nenhuma transação interrompida disponível\n" |
|
14885 | msgstr "nenhuma transação interrompida disponível\n" | |
14871 |
|
14886 | |||
14872 | #, python-format |
|
14887 | #, python-format | |
14873 |
msgid "r |
|
14888 | msgid "repository tip rolled back to revision %s (undo %s: %s)\n" | |
14874 | msgstr "executando rollback para a revisão %s (desfazimento de %s: %s)\n" |
|
14889 | msgstr "executando rollback da tip do repositório para a revisão %s (desfazimento de %s: %s)\n" | |
14875 |
|
14890 | |||
14876 | #, python-format |
|
14891 | #, python-format | |
14877 |
msgid "r |
|
14892 | msgid "repository tip rolled back to revision %s (undo %s)\n" | |
14878 | msgstr "executando rollback para a revisão %s (desfazimento de %s)\n" |
|
14893 | msgstr "executando rollback da tip do repositório para a revisão %s (desfazimento de %s)\n" | |
14879 |
|
14894 | |||
14880 | msgid "rolling back unknown transaction\n" |
|
14895 | msgid "rolling back unknown transaction\n" | |
14881 | msgstr "desfazendo transação desconhecida\n" |
|
14896 | msgstr "desfazendo transação desconhecida\n" | |
@@ -14884,6 +14899,14 b' msgstr "desfazendo transa\xc3\xa7\xc3\xa3o desconhecida\\n"' | |||||
14884 | msgid "Named branch could not be reset, current branch still is: %s\n" |
|
14899 | msgid "Named branch could not be reset, current branch still is: %s\n" | |
14885 | msgstr "O ramo nomeado não pode ser redefinido, o ramo corrente ainda é: %s\n" |
|
14900 | msgstr "O ramo nomeado não pode ser redefinido, o ramo corrente ainda é: %s\n" | |
14886 |
|
14901 | |||
|
14902 | #, python-format | |||
|
14903 | msgid "working directory now based on revisions %d and %d\n" | |||
|
14904 | msgstr "o diretório de trabalho está agora baseado nas revisões %d e %d\n" | |||
|
14905 | ||||
|
14906 | #, python-format | |||
|
14907 | msgid "working directory now based on revision %d\n" | |||
|
14908 | msgstr "o diretório de trabalho está agora baseado na revisão %d\n" | |||
|
14909 | ||||
14887 | msgid "no rollback information available\n" |
|
14910 | msgid "no rollback information available\n" | |
14888 | msgstr "nenhuma informação de desfazimento disponível\n" |
|
14911 | msgstr "nenhuma informação de desfazimento disponível\n" | |
14889 |
|
14912 | |||
@@ -15165,6 +15188,10 b' msgstr "nada para mesclar (use \'hg updat' | |||||
15165 | msgid "outstanding uncommitted changes (use 'hg status' to list changes)" |
|
15188 | msgid "outstanding uncommitted changes (use 'hg status' to list changes)" | |
15166 | msgstr "alterações não consolidadas pendentes (use 'hg status' para listar as mudanças)" |
|
15189 | msgstr "alterações não consolidadas pendentes (use 'hg status' para listar as mudanças)" | |
15167 |
|
15190 | |||
|
15191 | #, python-format | |||
|
15192 | msgid "outstanding uncommitted changes in subrepository '%s'" | |||
|
15193 | msgstr "mudanças não consolidadas pendentes no sub-repositório '%s'" | |||
|
15194 | ||||
15168 | msgid "crosses branches (merge branches or use --clean to discard changes)" |
|
15195 | msgid "crosses branches (merge branches or use --clean to discard changes)" | |
15169 | msgstr "atravessa ramos (mescle os ramos ou use --clean para descartar mudanças)" |
|
15196 | msgstr "atravessa ramos (mescle os ramos ou use --clean para descartar mudanças)" | |
15170 |
|
15197 | |||
@@ -16415,15 +16442,15 b' msgstr "(primeira revis\xc3\xa3o danificada parece ser %d)\\n"' | |||||
16415 | msgid "look up remote revision" |
|
16442 | msgid "look up remote revision" | |
16416 | msgstr "procurar revisão remota" |
|
16443 | msgstr "procurar revisão remota" | |
16417 |
|
16444 | |||
|
16445 | msgid "push failed (unexpected response):" | |||
|
16446 | msgstr "o push falhou (resposta inesperada):" | |||
|
16447 | ||||
16418 | msgid "look up remote changes" |
|
16448 | msgid "look up remote changes" | |
16419 | msgstr "procurar mudanças remotas" |
|
16449 | msgstr "procurar mudanças remotas" | |
16420 |
|
16450 | |||
16421 | msgid "push failed:" |
|
16451 | msgid "push failed:" | |
16422 | msgstr "o push falhou:" |
|
16452 | msgstr "o push falhou:" | |
16423 |
|
16453 | |||
16424 | msgid "push failed (unexpected response):" |
|
|||
16425 | msgstr "o push falhou (resposta inesperada):" |
|
|||
16426 |
|
||||
16427 | msgid "options:" |
|
16454 | msgid "options:" | |
16428 | msgstr "opções:" |
|
16455 | msgstr "opções:" | |
16429 |
|
16456 |
General Comments 0
You need to be logged in to leave comments.
Login now