From d6cb667d2aa1b8deeb3c2d290723c1d256f77280 Mon Sep 17 00:00:00 2001
From: Kjartan Maraas <kmaraas@gnome.org>
Date: Sun, 18 Apr 2010 23:44:59 +0200
Subject: [PATCH] =?utf8?q?Updated=20Norwegian=20bokm=C3=A5l=20translation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 po/nb.po | 1082 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 629 insertions(+), 453 deletions(-)

diff --git a/po/nb.po b/po/nb.po
index 7a77bd22..dd467533 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,42 +1,51 @@
 # Norwegian bokmål translation of jhbuild.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the jhbuild package.
-# Kjartan Maraas <kmaraas@gnome.org>, 2008.
+# Kjartan Maraas <kmaraas@gnome.org>, 2008-2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: jhbuild svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-10 09:44+0200\n"
-"PO-Revision-Date: 2008-10-10 09:51+0200\n"
+"POT-Creation-Date: 2010-04-18 22:15+0200\n"
+"PO-Revision-Date: 2010-04-18 23:44+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norsk bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../jhbuild.desktop.in.in.h:1
+msgid "Build GNOME modules"
+msgstr ""
+
+#: ../jhbuild.desktop.in.in.h:2
+msgid "GNOME Build Tool"
+msgstr ""
+
 #: ../jhbuild/commands/autobuild.py:27
 msgid "Build modules non-interactively and upload results to JhAutobuild"
 msgstr ""
 
-#: ../jhbuild/commands/autobuild.py:35 ../jhbuild/commands/base.py:165
-#: ../jhbuild/commands/base.py:273 ../jhbuild/commands/tinderbox.py:37
+#: ../jhbuild/commands/autobuild.py:35 ../jhbuild/commands/base.py:215
+#: ../jhbuild/commands/base.py:309 ../jhbuild/commands/tinderbox.py:37
 msgid "always run autogen.sh"
 msgstr "alltid kjør autogen.sh"
 
-#: ../jhbuild/commands/autobuild.py:38 ../jhbuild/commands/base.py:168
-#: ../jhbuild/commands/base.py:276 ../jhbuild/commands/tinderbox.py:40
+#: ../jhbuild/commands/autobuild.py:38 ../jhbuild/commands/base.py:218
+#: ../jhbuild/commands/base.py:312 ../jhbuild/commands/tinderbox.py:40
 msgid "run make clean before make"
 msgstr ""
 
-#: ../jhbuild/commands/autobuild.py:41 ../jhbuild/commands/base.py:52
-#: ../jhbuild/commands/base.py:183 ../jhbuild/commands/base.py:424
-#: ../jhbuild/commands/tinderbox.py:49
+#: ../jhbuild/commands/autobuild.py:41 ../jhbuild/commands/base.py:46
+#: ../jhbuild/commands/base.py:239 ../jhbuild/commands/base.py:467
+#: ../jhbuild/commands/clean.py:38 ../jhbuild/commands/tinderbox.py:49
 msgid "treat the given modules as up to date"
 msgstr ""
 
-#: ../jhbuild/commands/autobuild.py:44 ../jhbuild/commands/base.py:55
-#: ../jhbuild/commands/base.py:186 ../jhbuild/commands/tinderbox.py:52
+#: ../jhbuild/commands/autobuild.py:44 ../jhbuild/commands/base.py:49
+#: ../jhbuild/commands/base.py:242 ../jhbuild/commands/clean.py:41
+#: ../jhbuild/commands/tinderbox.py:52
 msgid "start building at the given module"
 msgstr ""
 
@@ -52,329 +61,440 @@ msgstr ""
 msgid "report url for autobuild not specified"
 msgstr ""
 
-#: ../jhbuild/commands/autobuild.py:81 ../jhbuild/commands/base.py:80
-#: ../jhbuild/commands/base.py:255 ../jhbuild/commands/tinderbox.py:101
+#: ../jhbuild/commands/autobuild.py:81 ../jhbuild/commands/base.py:72
+#: ../jhbuild/commands/base.py:286 ../jhbuild/commands/base.py:501
+#: ../jhbuild/commands/clean.py:55 ../jhbuild/commands/tinderbox.py:86
 #, python-format
 msgid "%s not in module list"
 msgstr "%s er ikke i modullisten"
 
-#: ../jhbuild/commands/base.py:39
-#, python-format
-msgid "unable to parse '%s' as relative time."
+#: ../jhbuild/commands/base.py:37
+msgid "Update all modules from version control"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:43
-msgid "Update all modules from version control"
+#: ../jhbuild/commands/base.py:40 ../jhbuild/commands/base.py:88
+#: ../jhbuild/commands/base.py:122 ../jhbuild/commands/base.py:209
+#: ../jhbuild/commands/base.py:303 ../jhbuild/commands/base.py:458
+#: ../jhbuild/commands/tinderbox.py:31
+msgid "[ options ... ] [ modules ... ]"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:58 ../jhbuild/commands/base.py:189
-#: ../jhbuild/commands/base.py:427
+#: ../jhbuild/commands/base.py:52 ../jhbuild/commands/base.py:245
+#: ../jhbuild/commands/base.py:473
 msgid "build only modules with the given tags"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:61 ../jhbuild/commands/base.py:102
-#: ../jhbuild/commands/base.py:192 ../jhbuild/commands/base.py:291
+#: ../jhbuild/commands/base.py:55 ../jhbuild/commands/base.py:94
+#: ../jhbuild/commands/base.py:248 ../jhbuild/commands/base.py:330
 #: ../jhbuild/commands/tinderbox.py:55
 msgid "set a sticky date when checking out modules"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:93
+#: ../jhbuild/commands/base.py:58 ../jhbuild/commands/base.py:230
+#: ../jhbuild/commands/base.py:476
+msgid "ignore all soft-dependencies"
+msgstr ""
+
+#: ../jhbuild/commands/base.py:85
 msgid "Update one or more modules from version control"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:113 ../jhbuild/commands/base.py:332
-#: ../jhbuild/commands/base.py:373 ../jhbuild/commands/rdepends.py:52
+#: ../jhbuild/commands/base.py:103 ../jhbuild/commands/base.py:138
+#: ../jhbuild/commands/base.py:352 ../jhbuild/commands/base.py:399
+#: ../jhbuild/commands/base.py:416 ../jhbuild/commands/rdepends.py:52
 #, python-format
 msgid "A module called '%s' could not be found."
 msgstr ""
 
-#: ../jhbuild/commands/base.py:116 ../jhbuild/commands/base.py:335
-#: ../jhbuild/commands/rdepends.py:47
+#: ../jhbuild/commands/base.py:106 ../jhbuild/commands/base.py:141
+#: ../jhbuild/commands/base.py:355 ../jhbuild/commands/rdepends.py:47
+#: ../jhbuild/commands/uninstall.py:41
 msgid "This command requires a module parameter."
 msgstr ""
 
-#: ../jhbuild/commands/base.py:151
+#: ../jhbuild/commands/base.py:119
+msgid "Clean one or more modules"
+msgstr ""
+
+#: ../jhbuild/commands/base.py:128
+msgid "honour the makeclean setting in config file"
+msgstr ""
+
+#: ../jhbuild/commands/base.py:145
+msgid "clean command called while makeclean is set to False, skipped."
+msgstr ""
+
+#: ../jhbuild/commands/base.py:194
 msgid ""
-"I: bootstrap moduleset has been updated since the last time you used it, "
+"bootstrap moduleset has been updated since the last time you used it, "
 "perhaps you should run jhbuild bootstrap."
 msgstr ""
 
-#: ../jhbuild/commands/base.py:156
+#: ../jhbuild/commands/base.py:200
+#, python-format
+msgid ""
+"some bootstrap modules have been updated, perhaps you should update them: %s."
+msgstr ""
+
+#: ../jhbuild/commands/base.py:206
 msgid "Update and compile all modules (the default)"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:159 ../jhbuild/commands/base.py:267
