[jhbuild] Updated Norwegian bokmÃl translation

[Kjartan Maraas <kmaraas src gnome org>]

commit c02bbb6ff47440f9ed8e440d68e1834ba6d57081
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Tue Feb 21 15:57:51 2012 +0100

    Updated Norwegian bokmÃl translation

 po/nb.po | 1168 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 706 insertions(+), 462 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 089d271..9459713 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: jhbuild svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-19 17:15+0100\n"
-"PO-Revision-Date: 2011-03-19 17:18+0100\n"
+"POT-Creation-Date: 2012-02-21 15:55+0100\n"
+"PO-Revision-Date: 2012-02-21 15:57+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norsk bokmÃl <i18n-nb lister ping uio no>\n"
 "Language: \n"
@@ -16,41 +16,75 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../jhbuild.desktop.in.in.h:1
-msgid "Build GNOME modules"
-msgstr "Bygg GNOME-moduler"
+#: ../autogen.sh:104
+#, sh-format
+msgid "Configuring $PKG_NAME without autotools"
+msgstr ""
 
-#: ../jhbuild.desktop.in.in.h:2
-msgid "GNOME Build Tool"
-msgstr "GNOME byggverktÃy"
+#: ../autogen.sh:116 ../autogen.sh:121
+#, sh-format
+msgid "Unable to create file $srcdir/Makefile.inc"
+msgstr ""
+
+#: ../autogen.sh:141
+#, sh-format
+msgid "Unable to copy $srcdir/Makefile.plain to $srcdir/Makefile"
+msgstr ""
+
+#: ../autogen.sh:146
+#, sh-format
+msgid "Now type `make' to compile $PKG_NAME"
+msgstr ""
+
+#: ../autogen.sh:182
+#, sh-format
+msgid ""
+"**Error**: Directory `$srcdir' does not look like the top-level $PKG_NAME "
+"directory"
+msgstr ""
+
+#: ../autogen.sh:209
+msgid "gnome-autogen.sh not available"
+msgstr ""
+
+#: ../autogen.sh:212
+msgid "gnome-doc-tool not available"
+msgstr ""
+
+#. OpenSuSe splits gnome-doc-prepare into separate gnome-doc-utils-devel
+#. package
+#: ../autogen.sh:216
+msgid "gnome-doc-prepare not available"
+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:213
-#: ../jhbuild/commands/base.py:307 ../jhbuild/commands/tinderbox.py:37
+#: ../jhbuild/commands/autobuild.py:35 ../jhbuild/commands/make.py:42
+#: ../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:216
-#: ../jhbuild/commands/base.py:310 ../jhbuild/commands/tinderbox.py:40
+#: ../jhbuild/commands/autobuild.py:38 ../jhbuild/commands/base.py:217
+#: ../jhbuild/commands/base.py:311 ../jhbuild/commands/make.py:45
+#: ../jhbuild/commands/tinderbox.py:40
 msgid "run make clean before make"
 msgstr ""
 
-#: ../jhbuild/commands/autobuild.py:41 ../jhbuild/commands/base.py:225
-#: ../jhbuild/commands/base.py:319
+#: ../jhbuild/commands/autobuild.py:41 ../jhbuild/commands/base.py:226
+#: ../jhbuild/commands/base.py:320
 msgid "run make distcheck after building"
 msgstr ""
 
 #: ../jhbuild/commands/autobuild.py:44 ../jhbuild/commands/base.py:46
-#: ../jhbuild/commands/base.py:237 ../jhbuild/commands/base.py:475
+#: ../jhbuild/commands/base.py:238 ../jhbuild/commands/base.py:475
 #: ../jhbuild/commands/clean.py:38 ../jhbuild/commands/tinderbox.py:49
 msgid "treat the given modules as up to date"
 msgstr ""
 
 #: ../jhbuild/commands/autobuild.py:47 ../jhbuild/commands/base.py:49
-#: ../jhbuild/commands/base.py:240 ../jhbuild/commands/clean.py:41
+#: ../jhbuild/commands/base.py:241 ../jhbuild/commands/clean.py:41
 #: ../jhbuild/commands/tinderbox.py:52
 msgid "start building at the given module"
 msgstr ""
@@ -68,7 +102,7 @@ msgid "report url for autobuild not specified"
 msgstr ""
 
 #: ../jhbuild/commands/autobuild.py:81 ../jhbuild/commands/base.py:72
-#: ../jhbuild/commands/base.py:284 ../jhbuild/commands/base.py:514
+#: ../jhbuild/commands/base.py:285 ../jhbuild/commands/base.py:514
 #: ../jhbuild/commands/clean.py:55 ../jhbuild/commands/tinderbox.py:86
 #, python-format
 msgid "%s not in module list"
@@ -79,24 +113,24 @@ msgid "Update all modules from version control"
 msgstr "Oppdater alle moduler fra versjonskontrollsystemet"
 
 #: ../jhbuild/commands/base.py:40 ../jhbuild/commands/base.py:88
-#: ../jhbuild/commands/base.py:122 ../jhbuild/commands/base.py:207
-#: ../jhbuild/commands/base.py:301 ../jhbuild/commands/base.py:466
+#: ../jhbuild/commands/base.py:122 ../jhbuild/commands/base.py:208
+#: ../jhbuild/commands/base.py:302 ../jhbuild/commands/base.py:466
 #: ../jhbuild/commands/tinderbox.py:31
 msgid "[ options ... ] [ modules ... ]"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:52 ../jhbuild/commands/base.py:243
+#: ../jhbuild/commands/base.py:52 ../jhbuild/commands/base.py:244
 #: ../jhbuild/commands/base.py:481
 msgid "build only modules with the given tags"
 msgstr ""
 
 #: ../jhbuild/commands/base.py:55 ../jhbuild/commands/base.py:94
-#: ../jhbuild/commands/base.py:246 ../jhbuild/commands/base.py:328
+#: ../jhbuild/commands/base.py:247 ../jhbuild/commands/base.py:329
 #: ../jhbuild/commands/tinderbox.py:55
 msgid "set a sticky date when checking out modules"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:58 ../jhbuild/commands/base.py:228
+#: ../jhbuild/commands/base.py:58 ../jhbuild/commands/base.py:229
 #: ../jhbuild/commands/base.py:484
 msgid "ignore all soft-dependencies"
 msgstr ""
@@ -113,8 +147,8 @@ msgid "A module called '%s' could not be found."
 msgstr ""
 
 #: ../jhbuild/commands/base.py:106 ../jhbuild/commands/base.py:141
-#: ../jhbuild/commands/base.py:363 ../jhbuild/commands/rdepends.py:47
-#: ../jhbuild/commands/uninstall.py:45
+#: ../jhbuild/commands/base.py:364 ../jhbuild/commands/rdepends.py:47
+#: ../jhbuild/commands/uninstall.py:46
 msgid "This command requires a module parameter."
 msgstr ""
 
@@ -130,73 +164,79 @@ msgstr ""
 msgid "clean command called while makeclean is set to False, skipped."
 msgstr ""
 
-#: ../jhbuild/commands/base.py:192
+#: ../jhbuild/commands/base.py:193
 msgid ""
 "bootstrap moduleset has been updated since the last time you used it, "
 "perhaps you should run jhbuild bootstrap."
 msgstr ""
 
-#: ../jhbuild/commands/base.py:198
+#: ../jhbuild/commands/base.py:199
 #, python-format
 msgid ""
 "some bootstrap modules have been updated, perhaps you should update them: %s."
 msgstr ""
 
-#: ../jhbuild/commands/base.py:204
+#: ../jhbuild/commands/base.py:205
 msgid "Update and compile all modules (the default)"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:219 ../jhbuild/commands/base.py:313
