Merge with i18n

i18n/sv.po

@@ -13,8 +13,8 b' msgid ""'
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2010-02-13 22:39+0100\n"
-"PO-Revision-Date: 2010-02-14 00:05+0100\n"
+"POT-Creation-Date: 2010-02-16 18:12+0100\n"
+"PO-Revision-Date: 2010-02-16 22:01+0100\n"
 "Last-Translator: Jens Bäckman <[e-mail]>\n"
 "Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"
@@ -2658,7 +2658,7 b' msgid ""'
 "\n"
 "    To set guards on another patch::\n"
 "\n"
-"      hg qguard -- other.patch +2.6.17 -stable\n"
+"      hg qguard other.patch -- +2.6.17 -stable\n"
 "    "
 msgstr ""
 
@@ -2915,7 +2915,7 b' msgstr ""'
 msgid "drop all guards"
 msgstr ""
 
-msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
+msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
 msgstr ""
 
 msgid "hg qheader [PATCH]"
@@ -3486,8 +3486,8 b' msgstr ""'
 msgid ""
 "show progress bars for some actions\n"
 "\n"
-"This extension uses the progress information commands can log with hg\n"
-"to draw progres bars that are as informative as possible. Some progress\n"
+"This extension uses the progress information logged by hg commands\n"
+"to draw progress bars that are as informative as possible. Some progress\n"
 "bars only offer indeterminate information, while others have a definite\n"
 "end point.\n"
 "\n"
@@ -3501,10 +3501,10 b' msgid ""'
 "                 # (that is, min(width, term width) will be used)\n"
 "  clear-complete = True # clear the progress bar after it's done\n"
 "\n"
-"Valid entries for the format field are topic, bar, number, unit, and item.\n"
-"item defaults to the last 20 characters of the item, but this can be\n"
-"changed by adding either -<num> which would take the last num characters,\n"
-"or +<num> for the first num characters.\n"
+"Valid entries for the format field are topic, bar, number, unit, and\n"
+"item. item defaults to the last 20 characters of the item, but this\n"
+"can be changed by adding either ``-<num>`` which would take the last\n"
+"num characters, or ``+<num>`` for the first num characters.\n"
 msgstr ""
 
 msgid "command to delete untracked files from the working directory"
@@ -4472,6 +4472,20 b' msgid ""'
 "    undo an add before that, see hg forget.\n"
 "\n"
 "    If no names are given, add all files to the repository.\n"
+"\n"
+"    .. container:: verbose\n"
+"\n"
+"       An example showing how new (unknown) files are added\n"
+"       automatically by ``hg add``::\n"
+"\n"
+"         $ ls\n"
+"         foo.c\n"
+"         $ hg status\n"
+"         ? foo.c\n"
+"         $ hg add\n"
+"         adding foo.c\n"
+"         $ hg status\n"
+"         A foo.c\n"
 "    "
 msgstr ""
 "lägg till de specificerade filerna i nästa arkivering\n"
@@ -4482,6 +4496,21 b' msgstr ""'
 "    ångra en addering innan dess, se hg forget.\n"
 "\n"
 "    Om inga namn anges, läggs alla filer till i arkivet.\n"
+"\n"
+"    .. container:: verbose\n"
+"\n"
+"       An example showing how new (unknown) files are added\n"
+"       Ett exempel som visar hur nya (okända) filer läggs\n"
+"       till automatiskt av ``hg add``::\n"
+"\n"
+"         $ ls\n"
+"         foo.c\n"
+"         $ hg status\n"
+"         ? foo.c\n"
+"         $ hg add\n"
+"         adding foo.c\n"
+"         $ hg status\n"
+"         A foo.c\n"
 "    "
 
 msgid ""
@@ -5606,6 +5635,14 b' msgstr ""'
 msgid "(no help text available)"
 msgstr "(ingen hjälptext tillgänglig)"
 
+#, python-format
+msgid ""
+"\n"
+"use \"hg -v help %s\" to show verbose help\n"
+msgstr ""
+"\n"
+"använd \"hg -v help %s\" för att visa utförlig hjälp\n"
+
 msgid "options:\n"
 msgstr "flaggor:\n"
 
@@ -8050,6 +8087,16 b' msgid ""'
 "    - if it's a directory, all files ending with .rc are added\n"
 "    - otherwise, the file itself will be added\n"
 "\n"
+"HGPLAIN\n"
+"    When set, this disables any options in .hgrc that might change\n"
+"    Mercurial's default output. This includes encoding, defaults,\n"
+"    verbose mode, debug mode, quiet mode, tracebacks, and\n"
+"    localization. This can be useful when scripting against Mercurial\n"
+"    in the face of existing user configuration.\n"
+"\n"
+"    Equivalent options set via command line flags or environment\n"
+"    variables are not overridden.\n"
+"\n"
 "HGUSER\n"
 "    This is the string used as the author of a commit. If not set,\n"
 "    available values will be considered in this order:\n"
@@ -8470,6 +8517,8 b' msgstr ""'
 msgid ""
 "%d files updated, %d files merged, %d files removed, %d files unresolved\n"
 msgstr ""
+"%d filer uppdaterade, %d filer sammanfogade, %d filer raderade, %d filer "
+"olösta\n"
 
 msgid "use 'hg resolve' to retry unresolved file merges\n"
 msgstr ""
@@ -8789,30 +8838,30 b' msgid "(use \'hg push -f\' to force)\\n"'
 msgstr "använd 'hg push -f' för att tvinga)\n"
 
 msgid "note: unsynced remote changes!\n"
-msgstr ""
+msgstr "notera: osynkade fjärrändringar!\n"
 
 #, python-format
 msgid "%d changesets found\n"
-msgstr ""
+msgstr "%d ändringar hittades\n"
 
 #, python-format
 msgid "empty or missing revlog for %s"
-msgstr ""
+msgstr "tom eller saknad revlog för %s"
 
 msgid "adding changesets\n"
-msgstr ""
+msgstr "lägger till ändringar\n"
 
 msgid "received changelog group is empty"
-msgstr ""
+msgstr "mottagen ändringsgrupp är tom"
 
 msgid "adding manifests\n"
-msgstr ""
+msgstr "lägger till manifest\n"
 
 msgid "adding file changes\n"
-msgstr ""
+msgstr "lägger till filändringar\n"
 
 msgid "received file revlog group is empty"
-msgstr ""
+msgstr "mottagen revlog-grupp för filer är tom"
 
 #, python-format
 msgid "missing file data for %s:%s - run hg verify"