-#: ../jhbuild/commands/base.py:415 ../jhbuild/commands/tinderbox.py:31
-msgid "[ options ... ] [ modules ... ]"
+#: ../jhbuild/commands/base.py:221 ../jhbuild/commands/base.py:315
+msgid "run make check after building"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:171 ../jhbuild/commands/base.py:279
+#: ../jhbuild/commands/base.py:224 ../jhbuild/commands/base.py:318
 msgid "run make dist after building"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:174 ../jhbuild/commands/base.py:282
+#: ../jhbuild/commands/base.py:227 ../jhbuild/commands/base.py:321
 msgid "run make distcheck after building"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:177 ../jhbuild/commands/base.py:285
+#: ../jhbuild/commands/base.py:233 ../jhbuild/commands/base.py:324
 #: ../jhbuild/commands/tinderbox.py:43
 msgid "skip version control update"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:180 ../jhbuild/commands/base.py:288
+#: ../jhbuild/commands/base.py:236 ../jhbuild/commands/base.py:327
 msgid "quiet (no output)"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:195 ../jhbuild/commands/base.py:294
+#: ../jhbuild/commands/base.py:251 ../jhbuild/commands/base.py:333
 msgid "run tests in real X and not in Xvfb"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:198 ../jhbuild/commands/tinderbox.py:58
+#: ../jhbuild/commands/base.py:254 ../jhbuild/commands/tinderbox.py:58
 msgid "try to force checkout and autogen on failure"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:201 ../jhbuild/commands/tinderbox.py:61
+#: ../jhbuild/commands/base.py:257 ../jhbuild/commands/tinderbox.py:61
 msgid "don't poison modules on failure"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:204 ../jhbuild/commands/base.py:297
+#: ../jhbuild/commands/base.py:260 ../jhbuild/commands/base.py:336
 #: ../jhbuild/commands/tinderbox.py:64
 msgid "build even if policy says not to"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:207
+#: ../jhbuild/commands/base.py:263
 msgid "also build soft-dependencies that could be skipped"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:210 ../jhbuild/commands/base.py:300
+#: ../jhbuild/commands/base.py:266 ../jhbuild/commands/base.py:339
 msgid "skip modules installed less than the given time ago"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:264
+#: ../jhbuild/commands/base.py:290
+msgid "requested module is in the ignore list, nothing to do."
+msgstr ""
+
+#: ../jhbuild/commands/base.py:300
 msgid "Update and compile one or more modules"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:344
+#: ../jhbuild/commands/base.py:364
 msgid "Run a command under the JHBuild environment"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:347
+#: ../jhbuild/commands/base.py:367
 msgid "[ options ... ] program [ arguments ... ]"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:353
+#: ../jhbuild/commands/base.py:373
 msgid "run command in build dir of the given module"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:363 ../jhbuild/commands/base.py:390
+#: ../jhbuild/commands/base.py:376
+msgid "run command in checkout dir of the given module"
+msgstr ""
+
+#: ../jhbuild/commands/base.py:389 ../jhbuild/commands/base.py:433
 #, python-format
 msgid "Unable to execute the command '%(command)s': %(err)s"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:381
+#: ../jhbuild/commands/base.py:407 ../jhbuild/commands/base.py:424
 #, python-format
 msgid "Unable to execute the command '%s'"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:388 ../jhbuild/frontends/terminal.py:138
+#: ../jhbuild/commands/base.py:431 ../jhbuild/frontends/gtkui.py:443
+#: ../jhbuild/frontends/terminal.py:144
 msgid "No command given"
 msgstr "Ingen kommando gitt"
 
-#: ../jhbuild/commands/base.py:397
+#: ../jhbuild/commands/base.py:440
 msgid "Start a shell under the JHBuild environment"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:412
+#: ../jhbuild/commands/base.py:455
 msgid "List the modules that would be built"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:421
+#: ../jhbuild/commands/base.py:464
 msgid "show which revision will be built"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:430
+#: ../jhbuild/commands/base.py:470
+msgid "start list at the given module"
+msgstr ""
+
+#: ../jhbuild/commands/base.py:479
 msgid "also list soft-dependencies that could be skipped"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:433
+#: ../jhbuild/commands/base.py:482
 msgid "list all modules, not only those that would be built"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:463
+#: ../jhbuild/commands/base.py:517
 msgid "Output a Graphviz dependency graph for one or more modules"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:466 ../jhbuild/commands/info.py:42
+#: ../jhbuild/commands/base.py:520 ../jhbuild/commands/info.py:40
+#: ../jhbuild/commands/uninstall.py:32
 msgid "[ modules ... ]"
 msgstr "[ moduler ... ]"
 
-#: ../jhbuild/commands/base.py:472
+#: ../jhbuild/commands/base.py:526
 msgid "add dotted lines to soft dependencies"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:475
+#: ../jhbuild/commands/base.py:529
 msgid "group modules from metamodule together"
 msgstr ""
 
-#: ../jhbuild/commands/bootstrap.py:29
+#: ../jhbuild/commands/bootstrap.py:34
 msgid "Build required support tools"
 msgstr ""
 
-#: ../jhbuild/commands/bot.py:48
+#: ../jhbuild/commands/bootstrap.py:43
+msgid "do not use system installed modules"
+msgstr ""
+
+#: ../jhbuild/commands/bootstrap.py:85
+#, python-format
+msgid ""
+"some modules (%s) were automatically ignored as a sufficient enough version "
+"was found installed on your system. Use --ignore-system if you want to build "
+"them nevertheless."
+msgstr ""
+
+#: ../jhbuild/commands/bot.py:54
 msgid "Control buildbot"
 msgstr ""
 
-#: ../jhbuild/commands/bot.py:57
+#: ../jhbuild/commands/bot.py:57 ../jhbuild/commands/__init__.py:45
+msgid "[ options ... ]"
+msgstr ""
+
+#: ../jhbuild/commands/bot.py:63
 msgid "setup a buildbot environment"
 msgstr ""
 
-#: ../jhbuild/commands/bot.py:60
+#: ../jhbuild/commands/bot.py:66
 msgid "start a buildbot slave server"
 msgstr ""
 
-#: ../jhbuild/commands/bot.py:63
+#: ../jhbuild/commands/bot.py:69
 msgid "stop a buildbot slave server"
 msgstr ""
 
-#: ../jhbuild/commands/bot.py:66
+#: ../jhbuild/commands/bot.py:72
 msgid "start a buildbot master server"
 msgstr ""
 
-#: ../jhbuild/commands/bot.py:69
+#: ../jhbuild/commands/bot.py:75
+msgid "reload a buildbot master server configuration"
+msgstr ""
+
+#: ../jhbuild/commands/bot.py:78
 msgid "stop a buildbot master server"
 msgstr ""
 
-#: ../jhbuild/commands/bot.py:72
+#: ../jhbuild/commands/bot.py:81
 msgid "start as daemon"
 msgstr ""
 
-#: ../jhbuild/commands/bot.py:75
+#: ../jhbuild/commands/bot.py:84
 msgid "pid file location"
 msgstr ""
 
-#: ../jhbuild/commands/bot.py:78
+#: ../jhbuild/commands/bot.py:87
+msgid "log file location"
+msgstr ""
+
+#: ../jhbuild/commands/bot.py:90
+msgid "directory with slave files (only with --start-server)"
+msgstr ""
+
+#: ../jhbuild/commands/bot.py:93
+msgid "directory with buildbot work files (only with --start-server)"
+msgstr ""
+
+#: ../jhbuild/commands/bot.py:96
+msgid "master cfg file location (only with --start-server)"
+msgstr ""
+
+#: ../jhbuild/commands/bot.py:99
 msgid "exec a buildbot step (internal use only)"
 msgstr ""
 
-#: ../jhbuild/commands/bot.py:97
+#: ../jhbuild/commands/bot.py:118
 msgid "buildbot and twisted not found, run jhbuild bot --setup"
 msgstr ""
 
-#: ../jhbuild/commands/bot.py:610
+#: ../jhbuild/commands/bot.py:293
+#, python-format
+msgid "No description for slave %s."
+msgstr ""
+
+#. parse error
+#: ../jhbuild/commands/bot.py:298
+#, python-format
+msgid "Failed to parse slave config for %s."
+msgstr ""
+
+#: ../jhbuild/commands/bot.py:727 ../jhbuild/commands/bot.py:735
 msgid "failed to get buildbot PID"
 msgstr ""
 