+#: ../jhbuild/commands/base.py:214 ../jhbuild/commands/base.py:308
+msgid "This option does nothing anymore"
+msgstr ""
+
+#: ../jhbuild/commands/base.py:220 ../jhbuild/commands/base.py:314
+#: ../jhbuild/commands/make.py:48
 msgid "run make check after building"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:222 ../jhbuild/commands/base.py:316
+#: ../jhbuild/commands/base.py:223 ../jhbuild/commands/base.py:317
 msgid "run make dist after building"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:231 ../jhbuild/commands/base.py:322
+#: ../jhbuild/commands/base.py:232 ../jhbuild/commands/base.py:323
 #: ../jhbuild/commands/tinderbox.py:43
 msgid "skip version control update"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:234 ../jhbuild/commands/base.py:325
+#: ../jhbuild/commands/base.py:235 ../jhbuild/commands/base.py:326
+#: ../jhbuild/commands/make.py:51
 msgid "quiet (no output)"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:249 ../jhbuild/commands/base.py:331
+#: ../jhbuild/commands/base.py:250 ../jhbuild/commands/base.py:332
 msgid "run tests in real X and not in Xvfb"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:252 ../jhbuild/commands/tinderbox.py:58
+#: ../jhbuild/commands/base.py:253 ../jhbuild/commands/tinderbox.py:58
 msgid "try to force checkout and autogen on failure"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:255 ../jhbuild/commands/tinderbox.py:61
+#: ../jhbuild/commands/base.py:256 ../jhbuild/commands/tinderbox.py:61
 msgid "don't poison modules on failure"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:258 ../jhbuild/commands/base.py:334
+#: ../jhbuild/commands/base.py:259 ../jhbuild/commands/base.py:335
 #: ../jhbuild/commands/tinderbox.py:64
 msgid "build even if policy says not to"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:261
+#: ../jhbuild/commands/base.py:262
 msgid "also build soft-dependencies that could be skipped"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:264 ../jhbuild/commands/base.py:337
+#: ../jhbuild/commands/base.py:265 ../jhbuild/commands/base.py:338
 msgid "skip modules installed less than the given time ago"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:288
+#: ../jhbuild/commands/base.py:289
 msgid "requested module is in the ignore list, nothing to do."
 msgstr ""
 
-#: ../jhbuild/commands/base.py:298
+#: ../jhbuild/commands/base.py:299
 msgid "Update and compile one or more modules"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:358
+#: ../jhbuild/commands/base.py:359
 #, python-format
 msgid ""
 "module \"%s\" does not exist, created automatically using repository \"%s\""
@@ -228,7 +268,7 @@ msgstr ""
 msgid "Unable to execute the command '%s'"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:439 ../jhbuild/frontends/gtkui.py:444
+#: ../jhbuild/commands/base.py:439 ../jhbuild/frontends/gtkui.py:446
 #: ../jhbuild/frontends/terminal.py:145
 msgid "No command given"
 msgstr "Ingen kommando gitt"
@@ -266,8 +306,8 @@ msgstr ""
 msgid "Output a Graphviz dependency graph for one or more modules"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:533 ../jhbuild/commands/info.py:40
-#: ../jhbuild/commands/uninstall.py:32
+#: ../jhbuild/commands/base.py:533 ../jhbuild/commands/info.py:39
+#: ../jhbuild/commands/uninstall.py:33
 msgid "[ modules ... ]"
 msgstr "[ moduler ... ]"
 
@@ -300,6 +340,7 @@ msgid "Control buildbot"
 msgstr ""
 
 #: ../jhbuild/commands/bot.py:57 ../jhbuild/commands/__init__.py:45
+#: ../jhbuild/commands/make.py:36
 msgid "[ options ... ]"
 msgstr ""
 
@@ -379,7 +420,7 @@ msgid ""
 "Check modules in GNOME Git repository have the correct branch definition"
 msgstr ""
 
-#: ../jhbuild/commands/checkbranches.py:63
+#: ../jhbuild/commands/checkbranches.py:65
 #, python-format
 msgid "%(module)s is missing branch definition for %(branch)s"
 msgstr ""
@@ -406,109 +447,108 @@ msgstr "Rydd alle moduler"
 msgid "Build targets from a GUI app"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:37
+#: ../jhbuild/commands/info.py:36
 msgid "Display information about one or more modules"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:52 ../jhbuild/commands/uninstall.py:42
+#: ../jhbuild/commands/info.py:51 ../jhbuild/commands/uninstall.py:43
 #, python-format
 msgid "unknown module %s"
 msgstr "ukjent modul %s"
 
-#: ../jhbuild/commands/info.py:61
+#: ../jhbuild/commands/info.py:60
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../jhbuild/commands/info.py:62
+#: ../jhbuild/commands/info.py:61
 msgid "Module Set:"
 msgstr "Modulsett:"
 
-#: ../jhbuild/commands/info.py:63
+#: ../jhbuild/commands/info.py:62
 msgid "Type:"
 msgstr "Type:"
 
-#: ../jhbuild/commands/info.py:66 ../jhbuild/commands/info.py:69
+#: ../jhbuild/commands/info.py:65 ../jhbuild/commands/info.py:69
+msgid "Install version:"
+msgstr "Installert versjon:"
+
+#: ../jhbuild/commands/info.py:66 ../jhbuild/commands/info.py:70
 msgid "Install date:"
 msgstr "Installeringsdato:"
 
-#: ../jhbuild/commands/info.py:69
+#: ../jhbuild/commands/info.py:69 ../jhbuild/commands/info.py:70
 msgid "not installed"
 msgstr "ikke installert"
 
-#: ../jhbuild/commands/info.py:74
+#: ../jhbuild/commands/info.py:75
 msgid "CVS Root:"
 msgstr "CVS-rot:"
 
-#: ../jhbuild/commands/info.py:75
+#: ../jhbuild/commands/info.py:76
 msgid "CVS Module:"
 msgstr "CVS-modul:"
 
-#: ../jhbuild/commands/info.py:77
-#, fuzzy
+#: ../jhbuild/commands/info.py:78
 msgid "CVS Revision:"
-msgstr "CVS-:"
+msgstr "CVS-revisjon:"
 
-#: ../jhbuild/commands/info.py:79
+#: ../jhbuild/commands/info.py:80
 msgid "Subversion Module:"
-msgstr ""
-
-#: ../jhbuild/commands/info.py:81
-msgid "Arch Version:"
-msgstr "Versjon av Arch:"
+msgstr "Subversion-modul"
 
-#: ../jhbuild/commands/info.py:83
+#: ../jhbuild/commands/info.py:82
 msgid "Darcs Archive:"
-msgstr ""
+msgstr "Darcs-arkiv:"
 
-#: ../jhbuild/commands/info.py:85
+#: ../jhbuild/commands/info.py:84
 msgid "Git Module:"
 msgstr "Git modul:"
 
-#: ../jhbuild/commands/info.py:87
+#: ../jhbuild/commands/info.py:86
 msgid "Git Origin Module:"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:91
+#: ../jhbuild/commands/info.py:90
 msgid "Git Branch:"
 msgstr "Git gren:"
 
-#: ../jhbuild/commands/info.py:93
+#: ../jhbuild/commands/info.py:92
 msgid "Git Tag:"
-msgstr ""
+msgstr "Git-merke:"
 
-#: ../jhbuild/commands/info.py:95
+#: ../jhbuild/commands/info.py:94
 msgid "URL:"
 msgstr "URL:"
 
-#: ../jhbuild/commands/info.py:96
+#: ../jhbuild/commands/info.py:95
 msgid "Version:"
 msgstr "Versjon:"
 
-#: ../jhbuild/commands/info.py:99
+#: ../jhbuild/commands/info.py:98
 msgid "Tree-ID:"
-msgstr ""
+msgstr "Tre-ID:"
 
-#: ../jhbuild/commands/info.py:104
+#: ../jhbuild/commands/info.py:103
 msgid "Sourcedir:"
 msgstr "Kildekatalog:"
 
