# HG changeset patch # User Matt Mackall # Date 1292868530 21600 # Node ID 537df3bfbaad677326d62e9f914d2fa0e7712f3c # Parent b75fc70f0a9fdbacbf0cc8f2cc982bc2c231e89c# Parent 4c1fbed002244fbbd7c9783bcfba614b52dc93c8 merge with stable diff -r b75fc70f0a9f -r 537df3bfbaad i18n/da.po --- a/i18n/da.po Sat Dec 18 22:06:11 2010 +0100 +++ b/i18n/da.po Mon Dec 20 12:08:50 2010 -0600 @@ -17,14 +17,14 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-01 11:03+0100\n" -"PO-Revision-Date: 2010-11-01 11:11+0100\n" +"POT-Creation-Date: 2010-12-10 12:44+0100\n" +"PO-Revision-Date: 2010-12-10 12:46+0100\n" "Last-Translator: \n" "Language-Team: Danish\n" +"Language: Danish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: Danish\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #, python-format @@ -2070,6 +2070,13 @@ " antagelse af at de har miksede linieskift med vilje." msgid "" +"The ``win32text.forbid*`` hooks provided by the win32text extension\n" +"have been unified into a single hook named ``eol.hook``. The hook will\n" +"lookup the expected line endings from the ``.hgeol`` file, which means\n" +"you must migrate to a ``.hgeol`` file first before using the hook." +msgstr "" + +msgid "" "See :hg:`help patterns` for more information about the glob patterns\n" "used.\n" msgstr "" @@ -2767,8 +2774,8 @@ #, python-format msgid "*** the current per-user limit on the number of inotify watches is %s\n" msgstr "" -"*** den nuværende grænse pr bruger for antallet af inotify overvågninger er %" -"s\n" +"*** den nuværende grænse pr bruger for antallet af inotify overvågninger er " +"%s\n" msgid "*** this limit is too low to watch every directory in this repository\n" msgstr "" @@ -2975,7 +2982,7 @@ msgid "" "The default template mappings (view with :hg:`kwdemo -d`) can be\n" "replaced with customized keywords and templates. Again, run\n" -":hg:`kwdemo` to control the results of your config changes." +":hg:`kwdemo` to control the results of your configuration changes." msgstr "" msgid "" @@ -3408,7 +3415,7 @@ #, python-format msgid "cannot write patch \"%s\": %s" -msgstr "kan ikke skrive patch \"%s\": %s" +msgstr "kan ikke skrive rettelse \"%s\": %s" #, python-format msgid "error unlinking %s\n" @@ -3501,6 +3508,18 @@ msgid "cannot refresh a revision with children" msgstr "kan ikke genopfriske en revision som har børn" +#, python-format +msgid "warning: not refreshing %s\n" +msgstr "advarsel: genopfrisker ikke %s\n" + +#, python-format +msgid "warning: not adding %s\n" +msgstr "advarsel: tilføjer ikke %s\n" + +#, python-format +msgid "warning: not removing %s\n" +msgstr "advarsel: fjerner ikke %s\n" + msgid "" "refresh interrupted while patch was popped! (revert --all, qpush to " "recover)\n" @@ -5362,8 +5381,8 @@ msgid "changesets" msgstr "ændringer" -msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" -msgstr "ret uløste konflikter med hg resolve og kør så hg rebase --continue" +msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)" +msgstr "uløste konflikter (se først hg resolve og dernæst hg rebase --continue)" #, python-format msgid "no changes, revision %d skipped\n" @@ -5967,11 +5986,13 @@ msgid "Note that there are some limitations on using this extension:" msgstr "" -msgid "- You should use single encoding in one repository." -msgstr "" - -msgid "" -"\n" +msgid "" +"- You should use single encoding in one repository.\n" +"- If the repository path ends with 0x5c, .hg/hgrc cannot be read.\n" +"- win32mbcs is not compatible with fixutf8 extention." +msgstr "" + +msgid "" "By default, win32mbcs uses encoding.encoding decided by Mercurial.\n" "You can specify the encoding by config option::" msgstr "" @@ -6223,8 +6244,8 @@ #, python-format msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" msgstr "" -"%s er endnu ikke comitted, så der vil ikke blive gemt kopieringsdata for %" -"s.\n" +"%s er endnu ikke comitted, så der vil ikke blive gemt kopieringsdata for " +"%s.\n" #, python-format msgid "%s: not copying - file is not managed\n" @@ -8561,7 +8582,7 @@ msgid "" " Start a local HTTP repository browser and pull server. You can use\n" -" this for ad-hoc sharing and browing of repositories. It is\n" +" this for ad-hoc sharing and browsing of repositories. It is\n" " recommended to use a real web server to serve a repository for\n" " longer periods of time." msgstr "" @@ -11704,11 +11725,11 @@ msgstr "" msgid "" -" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())" -"\"\n" -msgstr "" -" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())" -"\"\n" +" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged" +"())\"\n" +msgstr "" +" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged" +"())\"\n" msgid "" "Subrepositories let you nest external repositories or projects into a\n" @@ -12167,7 +12188,7 @@ msgid "" "Paths in the local filesystem can either point to Mercurial\n" "repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n" -"incoming --bundle`)." +"incoming --bundle`). See also :hg:`help paths`." msgstr "" msgid "" @@ -12527,6 +12548,10 @@ msgid "working directory of %s" msgstr "arbejdskatalog for %s" +#, python-format +msgid "warning: can't find ancestor for '%s' copied from '%s'!\n" +msgstr "" + msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "" "kan ikke deponere en sammenføjning partielt (undgå at specificere filer " @@ -13369,6 +13394,10 @@ msgstr "" #, python-format +msgid "warning: subrepo spec file %s not found\n" +msgstr "advarsel: underdepot spec-fil %s blev ikke fundet\n" + +#, python-format msgid "subrepo spec file %s not found" msgstr "underdepot spec-fil %s blev ikke fundet" @@ -13591,6 +13620,13 @@ msgid "could not symlink to %r: %s" msgstr "kunne ikke lave et symbolsk link til %r: %s" +msgid "check your clock" +msgstr "" + +#, python-format +msgid "negative timestamp: %d" +msgstr "" + #, python-format msgid "invalid date: %r" msgstr "ugyldig dato: %r" @@ -13600,6 +13636,10 @@ msgstr "dato overskrider 32 bit: %d" #, python-format +msgid "negative date value: %d" +msgstr "" + +#, python-format msgid "impossible time zone offset: %d" msgstr "umuligt tidszone: %d" diff -r b75fc70f0a9f -r 537df3bfbaad i18n/de.po --- a/i18n/de.po Sat Dec 18 22:06:11 2010 +0100 +++ b/i18n/de.po Mon Dec 20 12:08:50 2010 -0600 @@ -38,7 +38,7 @@ "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-09-22 13:26+0200\n" -"PO-Revision-Date: 2010-09-24 02:15+0200\n" +"PO-Revision-Date: 2010-12-04 19:28+0100\n" "Last-Translator: Martin Roppelt \n" "Language-Team: German (http://transifex.net/projects/p/mercurial/team/de/) " "<>\n" @@ -5864,7 +5864,7 @@ msgstr "Emailadressen von CC-Empfängern" msgid "ask for confirmation before sending" -msgstr "" +msgstr "Vor dem Abschicken bestätigen" msgid "add diffstat output to messages" msgstr "Fügt Ausgabe von diffstat hinzu" @@ -5895,7 +5895,7 @@ msgstr "Antwortadresse (reply-to)" msgid "flags to add in subject prefixes" -msgstr "" +msgstr "Diese Stichwörter zu Betreffs-Präfixen hinzufügen" msgid "email addresses of recipients" msgstr "Emailadressen der Empfänger" @@ -5929,7 +5929,7 @@ msgstr "hg email [OPTION]... [ZIEL]..." msgid "show progress bars for some actions" -msgstr "" +msgstr "Bei einigen Befehlen Fortschrittsbalken zeigen" msgid "" "This extension uses the progress information logged by hg commands\n" @@ -5965,35 +5965,46 @@ msgstr "Löscht nicht versionierte Dateien aus dem Arbeitsverzeichnis" msgid "removes files not tracked by Mercurial" -msgstr "" +msgstr "Entfernt nicht von Mercurial versionierte Dateien" msgid "" " Delete files not known to Mercurial. This is useful to test local\n" " and uncommitted changes in an otherwise-clean source tree." msgstr "" +" Entferne Dateien, die Mercurial nicht bekannt sind. Nützlich, um\n" +" lokale und nicht versionierte Dateien in einem ansonsten\n" +" unveränderten Projektarchiv zu testen." msgid " This means that purge will delete:" -msgstr "" +msgstr " Das heißt, purge wird das folgende löschen:" msgid "" " - Unknown files: files marked with \"?\" by :hg:`status`\n" " - Empty directories: in fact Mercurial ignores directories unless\n" " they contain files under source control management" msgstr "" +" - Unbekannte Dateien: Dateien, die :hg:`status` mit \"?\\\" markiert\n" +" - Leere Verzeichnisse: Mercurial ignoriert Verzeichnisse, solange\n" +" sie keine Dateien unter Versionsverwaltung enthalten." msgid " But it will leave untouched:" -msgstr "" +msgstr " Aber das folgende unberührt lassen:" msgid "" " - Modified and unmodified tracked files\n" " - Ignored files (unless --all is specified)\n" " - New files added to the repository (with :hg:`add`)" msgstr "" +" - Veränderte und unveränderte Dateien unter Versionsverwaltung\n" +" - Ignorierte Dateien (es sei denn --all wurde angegeben)\n" +" - Neu hinzugefügte Dateien (mit :hg:`add`)" msgid "" " If directories are given on the command line, only files in these\n" " directories are considered." msgstr "" +" Wenn auf der Befehlzeile Verzeichnisse angegeben wurden, werden\n" +" nur Dateien in diesen Verzeichnissen einbezogen." msgid "" " Be careful with purge, as you could irreversibly delete some files\n" @@ -6002,28 +6013,33 @@ " option.\n" " " msgstr "" +" Seien Sie mit purge vorsichtig, da Sie Dateien unwiderbringlich\n" +" löschen könnten, die Sie nicht zum Projektarchiv hinzugefügt\n" +" haben. Wenn Sie nur die Liste der Dateien sehen wollen, die dieses\n" +" Programm entfernen würde, nutzen Sie die Option --print.\n" +" " #, python-format msgid "%s cannot be removed" -msgstr "" +msgstr "%s kann nicht entfernt werden" #, python-format msgid "warning: %s\n" -msgstr "" +msgstr "Warnung: %s\n" #, python-format msgid "Removing file %s\n" -msgstr "" +msgstr "Entferne Datei %s\n" #, python-format msgid "Removing directory %s\n" -msgstr "" +msgstr "Entferne Verzeichnis %s\n" msgid "abort if an error occurs" -msgstr "" +msgstr "Bei Fehler abbrechen" msgid "purge ignored files too" -msgstr "" +msgstr "Auch ignorierte Dateien entfernen" msgid "print filenames instead of deleting them" msgstr "Zeigt Dateinamen an, statt sie zu entfernen" @@ -6033,7 +6049,7 @@ "Beendet Dateinamen mit NUL zur Nutzung mit xargs (implizert -p/--print)" msgid "hg purge [OPTION]... [DIR]..." -msgstr "" +msgstr "hg purge [OPTION]... [DIR]..." msgid "command to move sets of revisions to a different ancestor" msgstr "Verknüpft Änderungssätze mit einem anderen Vorgänger" diff -r b75fc70f0a9f -r 537df3bfbaad mercurial/store.py --- a/mercurial/store.py Sat Dec 18 22:06:11 2010 +0100 +++ b/mercurial/store.py Mon Dec 20 12:08:50 2010 -0600 @@ -323,7 +323,8 @@ self.fncache.rewrite(existing) def copylist(self): - d = _data + ' dh fncache' + d = ('data dh fncache' + ' 00manifest.d 00manifest.i 00changelog.d 00changelog.i') return (['requires', '00changelog.i'] + [self.pathjoiner('store', f) for f in d.split()])