-#: ../jhbuild/commands/checkbranches.py:29
-msgid "Check modules in GNOME subversion have the correct branch definition"
+#: ../jhbuild/commands/checkbranches.py:28
+msgid ""
+"Check modules in GNOME Git repository have the correct branch definition"
 msgstr ""
 
-#: ../jhbuild/commands/checkbranches.py:67
+#: ../jhbuild/commands/checkbranches.py:63
 #, python-format
 msgid "%(module)s is missing branch definition for %(branch)s"
 msgstr ""
 
-#: ../jhbuild/commands/gui.py:27
+#: ../jhbuild/commands/checkmodulesets.py:30
+msgid "Check if modules in jhbuild have the correct definition"
+msgstr ""
+
+#: ../jhbuild/commands/checkmodulesets.py:42
+#, python-format
+msgid "%(module)s is unreachable (%(href)s)"
+msgstr ""
+
+#: ../jhbuild/commands/checkmodulesets.py:45
+#, python-format
+msgid "Cannot check %(module)s (%(href)s)"
+msgstr ""
+
+#: ../jhbuild/commands/clean.py:29
+msgid "Clean all modules"
+msgstr "Rydd alle moduler"
+
+#: ../jhbuild/commands/gui.py:30
 msgid "Build targets from a GUI app"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:39
+#: ../jhbuild/commands/info.py:37
 msgid "Display information about one or more modules"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:54
+#: ../jhbuild/commands/info.py:52
 #, python-format
 msgid "unknown module %s"
-msgstr ""
+msgstr "ukjent modul %s"
 
-#: ../jhbuild/commands/info.py:63
+#: ../jhbuild/commands/info.py:61
 msgid "Name:"
-msgstr ""
+msgstr "Navn:"
 
-#: ../jhbuild/commands/info.py:64
+#: ../jhbuild/commands/info.py:62
 msgid "Module Set:"
-msgstr ""
+msgstr "Modulsett:"
 
-#: ../jhbuild/commands/info.py:65
+#: ../jhbuild/commands/info.py:63
 msgid "Type:"
 msgstr "Type:"
 
-#: ../jhbuild/commands/info.py:68 ../jhbuild/commands/info.py:71
-msgid "Install-date:"
-msgstr ""
+#: ../jhbuild/commands/info.py:66 ../jhbuild/commands/info.py:69
+msgid "Install date:"
+msgstr "Installeringsdato:"
 
-#: ../jhbuild/commands/info.py:71
+#: ../jhbuild/commands/info.py:69
 msgid "not installed"
 msgstr "ikke installert"
 
-#: ../jhbuild/commands/info.py:75
-msgid "Moz-Projects:"
-msgstr ""
-
-#: ../jhbuild/commands/info.py:80
+#: ../jhbuild/commands/info.py:74
 msgid "CVS-Root:"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:81
+#: ../jhbuild/commands/info.py:75
 msgid "CVS-Module:"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:83
+#: ../jhbuild/commands/info.py:77
 msgid "CVS-Revision:"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:85
+#: ../jhbuild/commands/info.py:79
 msgid "Subversion-Module:"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:87
+#: ../jhbuild/commands/info.py:81
 msgid "Arch-Version:"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:89
+#: ../jhbuild/commands/info.py:83
 msgid "Darcs-Archive:"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:91
+#: ../jhbuild/commands/info.py:85
 msgid "Git-Module:"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:93
+#: ../jhbuild/commands/info.py:87
 msgid "URL:"
 msgstr "URL:"
 
-#: ../jhbuild/commands/info.py:94
+#: ../jhbuild/commands/info.py:88
 msgid "Version:"
 msgstr "Versjon:"
 
-#: ../jhbuild/commands/info.py:97
+#: ../jhbuild/commands/info.py:91
 msgid "Tree-ID:"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:103
+#: ../jhbuild/commands/info.py:97
 msgid "Requires:"
 msgstr "Krever:"
 
-#: ../jhbuild/commands/info.py:107
+#: ../jhbuild/commands/info.py:101
 msgid "Required-by:"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:109
+#: ../jhbuild/commands/info.py:103
 msgid "Suggests:"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:111
+#: ../jhbuild/commands/info.py:105
 msgid "After:"
 msgstr "Etter:"
 
-#: ../jhbuild/commands/info.py:115
+#: ../jhbuild/commands/info.py:109
 msgid "Before:"
 msgstr "Før:"
 
-#: ../jhbuild/commands/__init__.py:37
-msgid "[ options ... ]"
+#: ../jhbuild/commands/__init__.py:80
+msgid "JHBuild commands are:"
 msgstr ""
 
-#: ../jhbuild/commands/__init__.py:74
+#: ../jhbuild/commands/__init__.py:86
+msgid "For more information run \"jhbuild <command> --help\""
+msgstr ""
+
+#: ../jhbuild/commands/__init__.py:95
+msgid "Information about available jhbuild commands"
+msgstr ""
+
+#: ../jhbuild/commands/__init__.py:118
 msgid "command not found"
 msgstr "kommando ikke funnet"
 
@@ -394,72 +514,81 @@ msgstr ""
 msgid "limit display to modules directly depending on given module"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:49
+#: ../jhbuild/commands/sanitycheck.py:52
 msgid "Check that required support tools are available"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:56
+#: ../jhbuild/commands/sanitycheck.py:59
 msgid "no extra arguments expected"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:61
-msgid "checkout root is not writable"
+#: ../jhbuild/commands/sanitycheck.py:64
+#, python-format
+msgid "checkout root (%s) is not writable"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:64
-msgid "install prefix is not writable"
+#: ../jhbuild/commands/sanitycheck.py:67
+#, python-format
+msgid "install prefix (%s) is not writable"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:69 ../jhbuild/commands/sanitycheck.py:72
-#: ../jhbuild/commands/sanitycheck.py:75 ../jhbuild/commands/sanitycheck.py:78
-#: ../jhbuild/commands/sanitycheck.py:81 ../jhbuild/commands/sanitycheck.py:84
-#: ../jhbuild/commands/sanitycheck.py:87 ../jhbuild/commands/sanitycheck.py:90
-#: ../jhbuild/commands/sanitycheck.py:93
-#: ../jhbuild/commands/sanitycheck.py:130
-#: ../jhbuild/commands/sanitycheck.py:134
-#: ../jhbuild/commands/sanitycheck.py:138
-#: ../jhbuild/commands/sanitycheck.py:149
+#: ../jhbuild/commands/sanitycheck.py:72 ../jhbuild/commands/sanitycheck.py:75
+#: ../jhbuild/commands/sanitycheck.py:78 ../jhbuild/commands/sanitycheck.py:81
+#: ../jhbuild/commands/sanitycheck.py:84 ../jhbuild/commands/sanitycheck.py:87
+#: ../jhbuild/commands/sanitycheck.py:129
+#: ../jhbuild/commands/sanitycheck.py:133
+#: ../jhbuild/commands/sanitycheck.py:141
+#: ../jhbuild/commands/sanitycheck.py:150
+#: ../jhbuild/versioncontrol/arch.py:155 ../jhbuild/versioncontrol/bzr.py:148
+#: ../jhbuild/versioncontrol/cvs.py:297 ../jhbuild/versioncontrol/darcs.py:108
+#: ../jhbuild/versioncontrol/fossil.py:105
+#: ../jhbuild/versioncontrol/git.py:344 ../jhbuild/versioncontrol/hg.py:101
+#: ../jhbuild/versioncontrol/mtn.py:140 ../jhbuild/versioncontrol/svn.py:311
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../jhbuild/commands/sanitycheck.py:102
+#: ../jhbuild/commands/sanitycheck.py:99
 #, python-format
-msgid "aclocal-%s can't see libtool macros"
+msgid "aclocal-%s can't see %s macros"
 msgstr ""
 
 #: ../jhbuild/commands/sanitycheck.py:104
 #, python-format