-#: ../jhbuild/commands/info.py:110
+#: ../jhbuild/commands/info.py:109
 msgid "Requires:"
 msgstr "Krever:"
 
-#: ../jhbuild/commands/info.py:114
+#: ../jhbuild/commands/info.py:113
 msgid "Required by:"
 msgstr "Kreves av:"
 
-#: ../jhbuild/commands/info.py:116
+#: ../jhbuild/commands/info.py:115
 msgid "Suggests:"
 msgstr "ForeslÃr:"
 
-#: ../jhbuild/commands/info.py:118
+#: ../jhbuild/commands/info.py:117
 msgid "After:"
 msgstr "Etter:"
 
-#: ../jhbuild/commands/info.py:122
+#: ../jhbuild/commands/info.py:121
 msgid "Before:"
 msgstr "FÃr:"
 
@@ -524,9 +564,29 @@ msgstr ""
 msgid "Information about available jhbuild commands"
 msgstr ""
 
-#: ../jhbuild/commands/__init__.py:118
-msgid "command not found"
-msgstr "kommando ikke funnet"
+#: ../jhbuild/commands/__init__.py:122
+#, python-format
+msgid "no such command (did you mean \"jhbuild build %s\"?)"
+msgstr ""
+
+#: ../jhbuild/commands/__init__.py:124
+#, python-format
+msgid "no such command (did you mean \"jhbuild run %s\"?)"
+msgstr ""
+
+#: ../jhbuild/commands/make.py:33
+msgid "Compile and install the module for the current directory"
+msgstr ""
+
+#: ../jhbuild/commands/make.py:76
+#, python-format
+msgid "The current directory is not in the checkout root %r"
+msgstr ""
+
+#: ../jhbuild/commands/make.py:86
+#, python-format
+msgid "No module matching current directory %r in the moduleset"
+msgstr ""
 
 #: ../jhbuild/commands/rdepends.py:28
 msgid "Display reverse-dependencies of a module"
@@ -544,74 +604,77 @@ msgstr ""
 msgid "limit display to modules directly depending on given module"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:52
+#: ../jhbuild/commands/sanitycheck.py:46
 msgid "Check that required support tools are available"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:59
+#: ../jhbuild/commands/sanitycheck.py:53
 msgid "no extra arguments expected"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:64
+#: ../jhbuild/commands/sanitycheck.py:58
 #, python-format
 msgid "checkout root (%s) is not writable"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:67
+#: ../jhbuild/commands/sanitycheck.py:61
 #, python-format
 msgid "install prefix (%s) is not writable"
 msgstr ""
 
+#: ../jhbuild/commands/sanitycheck.py:66 ../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:129
-#: ../jhbuild/commands/sanitycheck.py:133
+#: ../jhbuild/commands/sanitycheck.py:78
+#: ../jhbuild/commands/sanitycheck.py:120
+#: ../jhbuild/commands/sanitycheck.py:124
+#: ../jhbuild/commands/sanitycheck.py:132
 #: ../jhbuild/commands/sanitycheck.py:141
-#: ../jhbuild/commands/sanitycheck.py:150
-#: ../jhbuild/versioncontrol/arch.py:155 ../jhbuild/versioncontrol/bzr.py:204
-#: ../jhbuild/versioncontrol/cvs.py:297 ../jhbuild/versioncontrol/darcs.py:108
+#: ../jhbuild/commands/sanitycheck.py:147
+#: ../jhbuild/commands/sanitycheck.py:149
+#: ../jhbuild/commands/sanitycheck.py:151 ../jhbuild/modtypes/cmake.py:97
+#: ../jhbuild/versioncontrol/bzr.py:204 ../jhbuild/versioncontrol/cvs.py:297
+#: ../jhbuild/versioncontrol/darcs.py:108
 #: ../jhbuild/versioncontrol/fossil.py:105
-#: ../jhbuild/versioncontrol/git.py:444 ../jhbuild/versioncontrol/hg.py:101
+#: ../jhbuild/versioncontrol/git.py:448 ../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:99
+#: ../jhbuild/commands/sanitycheck.py:87
 #, python-format
-msgid "aclocal-%s can't see %s macros"
+msgid "aclocal can't see %s macros"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:104
+#: ../jhbuild/commands/sanitycheck.py:92
 #, python-format
 msgid "Please copy the lacking macros (%s) in one of the following paths: %s"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:109
+#: ../jhbuild/commands/sanitycheck.py:100
 msgid "Could not find XML catalog"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:118
+#: ../jhbuild/commands/sanitycheck.py:109
 #, python-format
 msgid "Could not find %s in XML catalog"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:125
+#: ../jhbuild/commands/sanitycheck.py:116
 #, python-format
 msgid "Could not find the perl module %s"
 msgstr "Kunne ikke finne perl-modul %s"
 
-#: ../jhbuild/commands/sanitycheck.py:137
+#: ../jhbuild/commands/sanitycheck.py:128
 #, python-format
 msgid "%s or %s not found"
 msgstr "%s eller %s ikke funnet"
 
-#: ../jhbuild/commands/sanitycheck.py:146
+#: ../jhbuild/commands/sanitycheck.py:137
 msgid "Installed git program is not the right git"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:152
+#: ../jhbuild/commands/sanitycheck.py:143
 msgid "Could not check git program"
 msgstr "Kunne ikke sjekke git-program"
 
@@ -619,6 +682,59 @@ msgstr "Kunne ikke sjekke git-program"
 msgid "Print out a moduleset for the exact versions that are checked out"
 msgstr ""
 
+#: ../jhbuild/commands/sysdeps.py:37
+msgid "Check and install tarball dependencies using system packages"
+msgstr ""
+
+#: ../jhbuild/commands/sysdeps.py:45
+msgid "Install pkg-config modules via system"
+msgstr "Installer pkg-config-moduler via systemet"
+
+#: ../jhbuild/commands/sysdeps.py:51
+msgid "Partial build is not enabled; add partial_build = True to ~/.jhbuildrc"
+msgstr ""
+
+#: ../jhbuild/commands/sysdeps.py:61
+msgid "System installed packages which are new enough:"
+msgstr ""
+
+#: ../jhbuild/commands/sysdeps.py:65 ../jhbuild/commands/sysdeps.py:75
+#, python-format
+msgid "  %(pkg)s (required=%(req)s, installed=%(installed)s)"
+msgstr ""
+
+#: ../jhbuild/commands/sysdeps.py:69 ../jhbuild/commands/sysdeps.py:79
+#: ../jhbuild/commands/sysdeps.py:89
+msgid "  (none)"
+msgstr ""
+
+#: ../jhbuild/commands/sysdeps.py:71
+msgid "System installed packages which are too old:"
+msgstr ""
+
+#: ../jhbuild/commands/sysdeps.py:81
+msgid "No matching system package installed:"
+msgstr ""
+
+#: ../jhbuild/commands/sysdeps.py:85
+#, python-format
+msgid "  %(pkg)s (required=%(req)s)"
+msgstr ""
+
+#: ../jhbuild/commands/sysdeps.py:94
+msgid "Don't know how to install packages on this system"
+msgstr ""
+
+#: ../jhbuild/commands/sysdeps.py:97
+#, python-format
+msgid "No uninstalled system dependencies to install for modules: %r"
+msgstr ""
+
+#: ../jhbuild/commands/sysdeps.py:99
+#, python-format
+msgid "Installing dependencies on system: %s"
+msgstr ""
+
 #: ../jhbuild/commands/tinderbox.py:28
 msgid "Build modules non-interactively and store build logs"
 msgstr ""
@@ -631,10 +747,119 @@ msgstr ""
 msgid "output directory for tinderbox build not specified"
 msgstr ""
 
-#: ../jhbuild/commands/uninstall.py:29
+#: ../jhbuild/commands/uninstall.py:30
 msgid "Uninstall all modules"
 msgstr "Avinstaller alle moduler"
 
+#: ../jhbuild/commands/uninstall.py:52
+#, python-format
+msgid "Module %(mod)r is not installed"
+msgstr ""
+
+#: ../jhbuild/config.py:174
+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:186
+msgid ""
+"Obsolete JHBuild start script, make sure it is removed then do run 'make "
+"install'"
+msgstr ""
+
+#: ../jhbuild/config.py:197
+msgid "could not load config defaults"
+msgstr ""
+
+#: ../jhbuild/config.py:201
+#, python-format
+msgid "could not load config file, %s is missing"
+msgstr ""
+
+#: ../jhbuild/config.py:217
+#, python-format
+msgid "Could not include config file (%s)"
+msgstr "Kunne ikke inkludere konfigurasjonsfil (%s)"
+
+#: ../jhbuild/config.py:230
+msgid "could not load config file"
+msgstr "kunne ikke laste konfigurasjonsfil"
+
+#: ../jhbuild/config.py:244
+#, python-format
+msgid "unknown keys defined in configuration file: %s"
+msgstr ""
+
+#: ../jhbuild/config.py:251
+#, python-format
+msgid ""
+"the \"%s\" configuration variable is deprecated, you should use \"repos"
+"['gnome.org']\"."
+msgstr ""
+
+#: ../jhbuild/config.py:256 ../jhbuild/config.py:261
+#, python-format
+msgid ""
+"the \"%s\" configuration variable is deprecated, you should use \"repos\"."
+msgstr ""
+
+#: ../jhbuild/config.py:294
+msgid "invalid checkout mode"
+msgstr ""
+
+#: ../jhbuild/config.py:298
+#, python-format
+msgid "invalid checkout mode (module: %s)"
+msgstr ""
+
+#: ../jhbuild/config.py:300
+msgid "copy mode requires copy_dir to be set"
+msgstr ""
+
+#: ../jhbuild/config.py:305
+#, python-format
+msgid "modulesets directory (%s) not found, disabling use_local_modulesets"
+msgstr ""
+
+#: ../jhbuild/config.py:320
+#, python-format
+msgid "install prefix (%s) can not be created"
+msgstr ""
+
+#: ../jhbuild/config.py:327
+#, python-format
+msgid "working directory (%s) can not be created"
+msgstr ""
+
+#: ../jhbuild/config.py:434
+#, python-format
+msgid "Can't create %s directory"
+msgstr "Kan ikke lage katalog %s"
+
+#: ../jhbuild/config.py:519
+#, python-format
+msgid "Could not create GConf config (%s)"
+msgstr ""
+
+#: ../jhbuild/config.py:604
+msgid "Failed to parse 'min_age' relative time"
+msgstr ""
+
+#: ../jhbuild/config.py:615
+msgid ""
+"quiet mode has been disabled because the Python curses module is missing."
+msgstr ""
+
+#: ../jhbuild.desktop.in.in.h:1
+msgid "GNOME Build Tool"
+msgstr "GNOME byggverktÃy"
+
+#: ../jhbuild.desktop.in.in.h:2
+msgid "Build GNOME modules"
+msgstr "Bygg GNOME-moduler"
+
 #: ../jhbuild/frontends/autobuild.py:72
 #, python-format
 msgid "Server Error, retrying in %d seconds"
@@ -644,359 +869,442 @@ msgstr ""
 msgid "Server Error, aborting"
 msgstr ""
 
-#: ../jhbuild/frontends/autobuild.py:178
+#: ../jhbuild/frontends/autobuild.py:180
 #, python-format
 msgid "Error: %s"
 msgstr "Feil: %s"
 
-#: ../jhbuild/frontends/autobuild.py:183 ../jhbuild/utils/cmds.py:66
+#: ../jhbuild/frontends/autobuild.py:185 ../jhbuild/utils/cmds.py:66
 #, python-format
 msgid "Error running %s"
 msgstr ""
 
-#: ../jhbuild/frontends/autobuild.py:210
+#: ../jhbuild/frontends/autobuild.py:212
 msgid "ERROR: Wrong credentials, please check username/password"
 msgstr ""
 
-#: ../jhbuild/frontends/autobuild.py:216
+#: ../jhbuild/frontends/autobuild.py:218
 #, python-format
 msgid "Starting Build #%s"
 msgstr ""
 
-#: ../jhbuild/frontends/autobuild.py:230
+#: ../jhbuild/frontends/autobuild.py:232
 #, python-format
 msgid "**** Starting module %s ****"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:38
+#: ../jhbuild/frontends/buildscript.py:41
 #, python-format
 msgid "install prefix (%s) must be writable"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:45
+#: ../jhbuild/frontends/buildscript.py:48
 #, python-format
 msgid "checkout root (%s) can not be created"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:47
+#: ../jhbuild/frontends/buildscript.py:50
 #, python-format
 msgid "checkout root (%s) must be writable"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:54
+#: ../jhbuild/frontends/buildscript.py:57
 #, python-format
 msgid "checkout copy dir (%s) can not be created"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:56
+#: ../jhbuild/frontends/buildscript.py:59
 #, 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:87
+#: ../jhbuild/frontends/buildscript.py:100
 #, python-format
 msgid "Skipping %s (installed recently)"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:96
+#: ../jhbuild/frontends/buildscript.py:109
 #, python-format
 msgid "module %(mod)s will be built even though %(dep)s failed"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:99
+#: ../jhbuild/frontends/buildscript.py:112
 #, python-format
 msgid "module %(mod)s not built due to non buildable %(dep)s"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:100
+#: ../jhbuild/frontends/buildscript.py:239
+#, python-format
+msgid "Running post-installation trigger script: %r"
+msgstr ""
+
+#: ../jhbuild/frontends/buildscript.py:247 ../jhbuild/frontends/gtkui.py:594
+#, python-format
+msgid "%(command)s returned with an error code (%(rc)s)"
+msgstr ""
+
+#: ../jhbuild/frontends/gtkui.py:99
 msgid "Others..."
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:141
+#: ../jhbuild/frontends/gtkui.py:140
 msgid "Choose Module:"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:161
+#: ../jhbuild/frontends/gtkui.py:160
 msgid "Build Progress"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:164
+#: ../jhbuild/frontends/gtkui.py:163
 msgid "Terminal"
 msgstr "Terminal"
 
 #. Translators: This is a button label (to start build)
-#: ../jhbuild/frontends/gtkui.py:204
+#: ../jhbuild/frontends/gtkui.py:203
 msgid "Start"
 msgstr "Start"
 
-#: ../jhbuild/frontends/gtkui.py:348
+#: ../jhbuild/frontends/gtkui.py:347
 msgid "Build Completed"
 msgstr "Bygg fullfÃrt"
 
-#: ../jhbuild/frontends/gtkui.py:374 ../jhbuild/frontends/terminal.py:255
+#: ../jhbuild/frontends/gtkui.py:376 ../jhbuild/frontends/terminal.py:279
 #, python-format
 msgid "Error during phase %(phase)s of %(module)s"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:391
+#: ../jhbuild/frontends/gtkui.py:393
 msgid "Pick an Action"
 msgstr "Velg en handling"
 
-#: ../jhbuild/frontends/gtkui.py:394 ../jhbuild/frontends/terminal.py:282
+#: ../jhbuild/frontends/gtkui.py:396 ../jhbuild/frontends/terminal.py:306
 #, python-format
 msgid "Rerun phase %s"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:397 ../jhbuild/frontends/terminal.py:284
+#: ../jhbuild/frontends/gtkui.py:399 ../jhbuild/frontends/terminal.py:308
 #, python-format
 msgid "Ignore error and continue to %s"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:400 ../jhbuild/frontends/terminal.py:286