-msgid "aclocal-%s can't see gettext macros"
-msgstr ""
-
-#: ../jhbuild/commands/sanitycheck.py:106
-#, python-format
-msgid "aclocal-%s can't see pkg-config macros"
+msgid "Please copy the lacking macros (%s) in one of the following paths: %s"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:110
+#: ../jhbuild/commands/sanitycheck.py:109
 msgid "Could not find XML catalog"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:119
+#: ../jhbuild/commands/sanitycheck.py:118
 #, python-format
 msgid "Could not find %s in XML catalog"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:126
+#: ../jhbuild/commands/sanitycheck.py:125
 #, python-format
 msgid "Could not find the perl module %s"
 msgstr "Kunne ikke finne perl-modul %s"
 
-#: ../jhbuild/commands/sanitycheck.py:143
+#: ../jhbuild/commands/sanitycheck.py:137
+#, python-format
+msgid "%s or %s not found"
+msgstr "%s eller %s ikke funnet"
+
+#: ../jhbuild/commands/sanitycheck.py:146
 msgid "Installed git program is not the right git"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:145
+#: ../jhbuild/commands/sanitycheck.py:152
 msgid "Could not check git program"
 msgstr "Kunne ikke sjekke git-program"
 
+#: ../jhbuild/commands/snapshot.py:34
+msgid "Print out a moduleset for the exact versions that are checked out"
+msgstr ""
+
 #: ../jhbuild/commands/tinderbox.py:28
 msgid "Build modules non-interactively and store build logs"
 msgstr ""
@@ -468,87 +597,13 @@ msgstr ""
 msgid "directory to store build logs in"
 msgstr ""
 
-#: ../jhbuild/commands/tinderbox.py:90
+#: ../jhbuild/commands/tinderbox.py:75
 msgid "output directory for tinderbox build not specified"
 msgstr ""
 
-#: ../jhbuild/cut_n_paste/optparse.py:134
-#, python-format
-msgid "no such option: %s"
-msgstr ""
-
-#: ../jhbuild/cut_n_paste/optparse.py:145
-#, python-format
-msgid "ambiguous option: %s (%s?)"
-msgstr ""
-
-#: ../jhbuild/cut_n_paste/optparse.py:368
-#, python-format
-msgid "Usage: %s\n"
-msgstr "Bruk: %s\n"
-
-#: ../jhbuild/cut_n_paste/optparse.py:387
-msgid "Usage"
-msgstr "Bruk"
-
-#: ../jhbuild/cut_n_paste/optparse.py:412
-msgid "integer"
-msgstr "heltall"
-
-#: ../jhbuild/cut_n_paste/optparse.py:413
-msgid "long integer"
-msgstr ""
-
-#: ../jhbuild/cut_n_paste/optparse.py:414
-msgid "floating-point"
-msgstr ""
-
-#: ../jhbuild/cut_n_paste/optparse.py:415
-msgid "complex"
-msgstr ""
-
-#: ../jhbuild/cut_n_paste/optparse.py:423
-#, python-format
-msgid "option %s: invalid %s value: %r"
-msgstr ""
-
-#: ../jhbuild/cut_n_paste/optparse.py:431
-#, python-format
-msgid "option %s: invalid choice: %r (choose from %s)"
-msgstr ""
-
-#: ../jhbuild/cut_n_paste/optparse.py:1237
-msgid "show this help message and exit"
-msgstr ""
-
-#: ../jhbuild/cut_n_paste/optparse.py:1242
-msgid "show program's version number and exit"
-msgstr ""
-
-#: ../jhbuild/cut_n_paste/optparse.py:1265
-msgid "%prog [options]"
-msgstr ""
-
-#: ../jhbuild/cut_n_paste/optparse.py:1475
-#: ../jhbuild/cut_n_paste/optparse.py:1514
-#, python-format
-msgid "%s option requires an argument"
-msgstr ""
-
-#: ../jhbuild/cut_n_paste/optparse.py:1477
-#: ../jhbuild/cut_n_paste/optparse.py:1516
-#, python-format
-msgid "%s option requires %d arguments"
-msgstr ""
-
-#: ../jhbuild/cut_n_paste/optparse.py:1486
-#, python-format
-msgid "%s option does not take a value"
-msgstr ""
-
-#: ../jhbuild/cut_n_paste/optparse.py:1603
-msgid "Options"
-msgstr "Alternativer"
+#: ../jhbuild/commands/uninstall.py:29
+msgid "Uninstall all modules"
+msgstr "Avinstaller alle moduler"
 
 #: ../jhbuild/frontends/autobuild.py:72
 #, python-format
@@ -564,7 +619,7 @@ msgstr ""
 msgid "Error: %s"
 msgstr "Feil: %s"
 
-#: ../jhbuild/frontends/autobuild.py:183 ../jhbuild/utils/cmds.py:62
+#: ../jhbuild/frontends/autobuild.py:183 ../jhbuild/utils/cmds.py:66
 #, python-format
 msgid "Error running %s"
 msgstr ""
@@ -583,208 +638,210 @@ msgstr ""
 msgid "**** Starting module %s ****"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:40
-msgid "checkout root can not be created"
+#: ../jhbuild/frontends/buildscript.py:38
+#, python-format
+msgid "install prefix (%s) must be writable"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:42
-msgid "checkout root must be writable"
+#: ../jhbuild/frontends/buildscript.py:45
+#, python-format
+msgid "checkout root (%s) can not be created"
 msgstr ""
 
 #: ../jhbuild/frontends/buildscript.py:47
-msgid "install prefix can not be created"
+#, python-format
+msgid "checkout root (%s) must be writable"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:49
-msgid "install prefix must be writable"
+#: ../jhbuild/frontends/buildscript.py:54
+#, python-format
+msgid "checkout copy dir (%s) can not be created"
 msgstr ""
 
 #: ../jhbuild/frontends/buildscript.py:56
 #, python-format
+msgid "checkout copy dir (%s) must be writable"
+msgstr ""
+
+#: ../jhbuild/frontends/buildscript.py:63
+#, python-format
 msgid "could not create directory %s"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:80
+#: ../jhbuild/frontends/buildscript.py:87
 #, python-format
 msgid "Skipping %s (installed recently)"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:88
+#: ../jhbuild/frontends/buildscript.py:96
 #, python-format
 msgid "module %(mod)s will be build even though %(dep)s failed"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:91
+#: ../jhbuild/frontends/buildscript.py:99
 #, python-format
 msgid "module %(mod)s not built due to non buildable %(dep)s"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:88
-#, python-format
-msgid "Found meta module %s"
+#: ../jhbuild/frontends/gtkui.py:99
+msgid "Others..."
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:159
-msgid "Build"
-msgstr "Bygg"
+#: ../jhbuild/frontends/gtkui.py:140
+msgid "Choose Module:"
+msgstr ""
+
+#: ../jhbuild/frontends/gtkui.py:160
+msgid "Build Progress"
+msgstr ""
 
 #: ../jhbuild/frontends/gtkui.py:163
-msgid "Module Group"
-msgstr "Modulgruppe"
+msgid "Terminal"
+msgstr "Terminal"
 
-#: ../jhbuild/frontends/gtkui.py:280
-#, python-format
-msgid "%d of %d modules"
-msgstr "%d av %d moduler"
+#. Translators: This is a button label (to start build)
+#: ../jhbuild/frontends/gtkui.py:203
+msgid "Start"
+msgstr "Start"
+
+#: ../jhbuild/frontends/gtkui.py:347
+msgid "Build Completed"
+msgstr "Bygg fullført"
 
-#: ../jhbuild/frontends/gtkui.py:283
+#: ../jhbuild/frontends/gtkui.py:373 ../jhbuild/frontends/terminal.py:254
 #, python-format
-msgid "[%(num)d/%(total)d] %(action)s %(module)s"
+msgid "Error during phase %(phase)s of %(module)s"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:376 ../jhbuild/frontends/terminal.py:239
-msgid "success"
-msgstr "suksess"
+#: ../jhbuild/frontends/gtkui.py:390
+msgid "Pick an Action"
+msgstr "Velg en handling"
 