+#: ../jhbuild/frontends/gtkui.py:402 ../jhbuild/frontends/terminal.py:310
 msgid "Ignore error and continue to next module"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:402 ../jhbuild/frontends/terminal.py:287
+#: ../jhbuild/frontends/gtkui.py:404 ../jhbuild/frontends/terminal.py:311
 msgid "Give up on module"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:409 ../jhbuild/frontends/terminal.py:296
+#: ../jhbuild/frontends/gtkui.py:411 ../jhbuild/frontends/terminal.py:320
 #, python-format
 msgid "Go to phase \"%s\""
 msgstr "GÃ til fase Â%sÂ"
 
-#: ../jhbuild/frontends/gtkui.py:412
+#: ../jhbuild/frontends/gtkui.py:414
 msgid "Open Terminal"
 msgstr "Ãpne terminal"
 
-#: ../jhbuild/frontends/gtkui.py:586
-#, python-format
-msgid "%(command)s died with signal %(rc)s"
-msgstr ""
-
 #: ../jhbuild/frontends/gtkui.py:590
 #, python-format
-msgid "%(command)s returned with an error code (%(rc)s)"
+msgid "%(command)s died with signal %(rc)s"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:640
+#: ../jhbuild/frontends/gtkui.py:644
 msgid "Module"
 msgstr "Modul"
 
-#: ../jhbuild/frontends/gtkui.py:659
+#: ../jhbuild/frontends/gtkui.py:663
 msgid "Start At"
 msgstr "Start med"
 
-#: ../jhbuild/frontends/gtkui.py:702
+#: ../jhbuild/frontends/gtkui.py:706
 msgid "Preferences"
 msgstr "Brukervalg"
 
-#: ../jhbuild/frontends/gtkui.py:714
+#: ../jhbuild/frontends/gtkui.py:718
 msgid "Disable network access"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:715
-msgid "Always run autogen.sh"
+#: ../jhbuild/frontends/gtkui.py:719
+msgid "Don't poison modules on failure"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:716
-msgid "Don't poison modules on failure"
+#: ../jhbuild/frontends/terminal.py:172 ../jhbuild/frontends/tinderbox.py:249
+#, python-format
+msgid "%(configuration_variable)s invalid key %(key)s"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:211
+#: ../jhbuild/frontends/terminal.py:232
 msgid ""
 "\n"
 "Conflicts during checkout:\n"
 msgstr ""
 
 #. it could happen on a really badly-timed ctrl-c (see bug 551641)
-#: ../jhbuild/frontends/terminal.py:234 ../jhbuild/frontends/terminal.py:237
+#: ../jhbuild/frontends/terminal.py:255 ../jhbuild/frontends/terminal.py:259
 #, python-format
 msgid "########## Error running %s"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:246
+#: ../jhbuild/frontends/terminal.py:270
 msgid "success"
 msgstr "suksess"
 
-#: ../jhbuild/frontends/terminal.py:248
+#: ../jhbuild/frontends/terminal.py:272
 msgid "the following modules were not built"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:270 ../jhbuild/frontends/tinderbox.py:350
+#: ../jhbuild/frontends/terminal.py:294 ../jhbuild/frontends/tinderbox.py:400
 msgid "automatically retrying configure"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:274 ../jhbuild/frontends/tinderbox.py:354
+#: ../jhbuild/frontends/terminal.py:298 ../jhbuild/frontends/tinderbox.py:405
 msgid "automatically forcing a fresh checkout"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:288
+#: ../jhbuild/frontends/terminal.py:312
 msgid "Start shell"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:289
+#: ../jhbuild/frontends/terminal.py:313
 msgid "Reload configuration"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:298
+#: ../jhbuild/frontends/terminal.py:322
 msgid "choice: "
 msgstr "valg: "
 
-#: ../jhbuild/frontends/terminal.py:313
+#: ../jhbuild/frontends/terminal.py:337
 msgid "exit shell to continue with build"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:323
+#: ../jhbuild/frontends/terminal.py:347
 msgid "invalid choice"
 msgstr "ugyldig valg"
 
-#: ../jhbuild/frontends/terminal.py:331
+#: ../jhbuild/frontends/terminal.py:355
 msgid "Type \"yes\" to confirm the action: "
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:334
+#: ../jhbuild/frontends/terminal.py:358
 msgid "yes"
 msgstr ""
 
-#: ../jhbuild/modtypes/ant.py:63 ../jhbuild/modtypes/autotools.py:213
-#: ../jhbuild/modtypes/cmake.py:115 ../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/main.py:98
+msgid "You should not run jhbuild as root.\n"
+msgstr ""
 
-#: ../jhbuild/modtypes/ant.py:68
-msgid "Missing ant build tool"
+#: ../jhbuild/main.py:106
+msgid "%prog [ -f config ] command [ options ... ]"
 msgstr ""
 
-#. Quoting David Schleef:
-#. "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:81 ../jhbuild/modtypes/autotools.py:267
-#: ../jhbuild/modtypes/cmake.py:133 ../jhbuild/modtypes/distutils.py:74
-#: ../jhbuild/modtypes/perl.py:72 ../jhbuild/modtypes/waf.py:132
-msgid "Installing"
-msgstr "Installerer"
+#: ../jhbuild/main.py:108
+msgid ""
+"Build a set of modules from diverse repositories in correct dependency order "
+"(such as GNOME)."
+msgstr ""
+
+#: ../jhbuild/main.py:112
+msgid "Display this help and exit"
+msgstr "Vis hjelp og avslutt"
+
+#: ../jhbuild/main.py:119
+msgid "use a non default configuration file"
+msgstr ""
+
+#: ../jhbuild/main.py:122
+msgid "use a non default module set"
+msgstr ""
+
+#: ../jhbuild/main.py:125
+msgid "do not prompt for input"
+msgstr ""
+
+#: ../jhbuild/main.py:156
+msgid "Interrupted"
+msgstr "Avbrutt"
+
+#: ../jhbuild/main.py:159
+msgid "EOF"
+msgstr ""
 
-#: ../jhbuild/modtypes/autotools.py:110 ../jhbuild/modtypes/cmake.py:87
-#: ../jhbuild/modtypes/linux.py:119 ../jhbuild/modtypes/waf.py:79
+#: ../jhbuild/modtypes/autotools.py:118 ../jhbuild/modtypes/cmake.py:90
+#: ../jhbuild/modtypes/linux.py:114 ../jhbuild/modtypes/waf.py:74
+#: ../tests/mock.py:162
 msgid "Configuring"
 msgstr "Konfigurerer"
 
-#: ../jhbuild/modtypes/autotools.py:203 ../jhbuild/modtypes/cmake.py:106
-#: ../jhbuild/modtypes/linux.py:151 ../jhbuild/modtypes/waf.py:90
+#: ../jhbuild/modtypes/autotools.py:211 ../jhbuild/modtypes/cmake.py:111
+#: ../jhbuild/modtypes/linux.py:146 ../jhbuild/modtypes/waf.py:85
+#: ../tests/mock.py:157
 msgid "Cleaning"
 msgstr "Rydder"
 
-#: ../jhbuild/modtypes/autotools.py:233 ../jhbuild/modtypes/waf.py:111
+#: ../jhbuild/modtypes/autotools.py:220 ../jhbuild/modtypes/cmake.py:120
+#: ../jhbuild/modtypes/distutils.py:57 ../jhbuild/modtypes/linux.py:159
+#: ../jhbuild/modtypes/perl.py:53 ../jhbuild/modtypes/waf.py:92
+#: ../tests/mock.py:166
+msgid "Building"
+msgstr "Bygger"
+
+#: ../jhbuild/modtypes/autotools.py:254 ../jhbuild/modtypes/waf.py:109
+#: ../tests/mock.py:177
 msgid "Checking"
 msgstr "Sjekker"
 
-#: ../jhbuild/modtypes/autotools.py:247 ../jhbuild/modtypes/autotools.py:257
-#: ../jhbuild/modtypes/cmake.py:124 ../jhbuild/modtypes/waf.py:122
+#: ../jhbuild/modtypes/autotools.py:267 ../jhbuild/modtypes/cmake.py:129
+#: ../jhbuild/modtypes/waf.py:120
 msgid "Creating tarball for"
-msgstr ""
+msgstr "Lager tarball for"
 
-#: ../jhbuild/modtypes/autotools.py:279
-msgid "Distcleaning"
-msgstr ""
+#: ../jhbuild/modtypes/autotools.py:276
+msgid "Dist checking"
+msgstr "Sjekker distribusjon"
+
+#: ../jhbuild/modtypes/autotools.py:285 ../jhbuild/modtypes/cmake.py:138
+#: ../jhbuild/modtypes/distutils.py:69 ../jhbuild/modtypes/perl.py:67
+#: ../jhbuild/modtypes/waf.py:130 ../tests/mock.py:172
+msgid "Installing"
+msgstr "Installerer"
 
-#: ../jhbuild/modtypes/autotools.py:296 ../jhbuild/modtypes/waf.py:139
-msgid "Uninstalling"
-msgstr "Avinstallerer"
+#: ../jhbuild/modtypes/autotools.py:301
+msgid "Distcleaning"
+msgstr "Rydder for distribusjon"
 
-#: ../jhbuild/modtypes/__init__.py:56
+#: ../jhbuild/modtypes/__init__.py:59
 #, python-format
 msgid "unknown module type %s"
-msgstr ""
+msgstr "ukjent type modul %s"
 
-#: ../jhbuild/modtypes/__init__.py:72
+#: ../jhbuild/modtypes/__init__.py:75
 #, python-format
 msgid "dep node for module %s is missing package attribute"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:95
+#: ../jhbuild/modtypes/__init__.py:116
 #, python-format
 msgid "no <branch> element found for %s"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:103
+#: ../jhbuild/modtypes/__init__.py:124
 #, python-format
-msgid "Repository=%s not found for module id=%s. Possible repositories are %s"
+msgid ""
+"Repository=%(missing)s not found for module id=%(module)s. Possible "
+"repositories are %(possible)s"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:110
+#: ../jhbuild/modtypes/__init__.py:131
 #, python-format
 msgid ""
-"Default Repository=%s not found for module id=%s. Possible repositories are "
-"%s"
+"Default repository=%(missing)s not found for module id=%(module)s. Possible "
+"repositories are %(possible)s"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:192
+#: ../jhbuild/modtypes/__init__.py:191
 #, python-format
-msgid "Skipping %s (not updated)"
+msgid "Deleting .la file: %r"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:204
+#: ../jhbuild/modtypes/__init__.py:234
 #, python-format
-msgid "Skipping %s (package and dependencies not updated)"
+msgid "Failed to rename %(src)r to %(dest)r: %(msg)s"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:256 ../jhbuild/modtypes/__init__.py:274
-#: ../jhbuild/modtypes/linux.py:88 ../jhbuild/modtypes/linux.py:95
-msgid "Checking out"
+#: ../jhbuild/modtypes/__init__.py:263
+#, python-format
+msgid "Moving temporary DESTDIR %r into build prefix"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:260
+#: ../jhbuild/modtypes/__init__.py:265
 #, python-format
-msgid "source directory %s was not created"
+msgid "Install complete: %d files copied"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:277
-msgid "wipe directory and start over"
+#: ../jhbuild/modtypes/__init__.py:284
+#, python-format
+msgid ""
+"Files remaining in buildroot %(dest)r; module may have installed files "
+"outside of prefix."
 msgstr ""
 
-#: ../jhbuild/modtypes/linux.py:46
+#: ../jhbuild/modtypes/__init__.py:302
 #, python-format
-msgid "kconfig file %s was not created"
+msgid "Module failed to install into DESTDIR %(dest)r"
 msgstr ""
 
-#: ../jhbuild/modtypes/linux.py:103
-msgid "make mrproper"
+#: ../jhbuild/modtypes/__init__.py:312
+#, python-format
+msgid "%d files remaining from previous build"
 msgstr ""
 
-#: ../jhbuild/modtypes/linux.py:177
-msgid "Installing kernel"
-msgstr "Installerer kjerne"
+#: ../jhbuild/modtypes/__init__.py:315 ../jhbuild/utils/packagedb.py:265
+#, python-format
+msgid "Deleted: %(file)r"
+msgstr ""
 
-#: ../jhbuild/modtypes/linux.py:195
-msgid "Installing modules"
+#: ../jhbuild/modtypes/__init__.py:320
+#, python-format
+msgid "Failed to delete no longer installed file %(file)r: %(msg)s"
+msgstr ""
+
+#: ../jhbuild/modtypes/__init__.py:370
+#, python-format
+msgid "Skipping %s (not updated)"
+msgstr ""
+
+#: ../jhbuild/modtypes/__init__.py:382
+#, python-format
+msgid "Skipping %s (package and dependencies not updated)"
+msgstr ""
+
+#: ../jhbuild/modtypes/__init__.py:446 ../jhbuild/modtypes/__init__.py:464
+#: ../jhbuild/modtypes/linux.py:83 ../jhbuild/modtypes/linux.py:90
+#: ../tests/mock.py:143
+msgid "Checking out"
+msgstr ""
+
+#: ../jhbuild/modtypes/__init__.py:450
+#, python-format
+msgid "source directory %s was not created"
+msgstr ""
+
+#: ../jhbuild/modtypes/__init__.py:467
+msgid "wipe directory and start over"
+msgstr ""
+
+#: ../jhbuild/modtypes/linux.py:46
+#, python-format
+msgid "kconfig file %s was not created"
+msgstr "kconfig-fil %s ble ikke laget"
+
+#: ../jhbuild/modtypes/linux.py:98
+msgid "make mrproper"
+msgstr "make mrproper"
+
+#: ../jhbuild/modtypes/linux.py:172
+msgid "Installing kernel"
+msgstr "Installerer kjerne"
+
+#: ../jhbuild/modtypes/linux.py:190
+msgid "Installing modules"
 msgstr "Installerer moduler"
 
-#: ../jhbuild/modtypes/linux.py:210
-#, fuzzy
+#: ../jhbuild/modtypes/linux.py:205
 msgid "Installing kernel headers"
-msgstr "Installerer "
+msgstr "Installerer kjernehoder"
 
-#: ../jhbuild/modtypes/linux.py:248
+#: ../jhbuild/modtypes/linux.py:245
 #, python-format
 msgid ""
-"Repository=%s not found for kconfig in linux id=%s. Possible repositories "
-"are %s"
+"Repository=%(missing)s not found for kconfig in linux id=%(linux_id)s. "
+"Possible repositories are %(possible)s"
 msgstr ""
 
-#: ../jhbuild/modtypes/linux.py:253
+#: ../jhbuild/modtypes/linux.py:251
 #, python-format
 msgid ""
-"Default Repository=%s not found for kconfig in module id=%s. Possible "
-"repositories are %s"
+"Default repository=%(missing)s not found for kconfig in linux id="
+"%(linux_id)s. Possible repositories are %(possible)s"
 msgstr ""
 
 #: ../jhbuild/modtypes/tarball.py:68
@@ -1004,61 +1312,171 @@ msgstr ""
 msgid "module '%(module)s' has invalid size attribute ('%(size)s')"
 msgstr ""
 