-#: ../jhbuild/frontends/gtkui.py:378
+#: ../jhbuild/frontends/gtkui.py:393 ../jhbuild/frontends/terminal.py:281
 #, python-format
-msgid ""
-"the following modules were not built:\n"
-"%s"
+msgid "Rerun phase %s"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:394
+#: ../jhbuild/frontends/gtkui.py:396 ../jhbuild/frontends/terminal.py:283
 #, python-format
-msgid "Error during %(state)s for module %(module)s"
+msgid "Ignore error and continue to %s"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:396
-#, python-format
-msgid "_Try %s Again"
-msgstr "_Prøv %s igjen"
+#: ../jhbuild/frontends/gtkui.py:399 ../jhbuild/frontends/terminal.py:285
+msgid "Ignore error and continue to next module"
+msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:397
-msgid "_Ignore Error"
-msgstr "_Ignorer feil"
+#: ../jhbuild/frontends/gtkui.py:401 ../jhbuild/frontends/terminal.py:286
+msgid "Give up on module"
+msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:398
-msgid "_Skip Module"
-msgstr "_Hopp over modul"
+#: ../jhbuild/frontends/gtkui.py:408 ../jhbuild/frontends/terminal.py:295
+#, python-format
+msgid "Go to phase \"%s\""
+msgstr "Gå til fase «%s»"
 
-#: ../jhbuild/frontends/gtkui.py:399
-msgid "_Terminal"
-msgstr "_Terminal"
+#: ../jhbuild/frontends/gtkui.py:411
+msgid "Open Terminal"
+msgstr "Åpne terminal"
 
-#: ../jhbuild/frontends/gtkui.py:402
+#: ../jhbuild/frontends/gtkui.py:585
 #, python-format
-msgid "Go to %s"
-msgstr "Gå til %s"
-
-#: ../jhbuild/frontends/jhbuild.glade.h:1
-msgid "Always run autogen.sh"
+msgid "%(command)s died with signal %(rc)s"
 msgstr ""
 
-#: ../jhbuild/frontends/jhbuild.glade.h:2
-msgid "Build Output"
+#: ../jhbuild/frontends/gtkui.py:589
+#, python-format
+msgid "%(command)s returned with an error code (%(rc)s)"
 msgstr ""
 
-#: ../jhbuild/frontends/jhbuild.glade.h:3
-msgid "Configure Build"
-msgstr ""
+#: ../jhbuild/frontends/gtkui.py:639
+msgid "Module"
+msgstr "Modul"
 
-#: ../jhbuild/frontends/jhbuild.glade.h:4
-msgid "Do not build"
-msgstr ""
+#: ../jhbuild/frontends/gtkui.py:658
+msgid "Start At"
+msgstr "Start med"
 
-#: ../jhbuild/frontends/jhbuild.glade.h:5
-msgid "Start Building At:"
-msgstr ""
+#: ../jhbuild/frontends/gtkui.py:701
+msgid "Preferences"
+msgstr "Brukervalg"
 
-#: ../jhbuild/frontends/jhbuild.glade.h:6
-msgid "Start _Build"
+#: ../jhbuild/frontends/gtkui.py:713
+msgid "Disable network access"
 msgstr ""
 
-#: ../jhbuild/frontends/jhbuild.glade.h:7
-msgid "Update from CVS"
+#: ../jhbuild/frontends/gtkui.py:714
+msgid "Always run autogen.sh"
 msgstr ""
 
-#: ../jhbuild/frontends/jhbuild.glade.h:8
-msgid "_Pause Build"
+#: ../jhbuild/frontends/gtkui.py:715
+msgid "Don't poison modules on failure"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:204
+#: ../jhbuild/frontends/terminal.py:210
 msgid ""
 "\n"
 "Conflicts during checkout:\n"
 msgstr ""
 
 #. it could happen on a really badly-timed ctrl-c (see bug 551641)
-#: ../jhbuild/frontends/terminal.py:227 ../jhbuild/frontends/terminal.py:230
+#: ../jhbuild/frontends/terminal.py:233 ../jhbuild/frontends/terminal.py:236
 #, python-format
 msgid "########## Error running %s"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:241
-msgid "the following modules were not built"
-msgstr ""
-
-#: ../jhbuild/frontends/terminal.py:248
-#, python-format
-msgid "error during stage %(stage)s of %(module)s"
-msgstr ""
+#: ../jhbuild/frontends/terminal.py:245
+msgid "success"
+msgstr "suksess"
 
-#: ../jhbuild/frontends/terminal.py:264
-#, python-format
-msgid "  [1] rerun stage %s"
+#: ../jhbuild/frontends/terminal.py:247
+msgid "the following modules were not built"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:265
-#, python-format
-msgid "  [2] ignore error and continue to %s"
+#: ../jhbuild/frontends/terminal.py:269 ../jhbuild/frontends/tinderbox.py:349
+msgid "automatically retrying configure"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:266
-msgid "  [3] give up on module"
+#: ../jhbuild/frontends/terminal.py:273 ../jhbuild/frontends/tinderbox.py:353
+msgid "automatically forcing a fresh checkout"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:267
-msgid "  [4] start shell"
+#: ../jhbuild/frontends/terminal.py:287
+msgid "Start shell"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:270
-#, python-format
-msgid "  [%d] go to stage %s"
+#: ../jhbuild/frontends/terminal.py:288
+msgid "Reload configuration"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:272
+#: ../jhbuild/frontends/terminal.py:297
 msgid "choice: "
 msgstr "valg: "
 
-#: ../jhbuild/frontends/terminal.py:286
+#: ../jhbuild/frontends/terminal.py:311
 msgid "exit shell to continue with build"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:294
+#: ../jhbuild/frontends/terminal.py:321
 msgid "invalid choice"
 msgstr "ugyldig valg"
 
-#: ../jhbuild/modtypes/ant.py:80 ../jhbuild/modtypes/autotools.py:99
-#: ../jhbuild/modtypes/cmake.py:74 ../jhbuild/modtypes/distutils.py:75
-#: ../jhbuild/modtypes/__init__.py:213 ../jhbuild/modtypes/linux.py:75
-#: ../jhbuild/modtypes/linux.py:88 ../jhbuild/modtypes/mesa.py:89
-#: ../jhbuild/modtypes/mozillamodule.py:75 ../jhbuild/modtypes/perl.py:71
-#: ../jhbuild/modtypes/waf.py:76
-msgid "Checking out"
+#: ../jhbuild/frontends/terminal.py:329
+msgid "Type \"yes\" to confirm the action: "
+msgstr ""
+
+#: ../jhbuild/frontends/terminal.py:331
+msgid "yes"
 msgstr ""
 
-#: ../jhbuild/modtypes/ant.py:89 ../jhbuild/modtypes/autotools.py:207
-#: ../jhbuild/modtypes/cmake.py:98 ../jhbuild/modtypes/distutils.py:84
-#: ../jhbuild/modtypes/linux.py:143 ../jhbuild/modtypes/mesa.py:98
-#: ../jhbuild/modtypes/perl.py:80 ../jhbuild/modtypes/waf.py:129
+#: ../jhbuild/modtypes/ant.py:63 ../jhbuild/modtypes/autotools.py:214
+#: ../jhbuild/modtypes/cmake.py:75 ../jhbuild/modtypes/distutils.py:62
+#: ../jhbuild/modtypes/linux.py:164 ../jhbuild/modtypes/perl.py:58
+#: ../jhbuild/modtypes/waf.py:97
 msgid "Building"
 msgstr "Bygger"
 
-#: ../jhbuild/modtypes/ant.py:94
+#: ../jhbuild/modtypes/ant.py:68
 msgid "Missing ant build tool"
 msgstr ""
 
@@ -792,31 +849,28 @@ msgstr ""
 #. "It's not clear to me how to install a typical
 #. ant-based project, so I left that out."
 #. -- http://bugzilla.gnome.org/show_bug.cgi?id=537037