+#: ../jhbuild/moduleset.py:34 ../jhbuild/utils/httpcache.py:46
+msgid "Python xml packages are required but could not be found"
+msgstr ""
+
+#: ../jhbuild/moduleset.py:75
+#, python-format
+msgid "fixed case of module '%(orig)s' to '%(new)s'"
+msgstr ""
+
+#: ../jhbuild/moduleset.py:91
+#, python-format
+msgid "module \"%s\" not found"
+msgstr "modul Â%s ble ikke funnet"
+
+#: ../jhbuild/moduleset.py:106 ../jhbuild/moduleset.py:110
+#, python-format
+msgid "%(module)s has a dependency on unknown \"%(invalid)s\" module"
+msgstr ""
+
+#: ../jhbuild/moduleset.py:297
+msgid "Unknown module:"
+msgstr "Ukjent modul:"
+
+#: ../jhbuild/moduleset.py:388
+#, python-format
+msgid "could not download %s: %s"
+msgstr "kunne ikke laste ned %s: %s"
+
+#: ../jhbuild/moduleset.py:393 ../jhbuild/moduleset.py:395
+#, python-format
+msgid "failed to parse %s: %s"
+msgstr ""
+
+#: ../jhbuild/moduleset.py:422
+msgid "Duplicate repository:"
+msgstr ""
+
+#: ../jhbuild/moduleset.py:526
+msgid ""
+"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:102
+#, python-format
+msgid "Invalid placeholder in string: line %d, col %d"
+msgstr ""
+
+#: ../jhbuild/monkeypatch.py:107 ../jhbuild/monkeypatch.py:133
+msgid "Too many positional arguments"
+msgstr ""
+
+#: ../jhbuild/monkeypatch.py:127 ../jhbuild/monkeypatch.py:160
+msgid "Unrecognized named group in pattern"
+msgstr ""
+
 #: ../jhbuild/utils/cmds.py:40
 msgid "Call to undefined command"
 msgstr ""
 
-#: ../jhbuild/utils/httpcache.py:46 ../jhbuild/utils/packagedb.py:24
-#: ../jhbuild/moduleset.py:33
-msgid "Python xml packages are required but could not be found"
+#: ../jhbuild/utils/httpcache.py:185
+msgid "file not in cache, but not allowed to check network"
 msgstr ""
 
-#: ../jhbuild/utils/httpcache.py:184
-msgid "file not in cache, but not allowed to check network"
+#: ../jhbuild/utils/lockfile.py:108
+#, python-format
+msgid "Removing stale lock left by no longer extant pid %(pid)d, uid %(uid)d"
 msgstr ""
 
-#: ../jhbuild/utils/unpack.py:144
+#: ../jhbuild/utils/lockfile.py:120
 #, python-format
-msgid "Failed to unpack %s (unknown archive type)"
+msgid ""
+"Lock %(path)r taken by pid %(pid)d; waiting for it to exit.  Press Control-C "
+"to interrupt."
 msgstr ""
 
-#: ../jhbuild/utils/unpack.py:146
+#: ../jhbuild/utils/packagedb.py:71
 #, python-format
-msgid "Failed to unpack %s"
+msgid "package %s has files with embedded new lines"
 msgstr ""
 
-#: ../jhbuild/utils/unpack.py:152
+#: ../jhbuild/utils/packagedb.py:148
+msgid "Package DB modified externally, rereading"
+msgstr ""
+
+#: ../jhbuild/utils/packagedb.py:252
 #, python-format
-msgid "Failed to unpack %s (empty file?)"
+msgid ""
+"no manifest for '%s', can't uninstall.  Try building again, then "
+"uninstalling."
+msgstr ""
+
+#: ../jhbuild/utils/packagedb.py:269
+#, python-format
+msgid "Failed to delete %(file)r: %(msg)s"
+msgstr ""
+
+#: ../jhbuild/utils/systeminstall.py:59
+msgid "No suitable root privilege command found; you should install \"pkexec\""
+msgstr ""
+
+#: ../jhbuild/utils/systeminstall.py:78 ../jhbuild/utils/systeminstall.py:81
+#, python-format
+msgid "PackageKit: %s"
+msgstr ""
+
+#: ../jhbuild/utils/systeminstall.py:109
+msgid "Nothing available to install"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/arch.py:40 ../jhbuild/versioncontrol/arch.py:83
+#: ../jhbuild/utils/systeminstall.py:112
 #, python-format
-msgid "could not register archive %s"
+msgid "Installing: %s"
+msgstr "Installerer: %s"
+
+#: ../jhbuild/utils/systeminstall.py:124
+msgid "Complete!"
+msgstr "FullfÃrt!"
+
+#: ../jhbuild/utils/systeminstall.py:156
+msgid "Using apt-file to search for providers; this may be slow.  Please wait."
 msgstr ""
 
-#: ../jhbuild/versioncontrol/arch.py:80
+#: ../jhbuild/utils/systeminstall.py:163
 #, python-format
-msgid "archive %s not registered"
+msgid "No native package found for %(id)s"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/arch.py:92 ../jhbuild/versioncontrol/bzr.py:74
-#: ../jhbuild/versioncontrol/darcs.py:55
+#: ../jhbuild/utils/systeminstall.py:166
+#, python-format
+msgid "Installing: %(pkgs)s"
+msgstr "Installerer %(pkgs)s"
+
+#: ../jhbuild/utils/systeminstall.py:171
+msgid "Nothing to install"
+msgstr "Ingenting à installere"
+
+#: ../jhbuild/utils/trigger.py:57
+#, python-format
+msgid "No keys specified in trigger script %r"
+msgstr ""
+
+#: ../jhbuild/utils/unpack.py:144
+#, python-format
+msgid "Failed to unpack %s (unknown archive type)"
+msgstr ""
+
+#: ../jhbuild/utils/unpack.py:146
+#, python-format
+msgid "Failed to unpack %s"
+msgstr ""
+
+#: ../jhbuild/utils/unpack.py:152
+#, python-format
+msgid "Failed to unpack %s (empty file?)"
+msgstr ""
+
+#: ../jhbuild/versioncontrol/bzr.py:74 ../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:128 ../jhbuild/versioncontrol/arch.py:141
-#: ../jhbuild/versioncontrol/darcs.py:84 ../jhbuild/versioncontrol/darcs.py:90
-#: ../jhbuild/versioncontrol/fossil.py:82
-#: ../jhbuild/versioncontrol/fossil.py:95 ../jhbuild/versioncontrol/git.py:550
-#: ../jhbuild/versioncontrol/git.py:590 ../jhbuild/versioncontrol/git.py:666
-#: ../jhbuild/versioncontrol/hg.py:85 ../jhbuild/versioncontrol/hg.py:91
-msgid "date based checkout not yet supported\n"
-msgstr ""
-
 #: ../jhbuild/versioncontrol/bzr.py:117
 msgid "attribute is deprecated. Use revspec instead."
 msgstr ""
@@ -1097,26 +1515,34 @@ msgstr ""
 msgid "Consider using the changecvsroot.py script to fix this."
 msgstr ""
 
+#: ../jhbuild/versioncontrol/darcs.py:84 ../jhbuild/versioncontrol/darcs.py:90
+#: ../jhbuild/versioncontrol/fossil.py:82
+#: ../jhbuild/versioncontrol/fossil.py:95 ../jhbuild/versioncontrol/git.py:554
+#: ../jhbuild/versioncontrol/git.py:594 ../jhbuild/versioncontrol/git.py:670
+#: ../jhbuild/versioncontrol/hg.py:85 ../jhbuild/versioncontrol/hg.py:91
+msgid "date based checkout not yet supported\n"
+msgstr ""
+
 #: ../jhbuild/versioncontrol/git.py:111
 msgid "ignored bad branch redefinition for module:"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:196
+#: ../jhbuild/versioncontrol/git.py:199
 msgid "Need at least git-1.5.6 from June/08 to operate"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:210
+#: ../jhbuild/versioncontrol/git.py:213
 msgid "Unexpected: Checkoutdir is not a git repository:"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:266
+#: ../jhbuild/versioncontrol/git.py:269
 #, python-format
 msgid ""
 "The requested branch \"%s\" is not available. Neither locally, nor remotely "
 "in the origin remote."
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:274
+#: ../jhbuild/versioncontrol/git.py:277
 msgid "Refusing to switch a dirty tree."
 msgstr ""
 
@@ -1130,25 +1556,25 @@ msgstr ""
 msgid "Command %s did not include commit line: %r"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:422
+#: ../jhbuild/versioncontrol/git.py:420
 msgid ""
 "Failed to update module as it switched to git (you should check for changes "
 "then remove the directory)."
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:423
+#: ../jhbuild/versioncontrol/git.py:421
 msgid ""
 "Failed to update module (missing .git) (you should check for changes then "
 "remove the directory)."
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:517
+#: ../jhbuild/versioncontrol/git.py:521
 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:562
+#: ../jhbuild/versioncontrol/git.py:566
 #, python-format
 msgid "Cannot get last revision from %s. Check the module location."
 msgstr ""
@@ -1235,234 +1661,52 @@ msgstr ""
 msgid "skipped hash check (missing support for %s)"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:200
+#: ../jhbuild/versioncontrol/tarball.py:205
+msgid "unable to find wget or curl"
+msgstr ""
+
+#: ../jhbuild/versioncontrol/tarball.py:221
 #, python-format
 msgid "tarball dir (%s) can not be created"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:202
+#: ../jhbuild/versioncontrol/tarball.py:223
 #, python-format
 msgid "tarball dir (%s) must be writable"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:220
-msgid "unable to find wget or curl"
-msgstr ""
-
-#: ../jhbuild/versioncontrol/tarball.py:228
+#: ../jhbuild/versioncontrol/tarball.py:235
 #, python-format
 msgid "failed to unpack %s"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:231
+#: ../jhbuild/versioncontrol/tarball.py:238
 #, python-format
 msgid "could not unpack tarball (expected %s dir)"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:246
+#: ../jhbuild/versioncontrol/tarball.py:253
 #, python-format
 msgid "could not download patch (error: %s)"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:248
+#: ../jhbuild/versioncontrol/tarball.py:255
 msgid "could not download patch"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:280
+#: ../jhbuild/versioncontrol/tarball.py:287
 #, python-format
 msgid "Failed to find patch: %s"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:282
+#: ../jhbuild/versioncontrol/tarball.py:289
 msgid "Applying patch"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:289
+#: ../jhbuild/versioncontrol/tarball.py:297
 msgid "unable to find quilt"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/tarball.py:300
+#: ../jhbuild/versioncontrol/tarball.py:308
 msgid "could not checkout quilt patch set"
 msgstr ""
-
-#: ../jhbuild/config.py:167
-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:179
-msgid ""
-"Obsolete JHBuild start script, make sure it is removed then do run 'make "
-"install'"
-msgstr ""
-
-#: ../jhbuild/config.py:187
-msgid "could not load config defaults"
-msgstr ""
-
-#: ../jhbuild/config.py:191
-#, python-format
-msgid "could not load config file, %s is missing"
-msgstr ""
-
-#: ../jhbuild/config.py:207
-#, python-format
-msgid "Could not include config file (%s)"
-msgstr "Kunne ikke inkludere konfigurasjonsfil (%s)"
-
-#: ../jhbuild/config.py:220
-msgid "could not load config file"
-msgstr "kunne ikke laste konfigurasjonsfil"
-
-#: ../jhbuild/config.py:234
-#, python-format
-msgid "unknown keys defined in configuration file: %s"
-msgstr ""
-
-#: ../jhbuild/config.py:241
-#, python-format
-msgid ""
-"the \"%s\" configuration variable is deprecated, you should use \"repos"
-"['gnome.org']\"."
-msgstr ""
-
-#: ../jhbuild/config.py:246 ../jhbuild/config.py:251
-#, python-format
-msgid ""
-"the \"%s\" configuration variable is deprecated, you should use \"repos\"."
-msgstr ""
-
-#: ../jhbuild/config.py:272
-msgid "invalid checkout mode"
-msgstr ""
-
-#: ../jhbuild/config.py:276
-#, python-format
-msgid "invalid checkout mode (module: %s)"
-msgstr ""
-
-#: ../jhbuild/config.py:278
-msgid "copy mode requires copy_dir to be set"
-msgstr ""
-
-#: ../jhbuild/config.py:283
-#, python-format
-msgid "modulesets directory (%s) not found, disabling use_local_modulesets"
-msgstr ""
-
-#: ../jhbuild/config.py:295
-#, python-format
-msgid "install prefix (%s) can not be created"
-msgstr ""
-
-#: ../jhbuild/config.py:378
-#, python-format
-msgid "Can't create %s directory"
-msgstr "Kan ikke lage katalog %s"
-
-#: ../jhbuild/config.py:462
-#, python-format
-msgid "Could not create GConf config (%s)"
-msgstr ""
-
-#: ../jhbuild/config.py:549
-msgid "Failed to parse 'min_age' relative time"
-msgstr ""
-
-#: ../jhbuild/config.py:559
-msgid ""
-"quiet mode has been disabled because the Python curses module is missing."
-msgstr ""
-
-#: ../jhbuild/main.py:98
-msgid "You should not run jhbuild as root.\n"
-msgstr ""
-
-#: ../jhbuild/main.py:106
-msgid "%prog [ -f config ] command [ options ... ]"
-msgstr ""
-
-#: ../jhbuild/main.py:108
-msgid ""
-"Build a set of modules from diverse repositories in correct dependency order "
-"(such as GNOME)."
-msgstr ""
-
-#: ../jhbuild/main.py:112
-msgid "Display this help and exit"
-msgstr "Vis hjelp og avslutt"
-
-#: ../jhbuild/main.py:119
-msgid "use a non default configuration file"
-msgstr ""
-
-#: ../jhbuild/main.py:122
-msgid "use a non default module set"
-msgstr ""
-
-#: ../jhbuild/main.py:125
-msgid "do not prompt for input"
-msgstr ""
-
-#: ../jhbuild/main.py:156
-msgid "Interrupted"
-msgstr "Avbrutt"
-
-#: ../jhbuild/main.py:159
-msgid "EOF"
-msgstr ""
-
-#: ../jhbuild/moduleset.py:62
-#, python-format
-msgid "fixed case of module '%(orig)s' to '%(new)s'"
-msgstr ""
-
-#: ../jhbuild/moduleset.py:77
-#, python-format
-msgid "module \"%s\" not found"
-msgstr "modul Â%s ble ikke funnet"
-
-#: ../jhbuild/moduleset.py:92 ../jhbuild/moduleset.py:96
-#, python-format
-msgid "%(module)s has a dependency on unknown \"%(invalid)s\" module"
-msgstr ""
-
-#: ../jhbuild/moduleset.py:250
-msgid "Unknown module:"
-msgstr "Ukjent modul:"
-
-#: ../jhbuild/moduleset.py:319 ../jhbuild/moduleset.py:349
-#, python-format
-msgid "failed to parse %s: %s"
-msgstr ""
-
-#: ../jhbuild/moduleset.py:344
-#, python-format
-msgid "could not download %s: %s"
-msgstr "kunne ikke laste ned %s: %s"
-
-#: ../jhbuild/moduleset.py:374
-msgid "Duplicate repository:"
-msgstr ""
-
-#: ../jhbuild/moduleset.py:478
-msgid ""
-"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:102
-#, python-format
-msgid "Invalid placeholder in string: line %d, col %d"
-msgstr ""
-
-#: ../jhbuild/monkeypatch.py:107 ../jhbuild/monkeypatch.py:133
-msgid "Too many positional arguments"
-msgstr ""
-
-#: ../jhbuild/monkeypatch.py:127 ../jhbuild/monkeypatch.py:160
-msgid "Unrecognized named group in pattern"
-msgstr ""