-#: ../jhbuild/modtypes/ant.py:110 ../jhbuild/modtypes/autotools.py:256
-#: ../jhbuild/modtypes/cmake.py:120 ../jhbuild/modtypes/distutils.py:99
-#: ../jhbuild/modtypes/linux.py:159 ../jhbuild/modtypes/mesa.py:114
-#: ../jhbuild/modtypes/mozillamodule.py:147 ../jhbuild/modtypes/perl.py:95
-#: ../jhbuild/modtypes/waf.py:172
+#: ../jhbuild/modtypes/ant.py:81 ../jhbuild/modtypes/autotools.py:268
+#: ../jhbuild/modtypes/cmake.py:91 ../jhbuild/modtypes/distutils.py:74
+#: ../jhbuild/modtypes/perl.py:72 ../jhbuild/modtypes/waf.py:132
 msgid "Installing"
 msgstr "Installerer"
 
-#: ../jhbuild/modtypes/autotools.py:131 ../jhbuild/modtypes/cmake.py:83
-#: ../jhbuild/modtypes/linux.py:97 ../jhbuild/modtypes/mozillamodule.py:121
-#: ../jhbuild/modtypes/waf.py:102
+#: ../jhbuild/modtypes/autotools.py:110 ../jhbuild/modtypes/cmake.py:63
+#: ../jhbuild/modtypes/linux.py:119 ../jhbuild/modtypes/waf.py:79
 msgid "Configuring"
 msgstr "Konfigurerer"
 
-#: ../jhbuild/modtypes/autotools.py:196 ../jhbuild/modtypes/linux.py:126
-#: ../jhbuild/modtypes/waf.py:119
+#: ../jhbuild/modtypes/autotools.py:204 ../jhbuild/modtypes/linux.py:151
+#: ../jhbuild/modtypes/waf.py:90
 msgid "Cleaning"
 msgstr "Rydder"
 
-#: ../jhbuild/modtypes/autotools.py:227 ../jhbuild/modtypes/waf.py:145
+#: ../jhbuild/modtypes/autotools.py:234 ../jhbuild/modtypes/waf.py:111
 msgid "Checking"
 msgstr "Sjekker"
 
-#: ../jhbuild/modtypes/autotools.py:242 ../jhbuild/modtypes/cmake.py:109
-#: ../jhbuild/modtypes/waf.py:159
+#: ../jhbuild/modtypes/autotools.py:248 ../jhbuild/modtypes/autotools.py:258
+#: ../jhbuild/modtypes/cmake.py:83 ../jhbuild/modtypes/waf.py:122
 msgid "Creating tarball for"
 msgstr ""
 
@@ -824,327 +878,449 @@ msgstr ""
 msgid "Distcleaning"
 msgstr ""
 
-#: ../jhbuild/modtypes/autotools.py:395 ../jhbuild/modtypes/__init__.py:100
-#, python-format
-msgid "Repository=%s not found for module id=%s. Possible repositories are %s"
-msgstr ""
+#: ../jhbuild/modtypes/autotools.py:297 ../jhbuild/modtypes/waf.py:139
+msgid "Uninstalling"
+msgstr "Avinstallerer"
 
-#: ../jhbuild/modtypes/__init__.py:54
+#: ../jhbuild/modtypes/__init__.py:55
 #, python-format
 msgid "unknown module type %s"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:70
+#: ../jhbuild/modtypes/__init__.py:71
 #, python-format
 msgid "dep node for module %s is missing package attribute"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:93
+#: ../jhbuild/modtypes/__init__.py:94
 #, python-format
 msgid "no <branch> element found for %s"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:106
+#: ../jhbuild/modtypes/__init__.py:101
+#, python-format
+msgid "Repository=%s not found for module id=%s. Possible repositories are %s"
+msgstr ""
+
+#: ../jhbuild/modtypes/__init__.py:107
 #, python-format
 msgid ""
 "Default Repository=%s not found for module id=%s. Possible repositories are %"
 "s"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:196
+#: ../jhbuild/modtypes/__init__.py:183
 #, python-format
 msgid "Skipping %s (not updated)"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:208
+#: ../jhbuild/modtypes/__init__.py:195
 #, python-format
 msgid "Skipping %s (package and dependencies not updated)"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:217
-#: ../jhbuild/modtypes/mozillamodule.py:106
+#: ../jhbuild/modtypes/__init__.py:247 ../jhbuild/modtypes/__init__.py:265
+#: ../jhbuild/modtypes/linux.py:88 ../jhbuild/modtypes/linux.py:95
+msgid "Checking out"
+msgstr ""
+
+#: ../jhbuild/modtypes/__init__.py:251
 #, python-format
 msgid "source directory %s was not created"
 msgstr ""
 
-#: ../jhbuild/modtypes/linux.py:80
+#: ../jhbuild/modtypes/__init__.py:268
+msgid "wipe directory and start over"
+msgstr ""
+
+#: ../jhbuild/modtypes/linux.py:46
 #, python-format
 msgid "kconfig file %s was not created"
 msgstr ""
 
+#: ../jhbuild/modtypes/linux.py:103
+msgid "make mrproper"
+msgstr ""
+
 #: ../jhbuild/modtypes/linux.py:177
+msgid "Installing kernel"
+msgstr "Installerer kjerne"
+
+#: ../jhbuild/modtypes/linux.py:195
 msgid "Installing modules"
 msgstr "Installerer moduler"
 
-#: ../jhbuild/modtypes/linux.py:206
+#: ../jhbuild/modtypes/linux.py:210
+#, fuzzy
+msgid "Installing kernel headers"
+msgstr "Installerer kjerne"
+
+#: ../jhbuild/modtypes/linux.py:248
 #, python-format
 msgid ""
 "Repository=%s not found for kconfig in linux id=%s. Possible repositories "
 "are %s"
 msgstr ""
 
-#: ../jhbuild/modtypes/linux.py:211
+#: ../jhbuild/modtypes/linux.py:253
 #, python-format
 msgid ""
 "Default Repository=%s not found for kconfig in module id=%s. Possible "
 "repositories are %s"
 msgstr ""
 
-#: ../jhbuild/modtypes/linux.py:225
+#: ../jhbuild/modtypes/tarball.py:68
 #, python-format
-msgid "No <kconfig> elements found for module %s"
+msgid "module '%(module)s' has invalid size attribute ('%(size)s')"
 msgstr ""
 
-#: ../jhbuild/modtypes/mozillamodule.py:72
-msgid "could not determine mozilla version"
+#: ../jhbuild/utils/cmds.py:40
+msgid "Call to undefined command"
 msgstr ""
 
-#: ../jhbuild/modtypes/mozillamodule.py:98
-msgid "Updating"
-msgstr "Oppdaterer"
-
-#: ../jhbuild/modtypes/waf.py:104
-msgid "Missing waf, try jhbuild -m bootstrap buildone waf"
-msgstr ""
-
-#: ../jhbuild/utils/httpcache.py:45 ../jhbuild/utils/packagedb.py:24
-#: ../jhbuild/moduleset.py:31
+#: ../jhbuild/utils/httpcache.py:46 ../jhbuild/utils/packagedb.py:24
+#: ../jhbuild/moduleset.py:32
 msgid "Python xml packages are required but could not be found"
 msgstr ""
 
-#: ../jhbuild/utils/httpcache.py:176
+#: ../jhbuild/utils/httpcache.py:184
 msgid "file not in cache, but not allowed to check network"
 msgstr ""
 
-#: ../jhbuild/utils/unpack.py:105
+#: ../jhbuild/utils/unpack.py:132
 #, python-format
 msgid "Failed to unpack %s (unknown archive type)"
 msgstr ""
 
-#: ../jhbuild/utils/unpack.py:107
+#: ../jhbuild/utils/unpack.py:134
 #, python-format
 msgid "Failed to unpack %s"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/arch.py:39 ../jhbuild/versioncontrol/arch.py:82
+#: ../jhbuild/versioncontrol/arch.py:40 ../jhbuild/versioncontrol/arch.py:83
 #, python-format
 msgid "could not register archive %s"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/arch.py:79
+#: ../jhbuild/versioncontrol/arch.py:80
 #, python-format
 msgid "archive %s not registered"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/arch.py:91 ../jhbuild/versioncontrol/bzr.py:61
-#: ../jhbuild/versioncontrol/darcs.py:51 ../jhbuild/versioncontrol/git.py:75
-#: ../jhbuild/versioncontrol/hg.py:52 ../jhbuild/versioncontrol/mtn.py:51
-#: ../jhbuild/versioncontrol/tarball.py:63
+#: ../jhbuild/versioncontrol/arch.py:92 ../jhbuild/versioncontrol/bzr.py:72
+#: ../jhbuild/versioncontrol/darcs.py:55
+#: ../jhbuild/versioncontrol/fossil.py:49 ../jhbuild/versioncontrol/hg.py:53
+#: ../jhbuild/versioncontrol/mtn.py:52 ../jhbuild/versioncontrol/tarball.py:67
 #, python-format
 msgid "branch for %s has wrong override, check your .jhbuildrc"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/arch.py:127 ../jhbuild/versioncontrol/arch.py:140
-#: ../jhbuild/versioncontrol/bzr.py:94 ../jhbuild/versioncontrol/bzr.py:100
-#: ../jhbuild/versioncontrol/darcs.py:80 ../jhbuild/versioncontrol/darcs.py:86
-#: ../jhbuild/versioncontrol/git.py:322 ../jhbuild/versioncontrol/git.py:358
-#: ../jhbuild/versioncontrol/git.py:417 ../jhbuild/versioncontrol/hg.py:84
-#: ../jhbuild/versioncontrol/hg.py:90
+#: ../jhbuild/versioncontrol/arch.py:128 ../jhbuild/versioncontrol/arch.py:141
+#: ../jhbuild/versioncontrol/bzr.py:131 ../jhbuild/versioncontrol/bzr.py:137
+#: ../jhbuild/versioncontrol/darcs.py:84 ../jhbuild/versioncontrol/darcs.py:90
+#: ../jhbuild/versioncontrol/fossil.py:82
+#: ../jhbuild/versioncontrol/fossil.py:95 ../jhbuild/versioncontrol/git.py:443
+#: ../jhbuild/versioncontrol/git.py:483 ../jhbuild/versioncontrol/git.py:559
+#: ../jhbuild/versioncontrol/hg.py:85 ../jhbuild/versioncontrol/hg.py:91
 msgid "date based checkout not yet supported\n"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/cvs.py:99
+#: ../jhbuild/versioncontrol/cvs.py:104
 #, python-format
 msgid "could not log into %s\n"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/cvs.py:117
+#: ../jhbuild/versioncontrol/cvs.py:122
 #, python-format
 msgid "%s is not managed by CVS"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/cvs.py:266
+#: ../jhbuild/versioncontrol/cvs.py:274
 #, python-format
 msgid "\"%s\" does not appear to be a CVS working copy"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/cvs.py:269
+#: ../jhbuild/versioncontrol/cvs.py:277
 #, python-format
 msgid ""
 "working copy points at the wrong repository (expected %(root1)s but got %"
 "(root2)s). "
 msgstr ""
 
-#: ../jhbuild/versioncontrol/cvs.py:271
+#: ../jhbuild/versioncontrol/cvs.py:279
 msgid "Consider using the changecvsroot.py script to fix this."
 msgstr ""
 
-#: ../jhbuild/versioncontrol/darcs.py:104
-msgid "Missing darcs command"
+#: ../jhbuild/versioncontrol/git.py:94
+msgid "ignored bad branch redefinition for module:"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:137
+#: ../jhbuild/versioncontrol/git.py:188
 #, python-format
 msgid "Command %s returned no output"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:142
+#: ../jhbuild/versioncontrol/git.py:193
 #, python-format
 msgid "Command %s did not include commit line: %r"
 msgstr ""
 
+#: ../jhbuild/versioncontrol/git.py:255
+msgid ""
+"Failed to update module as it switched to git (you should check for changes "
+"then remove the directory)."
+msgstr ""
+
+#: ../jhbuild/versioncontrol/git.py:256
+msgid ""
+"Failed to update module (missing .git) (you should check for changes then "
+"remove the directory)."
+msgstr ""
+
 #: ../jhbuild/versioncontrol/git.py:289
+msgid "Failed to update module (corrupt .git?)"
+msgstr ""
+
+#: ../jhbuild/versioncontrol/git.py:410
 msgid ""
 "External handling failed\n"
 " If you are running git version < 1.5.6 it is recommended you update.\n"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:334
+#: ../jhbuild/versioncontrol/git.py:455
 #, python-format
 msgid "Cannot get last revision from %s. Check the module location."
 msgstr ""
 
-#: ../jhbuild/versioncontrol/__init__.py:94
-msgid "force_checkout not implemented"
-msgstr ""
-
-#: ../jhbuild/versioncontrol/__init__.py:123
+#: ../jhbuild/versioncontrol/__init__.py:186
 #, python-format
 msgid "unknown repository type %s"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/mtn.py:90
+#: ../jhbuild/versioncontrol/mtn.py:91
 #, python-format
 msgid "Initializing %s"
 msgstr "Initierer %s"
 
-#: ../jhbuild/versioncontrol/mtn.py:98
+#: ../jhbuild/versioncontrol/mtn.py:99
 #, python-format
 msgid "Pulling branch %(branch)s from %(server)s"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/mtn.py:116
+#: ../jhbuild/versioncontrol/mtn.py:117
 #, python-format
 msgid "branch %(branch)s has %(num)d heads"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/mtn.py:122
+#: ../jhbuild/versioncontrol/mtn.py:123
 #, python-format
 msgid "Checking out branch '%(branch)s' to directory '%(dir)s'"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/mtn.py:131
+#: ../jhbuild/versioncontrol/mtn.py:132
 #, python-format
 msgid "Updating working copy %s"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/svn.py:69
+#: ../jhbuild/versioncontrol/svn.py:74
 msgid "Getting SVN subdirs: this operation might be long..."
 msgstr ""
 
-#: ../jhbuild/versioncontrol/svn.py:100
+#: ../jhbuild/versioncontrol/svn.py:97
 #, python-format
 msgid "could not get Subversion URI for %s"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/svn.py:103
+#: ../jhbuild/versioncontrol/svn.py:100
 #, python-format
 msgid "could not parse \"svn info\" output for %s"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/svn.py:281
+#: ../jhbuild/versioncontrol/svn.py:307
 msgid "Error checking for conflicts"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:108
+#: ../jhbuild/versioncontrol/tarball.py:85
+#, python-format
+msgid "branch for %s is not correct, check the moduleset file."
+msgstr ""
+
+#: ../jhbuild/versioncontrol/tarball.py:121
 #, python-format
 msgid "URL has no filename component: %s"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:141
+#: ../jhbuild/versioncontrol/tarball.py:162
 msgid "file not downloaded"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:146
+#: ../jhbuild/versioncontrol/tarball.py:167
 #, python-format
 msgid "downloaded file size is incorrect (expected %(size1)d, got %(size2)d)"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:158
+#: ../jhbuild/versioncontrol/tarball.py:173
+#, python-format
+msgid "invalid hash attribute on module %s"
+msgstr ""
+
+#: ../jhbuild/versioncontrol/tarball.py:186
+#, python-format
+msgid "file hash is incorrect (expected %(sum1)s, got %(sum2)s)"
+msgstr ""
+
+#: ../jhbuild/versioncontrol/tarball.py:189
+#, python-format
+msgid "skipped hash check (missing support for %s)"
+msgstr ""
+
+#: ../jhbuild/versioncontrol/tarball.py:198
 #, python-format
-msgid "file MD5 sum is incorrect (expected %(sum1)s, got %(sum2)s)"
+msgid "tarball dir (%s) can not be created"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:176
+#: ../jhbuild/versioncontrol/tarball.py:200
+#, python-format
+msgid "tarball dir (%s) must be writable"
+msgstr ""
+
+#: ../jhbuild/versioncontrol/tarball.py:212
 msgid "unable to find wget or curl"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:184
+#: ../jhbuild/versioncontrol/tarball.py:220
 #, python-format
 msgid "failed to unpack %s"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:187
-msgid "could not unpack tarball"
+#: ../jhbuild/versioncontrol/tarball.py:223
+#, python-format
+msgid "could not unpack tarball (expected %s dir)"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:201
+#: ../jhbuild/versioncontrol/tarball.py:238
 #, python-format
 msgid "could not download patch (error: %s)"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:203
+#: ../jhbuild/versioncontrol/tarball.py:240
 msgid "could not download patch"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:224
+#: ../jhbuild/versioncontrol/tarball.py:272
+#, python-format
+msgid "Failed to find patch: %s"
+msgstr ""
+
+#: ../jhbuild/versioncontrol/tarball.py:274
 msgid "Applying patch"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:231
+#: ../jhbuild/versioncontrol/tarball.py:281
 msgid "unable to find quilt"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:242
+#: ../jhbuild/versioncontrol/tarball.py:292
 msgid "could not checkout quilt patch set"
 msgstr ""
 
-#: ../jhbuild/config.py:104
+#: ../jhbuild/config.py:137
+#, python-format
+msgid "unable to parse '%s' as relative time."
+msgstr ""
+
+#: ../jhbuild/config.py:164
+msgid ""
+"JHBuild start script has been installed in ~/.local/bin/jhbuild, you should "
+"remove the old version that is still in ~/bin/ (or make it a symlink to ~/."
+"local/bin/jhbuild)"
+msgstr ""
+
+#: ../jhbuild/config.py:176
+msgid ""
+"Obsolete JHBuild start script, make sure it is removed then do run 'make "
+"install'"
+msgstr ""
+
+#: ../jhbuild/config.py:184
 msgid "could not load config defaults"
 msgstr ""
 
-#: ../jhbuild/config.py:111
+#: ../jhbuild/config.py:188
+#, python-format
+msgid "could not load config file, %s is missing"
+msgstr ""
+
+#: ../jhbuild/config.py:204
+#, fuzzy, python-format
+msgid "Could not include config file (%s)"
+msgstr "Kunne ikke finne perl-modul %s"
+
+#: ../jhbuild/config.py:217
 msgid "could not load config file"
 msgstr ""
 
-#: ../jhbuild/config.py:125
+#: ../jhbuild/config.py:231
+#, python-format
+msgid "unknown keys defined in configuration file: %s"
+msgstr ""
+
+#: ../jhbuild/config.py:238
 #, python-format
-msgid "I: unknown keys defined in configuration file: %s"
+msgid ""
+"the \"%s\" configuration variable is deprecated, you should use \"repos"
+"['gnome.org']\"."
 msgstr ""
 
-#: ../jhbuild/config.py:153
+#: ../jhbuild/config.py:243 ../jhbuild/config.py:248
+#, python-format
+msgid ""
+"the \"%s\" configuration variable is deprecated, you should use \"repos\"."
+msgstr ""
+
+#: ../jhbuild/config.py:269
 msgid "invalid checkout mode"
 msgstr ""
 
-#: ../jhbuild/config.py:156
+#: ../jhbuild/config.py:273
 #, python-format
 msgid "invalid checkout mode (module: %s)"
 msgstr ""
 
-#: ../jhbuild/config.py:167 ../jhbuild/config.py:216
+#: ../jhbuild/config.py:275
+msgid "copy mode requires copy_dir to be set"
+msgstr ""
+
+#: ../jhbuild/config.py:280
+#, python-format
+msgid "modulesets directory (%s) not found, disabling use_local_modulesets"
+msgstr ""
+
+#: ../jhbuild/config.py:292
+#, python-format
+msgid "install prefix (%s) can not be created"
+msgstr ""
+
+#: ../jhbuild/config.py:363
 #, python-format
 msgid "Can't create %s directory"
 msgstr ""
 
-#: ../jhbuild/main.py:85
-msgid "JHBuild commands are:"
+#: ../jhbuild/config.py:442
+#, python-format
+msgid "Could not create GConf config (%s)"
 msgstr ""
 
-#: ../jhbuild/main.py:91
-msgid "For more information run \"jhbuild <command> --help\""
+#: ../jhbuild/config.py:529
+msgid "Failed to parse relative time"
 msgstr ""
 
-#: ../jhbuild/main.py:96
+#: ../jhbuild/config.py:539
+msgid ""
+"quiet mode has been disabled because the Python curses module is missing."
+msgstr ""
+
+#: ../jhbuild/main.py:95
 msgid "%prog [ -f config ] command [ options ... ]"
 msgstr ""
 
@@ -1155,74 +1331,74 @@ msgid ""
 msgstr ""
 
 #: ../jhbuild/main.py:101
-msgid "Information about available jhbuild commands"
+msgid "Display this help and exit"
 msgstr ""
 
-#: ../jhbuild/main.py:105
+#: ../jhbuild/main.py:108
 msgid "use a non default configuration file"
 msgstr ""
 
-#: ../jhbuild/main.py:108
+#: ../jhbuild/main.py:111
 msgid "use a non default module set"
 msgstr ""
 
-#: ../jhbuild/main.py:111
+#: ../jhbuild/main.py:114
 msgid "do not prompt for input"
 msgstr ""
 
-#: ../jhbuild/main.py:142
+#: ../jhbuild/main.py:145
 msgid "Interrupted"
 msgstr ""
 
-#: ../jhbuild/main.py:145
+#: ../jhbuild/main.py:148
 msgid "EOF"
 msgstr ""
 
 #: ../jhbuild/moduleset.py:56
 #, python-format
-msgid "I: fixed case of module '%(orig)s' to '%(new)s'"
+msgid "fixed case of module '%(orig)s' to '%(new)s'"
 msgstr ""
 
-#: ../jhbuild/moduleset.py:70
+#: ../jhbuild/moduleset.py:72
 #, python-format
 msgid "module \"%s\" not found"
 msgstr ""
 
-#: ../jhbuild/moduleset.py:83
+#: ../jhbuild/moduleset.py:86
 #, python-format
-msgid "dependent module \"%s\" not found"
+msgid "%(module)s has a dependency on unknown \"%(invalid)s\" module"
 msgstr ""
 
-#: ../jhbuild/moduleset.py:206
-msgid "W: Unknown module:"
+#: ../jhbuild/moduleset.py:231
+msgid "Unknown module:"
 msgstr ""
 
-#: ../jhbuild/moduleset.py:292
+#: ../jhbuild/moduleset.py:294 ../jhbuild/moduleset.py:324
 #, python-format
-msgid "could not download %s: %s"
+msgid "failed to parse %s: %s"
 msgstr ""
 
-#: ../jhbuild/moduleset.py:297 ../jhbuild/moduleset.py:299
+#: ../jhbuild/moduleset.py:319
 #, python-format
-msgid "failed to parse %s: %s"
+msgid "could not download %s: %s"
 msgstr ""
 
-#: ../jhbuild/moduleset.py:406
+#: ../jhbuild/moduleset.py:444
 msgid ""
-"I: modulesets were edited locally but jhbuild is configured to get them from "
-"subversion, perhaps you need to add use_local_modulesets = True to your ."
+"Modulesets were edited locally but JHBuild is configured to get them from "
+"the network, perhaps you need to add use_local_modulesets = True to your ."
 "jhbuildrc."
 msgstr ""
 
-#: ../jhbuild/monkeypatch.py:144
+#: ../jhbuild/monkeypatch.py:102
 #, python-format
 msgid "Invalid placeholder in string: line %d, col %d"
 msgstr ""
 
-#: ../jhbuild/monkeypatch.py:149 ../jhbuild/monkeypatch.py:175
+#: ../jhbuild/monkeypatch.py:107 ../jhbuild/monkeypatch.py:133
 msgid "Too many positional arguments"
 msgstr ""
 
-#: ../jhbuild/monkeypatch.py:169 ../jhbuild/monkeypatch.py:202
+#: ../jhbuild/monkeypatch.py:127 ../jhbuild/monkeypatch.py:160
 msgid "Unrecognized named group in pattern"
 msgstr ""
-- 
2.11.4.GIT