[jhbuild] Updated Norwegian bokmål translation

From: Kjartan Maraas <kmaraas src gnome org>
To: commits-list gnome org
Cc:
Subject: [jhbuild] Updated Norwegian bokmål translation
Date: Wed, 12 Feb 2014 18:25:31 +0000 (UTC)
commit aa6462dca37881bcca3dba41ce967c0c03ff07f5
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Wed Feb 12 19:25:24 2014 +0100

    Updated Norwegian bokmål translation

 po/nb.po |  670 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 374 insertions(+), 296 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index e7f8ef2..6a07e23 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,14 +1,14 @@
 # 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-2012.
+# Kjartan Maraas <kmaraas gnome org>, 2008-2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: jhbuild\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-18 18:52+0200\n"
-"PO-Revision-Date: 2012-07-09 14:25+0200\n"
+"POT-Creation-Date: 2014-02-12 19:21+0100\n"
+"PO-Revision-Date: 2014-02-12 19:25+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norsk bokmål <i18n-nb lister ping uio no>\n"
 "Language: \n"
@@ -21,40 +21,54 @@ msgstr ""
 msgid "Configuring $PKG_NAME without autotools"
 msgstr "Konfigurerer $PKG_NAME uten autotools"
 
-#: ../autogen.sh:115 ../autogen.sh:120
+#: ../autogen.sh:120 ../autogen.sh:125
 #, sh-format
 msgid "Unable to create file $srcdir/Makefile.inc"
 msgstr ""
 
 #: ../autogen.sh:140
 #, sh-format
-msgid "Unable to copy $srcdir/Makefile.plain to $srcdir/Makefile"
-msgstr ""
+msgid "Unable to read file $makefile"
+msgstr "Kan ikke lese filen $makefile"
 
 #: ../autogen.sh:145
 #, sh-format
+msgid "Unable to copy $makefile to $srcdir/Makefile"
+msgstr "Kan ikke kopiere $makefile til $srcdir/Makefile"
+
+#: ../autogen.sh:150
+#, sh-format
 msgid "Now type `make' to compile $PKG_NAME"
-msgstr ""
+msgstr "Skriv «make» for å kompilere $PKG_NAME"
 
-#: ../autogen.sh:181
+#: ../autogen.sh:188
 #, sh-format
 msgid ""
 "**Error**: Directory `$srcdir' does not look like the top-level $PKG_NAME "
 "directory"
 msgstr ""
 
-#: ../autogen.sh:205
-msgid "gnome-autogen.sh not available"
-msgstr "gnome-autogen.sh er ikke tilgjengelig"
+#: ../autogen.sh:230
+msgid ""
+"WARNING: gnome-autogen.sh not available (usually part of package 'gnome-"
+"common')"
+msgstr ""
 
-#: ../autogen.sh:208
-msgid "yelp-tools not available"
-msgstr "yelp-tools er ikke tilgjengelig"
+#: ../autogen.sh:233
+msgid ""
+"WARNING: yelp-tools not available (usually part of package 'yelp-tools')"
+msgstr ""
 
 #: ../jhbuild/commands/autobuild.py:28
 msgid "Build modules non-interactively and upload results to JhAutobuild"
 msgstr ""
 
+#: ../jhbuild/commands/autobuild.py:36 ../jhbuild/commands/base.py:172
+#: ../jhbuild/commands/base.py:283 ../jhbuild/commands/make.py:42
+#: ../jhbuild/commands/tinderbox.py:38
+msgid "always run autogen.sh"
+msgstr "alltid kjør autogen.sh"
+
 #: ../jhbuild/commands/autobuild.py:39 ../jhbuild/commands/base.py:178
 #: ../jhbuild/commands/base.py:286 ../jhbuild/commands/make.py:45
 #: ../jhbuild/commands/tinderbox.py:44
@@ -67,14 +81,13 @@ msgid "run make distcheck after building"
 msgstr "kjør make distcheck etter bygging"
 
 #: ../jhbuild/commands/autobuild.py:45 ../jhbuild/commands/base.py:47
-#: ../jhbuild/commands/base.py:199 ../jhbuild/commands/base.py:450
+#: ../jhbuild/commands/base.py:199 ../jhbuild/commands/base.py:437
 #: ../jhbuild/commands/clean.py:38 ../jhbuild/commands/tinderbox.py:53
 msgid "treat the given modules as up to date"
 msgstr ""
 
-#: ../jhbuild/commands/autobuild.py:48 ../jhbuild/commands/base.py:50
-#: ../jhbuild/commands/base.py:202 ../jhbuild/commands/clean.py:41
-#: ../jhbuild/commands/tinderbox.py:56
+#: ../jhbuild/commands/autobuild.py:48 ../jhbuild/commands/base.py:202
+#: ../jhbuild/commands/clean.py:41 ../jhbuild/commands/tinderbox.py:56
 msgid "start building at the given module"
 msgstr ""
 
@@ -87,11 +100,11 @@ msgid "verbose mode"
 msgstr ""
 
 #: ../jhbuild/commands/autobuild.py:71
-msgid "report url for autobuild not specified"
+msgid "report URL for autobuild not specified"
 msgstr ""
 
 #: ../jhbuild/commands/autobuild.py:82 ../jhbuild/commands/base.py:73
-#: ../jhbuild/commands/base.py:249 ../jhbuild/commands/base.py:488
+#: ../jhbuild/commands/base.py:249 ../jhbuild/commands/base.py:475
 #: ../jhbuild/commands/clean.py:55 ../jhbuild/commands/tinderbox.py:94
 #, python-format
 msgid "%s not in module list"
@@ -103,14 +116,17 @@ msgstr "Oppdater alle moduler fra versjonskontrollsystemet"
 
 #: ../jhbuild/commands/base.py:41 ../jhbuild/commands/base.py:89
 #: ../jhbuild/commands/base.py:123 ../jhbuild/commands/base.py:166
-#: ../jhbuild/commands/base.py:277 ../jhbuild/commands/base.py:441
+#: ../jhbuild/commands/base.py:277 ../jhbuild/commands/base.py:428
 #: ../jhbuild/commands/tinderbox.py:32
 msgid "[ options ... ] [ modules ... ]"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:53 ../jhbuild/commands/base.py:205
-#: ../jhbuild/commands/base.py:456
-msgid "build only modules with the given tags"
+#: ../jhbuild/commands/base.py:50
+msgid "start updating at the given module"
+msgstr ""
+
+#: ../jhbuild/commands/base.py:53
+msgid "update only modules with the given tags"
 msgstr ""
 
 #: ../jhbuild/commands/base.py:56 ../jhbuild/commands/base.py:95
@@ -120,7 +136,7 @@ msgid "set a sticky date when checking out modules"
 msgstr ""
 
 #: ../jhbuild/commands/base.py:59 ../jhbuild/commands/base.py:190
-#: ../jhbuild/commands/base.py:459
+#: ../jhbuild/commands/base.py:446
 msgid "ignore all soft-dependencies"
 msgstr ""
 
@@ -129,15 +145,15 @@ msgid "Update one or more modules from version control"
 msgstr "Oppdater en eller flere moduler fra versjonskontroll"
 
 #: ../jhbuild/commands/base.py:104 ../jhbuild/commands/base.py:142
-#: ../jhbuild/commands/base.py:382 ../jhbuild/commands/base.py:399
-#: ../jhbuild/commands/rdepends.py:52 ../jhbuild/moduleset.py:164
+#: ../jhbuild/commands/base.py:383 ../jhbuild/commands/rdepends.py:52
+#: ../jhbuild/moduleset.py:165
 #, python-format
 msgid "A module called '%s' could not be found."
 msgstr ""
 
 #: ../jhbuild/commands/base.py:107 ../jhbuild/commands/base.py:145
-#: ../jhbuild/commands/base.py:339 ../jhbuild/commands/rdepends.py:47
-#: ../jhbuild/commands/uninstall.py:46
+#: ../jhbuild/commands/base.py:340 ../jhbuild/commands/rdepends.py:47
+#: ../jhbuild/commands/uninstall.py:58
 msgid "This command requires a module parameter."
 msgstr ""
 
@@ -181,6 +197,10 @@ msgstr ""
 msgid "quiet (no output)"
 msgstr ""
 
+#: ../jhbuild/commands/base.py:205 ../jhbuild/commands/base.py:443
+msgid "build only modules with the given tags"
+msgstr ""
+
 #: ../jhbuild/commands/base.py:211 ../jhbuild/commands/base.py:310
 msgid "run tests in real X and not in Xvfb"
 msgstr ""
@@ -225,86 +245,87 @@ msgstr ""
 msgid "Update and compile one or more modules"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:334 ../jhbuild/commands/make.py:96
+#: ../jhbuild/commands/base.py:335 ../jhbuild/commands/make.py:95
+#: ../jhbuild/commands/uninstall.py:50
 #, python-format
 msgid ""
 "module \"%(modname)s\" does not exist, created automatically using "
 "repository \"%(reponame)s\""
 msgstr ""
 
-#: ../jhbuild/commands/base.py:347
+#: ../jhbuild/commands/base.py:348
 msgid "Run a command under the JHBuild environment"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:350
+#: ../jhbuild/commands/base.py:351
 msgid "[ options ... ] program [ arguments ... ]"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:356
+#: ../jhbuild/commands/base.py:357
 msgid "run command in build dir of the given module"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:359
+#: ../jhbuild/commands/base.py:360
 msgid "run command in checkout dir of the given module"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:372 ../jhbuild/commands/base.py:416
+#: ../jhbuild/commands/base.py:373 ../jhbuild/commands/base.py:403
 #, python-format
 msgid "Unable to execute the command '%(command)s': %(err)s"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:390 ../jhbuild/commands/base.py:407
+#: ../jhbuild/commands/base.py:394
 #, python-format
 msgid "Unable to execute the command '%s'"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:414 ../jhbuild/frontends/gtkui.py:447
+#: ../jhbuild/commands/base.py:401 ../jhbuild/frontends/gtkui.py:447
 #: ../jhbuild/frontends/terminal.py:145
 msgid "No command given"
 msgstr "Ingen kommando gitt"
 
-#: ../jhbuild/commands/base.py:423
+#: ../jhbuild/commands/base.py:410
 msgid "Start a shell under the JHBuild environment"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:438
+#: ../jhbuild/commands/base.py:425
 msgid "List the modules that would be built"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:447
+#: ../jhbuild/commands/base.py:434
 msgid "show which revision will be built"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:453
+#: ../jhbuild/commands/base.py:440
 msgid "start list at the given module"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:462
+#: ../jhbuild/commands/base.py:449
 msgid "also list soft-dependencies that could be skipped"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:465
+#: ../jhbuild/commands/base.py:452
 msgid "list all modules, not only those that would be built"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:472
+#: ../jhbuild/commands/base.py:459
 msgid "Conflicting options specified ('--start-at' and '--all-modules')"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:504
+#: ../jhbuild/commands/base.py:491
 msgid "Output a Graphviz dependency graph for one or more modules"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:507 ../jhbuild/commands/info.py:39
-#: ../jhbuild/commands/uninstall.py:33
+#: ../jhbuild/commands/base.py:494 ../jhbuild/commands/info.py:39
+#: ../jhbuild/commands/uninstall.py:34
 msgid "[ modules ... ]"
 msgstr "[ moduler ... ]"
 
-#: ../jhbuild/commands/base.py:513
+#: ../jhbuild/commands/base.py:500
 msgid "add dotted lines to soft dependencies"
 msgstr ""
 
-#: ../jhbuild/commands/base.py:516
+#: ../jhbuild/commands/base.py:503
 msgid "group modules from metamodule together"
 msgstr ""
 
@@ -350,7 +371,7 @@ msgid "start as daemon"
 msgstr ""
 
 #: ../jhbuild/commands/bot.py:84
-msgid "pid file location"
+msgid "PID file location"
 msgstr ""
 
 #: ../jhbuild/commands/bot.py:87
@@ -377,18 +398,18 @@ msgstr ""
 msgid "buildbot and twisted not found, run jhbuild bot --setup"
 msgstr ""
 
-#: ../jhbuild/commands/bot.py:294
+#: ../jhbuild/commands/bot.py:295
 #, python-format
 msgid "No description for slave %s."
 msgstr ""
 
 #. parse error
-#: ../jhbuild/commands/bot.py:299
+#: ../jhbuild/commands/bot.py:300
 #, python-format
 msgid "Failed to parse slave config for %s."
 msgstr ""
 
-#: ../jhbuild/commands/bot.py:806 ../jhbuild/commands/bot.py:814
+#: ../jhbuild/commands/bot.py:807 ../jhbuild/commands/bot.py:815
 msgid "failed to get buildbot PID"
 msgstr ""
 
@@ -403,7 +424,7 @@ msgid "%(module)s is missing branch definition for %(branch)s"
 msgstr ""
 
 #: ../jhbuild/commands/checkmodulesets.py:30
-msgid "Check if modules in jhbuild have the correct definition"
+msgid "Check if modules in JHBuild have the correct definition"
 msgstr ""
 
 #: ../jhbuild/commands/checkmodulesets.py:43
@@ -420,6 +441,28 @@ msgstr ""
 msgid "Clean all modules"
 msgstr "Rydd alle moduler"
 
+#: ../jhbuild/commands/extdeps.py:70
+msgid "Report details on GNOME external dependencies"
+msgstr ""
+
+#: ../jhbuild/commands/extdeps.py:98
+msgid "External deps for GNOME"
+msgstr ""
+
+#: ../jhbuild/commands/extdeps.py:104
+#, python-format
+msgid "External deps for GNOME %s"
+msgstr ""
+
+#: ../jhbuild/commands/extdeps.py:138
+msgid "patched"
+msgstr ""
+
+#: ../jhbuild/commands/extdeps.py:142
+#, python-format
+msgid "and %d others."
+msgstr ""
+
 #: ../jhbuild/commands/goalreport.py:328
 msgid "Report GNOME modules status wrt various goals"
 msgstr ""
@@ -436,7 +479,7 @@ msgstr ""
 msgid "Display information about one or more modules"
 msgstr ""
 
-#: ../jhbuild/commands/info.py:51 ../jhbuild/commands/uninstall.py:43
+#: ../jhbuild/commands/info.py:51
 #, python-format
 msgid "unknown module %s"
 msgstr "ukjent modul %s"
@@ -537,57 +580,64 @@ msgstr "Etter:"
 msgid "Before:"
 msgstr "Før:"
 
-#: ../jhbuild/commands/__init__.py:85 ../jhbuild/commands/sysdeps.py:71
+#: ../jhbuild/commands/__init__.py:84 ../jhbuild/commands/sysdeps.py:49
+#, python-format
+msgid "required=%s"
+msgstr "kreves=%s"
+
+#: ../jhbuild/commands/__init__.py:86 ../jhbuild/commands/sysdeps.py:51
+#, python-format
+msgid "installed=%s"
+msgstr "installert=%s"
+
+#. Translators: This is used to separate items of package metadata
+#: ../jhbuild/commands/__init__.py:88 ../jhbuild/commands/sysdeps.py:53
+msgid ", "
+msgstr ", "
+
+#: ../jhbuild/commands/__init__.py:90 ../jhbuild/commands/sysdeps.py:55
+#, python-format
+msgid "(%s)"
+msgstr "(%s)"
+
+#: ../jhbuild/commands/__init__.py:94 ../jhbuild/commands/sysdeps.py:80
 msgid "Required packages:"
 msgstr "Pakker som kreves:"
 
-#: ../jhbuild/commands/__init__.py:86 ../jhbuild/commands/sysdeps.py:72
-#: ../jhbuild/commands/sysdeps.py:102
+#: ../jhbuild/commands/__init__.py:95 ../jhbuild/commands/sysdeps.py:81
+#: ../jhbuild/commands/sysdeps.py:124
 msgid "  System installed packages which are too old:"
-msgstr ""
-
-#: ../jhbuild/commands/__init__.py:91 ../jhbuild/commands/sysdeps.py:62
-#: ../jhbuild/commands/sysdeps.py:76 ../jhbuild/commands/sysdeps.py:106
-#, python-format
-msgid ""
-"    %(module)s (%(pkg_config)srequired=%(req)s, installed=%(installed)s)"
-msgstr ""
+msgstr "  Pakker som er installert på systemet og er for gamle:"
 
-#: ../jhbuild/commands/__init__.py:98 ../jhbuild/commands/__init__.py:110
-#: ../jhbuild/commands/sysdeps.py:83 ../jhbuild/commands/sysdeps.py:96
-#: ../jhbuild/commands/sysdeps.py:113
+#: ../jhbuild/commands/__init__.py:105 ../jhbuild/commands/__init__.py:117
+#: ../jhbuild/commands/sysdeps.py:90 ../jhbuild/commands/sysdeps.py:118
+#: ../jhbuild/commands/sysdeps.py:133
 msgid "    (none)"
-msgstr ""
+msgstr "    (ingen)"
 
-#: ../jhbuild/commands/__init__.py:100 ../jhbuild/commands/sysdeps.py:85
-#: ../jhbuild/commands/sysdeps.py:115
+#: ../jhbuild/commands/__init__.py:107 ../jhbuild/commands/sysdeps.py:92
+#: ../jhbuild/commands/sysdeps.py:135
 msgid "  No matching system package installed:"
-msgstr ""
+msgstr "  Ingen systeminstallerte pakker med treff:"
 
-#: ../jhbuild/commands/__init__.py:105 ../jhbuild/commands/sysdeps.py:89
-#: ../jhbuild/commands/sysdeps.py:118
-#, python-format
-msgid "    %(module)s (%(pkg_config)srequired=%(req)s)"
-msgstr ""
-
-#: ../jhbuild/commands/__init__.py:127
+#: ../jhbuild/commands/__init__.py:134
 msgid "JHBuild commands are:"
 msgstr "JHBuild-kommandoer:"
 
-#: ../jhbuild/commands/__init__.py:133
+#: ../jhbuild/commands/__init__.py:140
 msgid "For more information run \"jhbuild <command> --help\""
-msgstr ""
+msgstr "Kjør «jhbuild <kommando> --help» for mer informasjon"
 
-#: ../jhbuild/commands/__init__.py:142
-msgid "Information about available jhbuild commands"
-msgstr ""
+#: ../jhbuild/commands/__init__.py:149
+msgid "Information about available JHBuild commands"
+msgstr "Informasjon om tilgjengelige JHBuild-kommandoer"
 
-#: ../jhbuild/commands/__init__.py:169
+#: ../jhbuild/commands/__init__.py:176
 #, python-format
 msgid "no such command (did you mean \"jhbuild build %s\"?)"
 msgstr ""
 
-#: ../jhbuild/commands/__init__.py:171
+#: ../jhbuild/commands/__init__.py:178
 #, python-format
 msgid "no such command (did you mean \"jhbuild run %s\"?)"
 msgstr ""
@@ -596,16 +646,12 @@ msgstr ""
 msgid "Compile and install the module for the current directory"
 msgstr ""
 
-#: ../jhbuild/commands/make.py:42
-msgid "always run autogen.sh"
-msgstr "alltid kjør autogen.sh"
-
-#: ../jhbuild/commands/make.py:79
+#: ../jhbuild/commands/make.py:78
 #, python-format
 msgid "The current directory is not in the checkout root %r"
 msgstr ""
 
-#: ../jhbuild/commands/make.py:91
+#: ../jhbuild/commands/make.py:90
 #, python-format
 msgid "No module matching current directory %r in the moduleset"
 msgstr ""
@@ -644,97 +690,105 @@ msgstr ""
 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:68 ../jhbuild/commands/sanitycheck.py:71
+#: ../jhbuild/commands/sanitycheck.py:74 ../jhbuild/commands/sanitycheck.py:78
+#: ../jhbuild/commands/sanitycheck.py:81
+#: ../jhbuild/commands/sanitycheck.py:108
+#: ../jhbuild/commands/sanitycheck.py:112
 #: ../jhbuild/commands/sanitycheck.py:120
-#: ../jhbuild/commands/sanitycheck.py:124
-#: ../jhbuild/commands/sanitycheck.py:132
-#: ../jhbuild/commands/sanitycheck.py:141
-#: ../jhbuild/commands/sanitycheck.py:147
-#: ../jhbuild/commands/sanitycheck.py:149
-#: ../jhbuild/commands/sanitycheck.py:151 ../jhbuild/modtypes/cmake.py:94
-#: ../jhbuild/versioncontrol/bzr.py:206 ../jhbuild/versioncontrol/cvs.py:297
+#: ../jhbuild/commands/sanitycheck.py:129
+#: ../jhbuild/commands/sanitycheck.py:135
+#: ../jhbuild/commands/sanitycheck.py:137
+#: ../jhbuild/commands/sanitycheck.py:139 ../jhbuild/modtypes/cmake.py:82
+#: ../jhbuild/versioncontrol/bzr.py:215 ../jhbuild/versioncontrol/cvs.py:297
 #: ../jhbuild/versioncontrol/darcs.py:110
 #: ../jhbuild/versioncontrol/fossil.py:107
-#: ../jhbuild/versioncontrol/git.py:448 ../jhbuild/versioncontrol/hg.py:103
+#: ../jhbuild/versioncontrol/git.py:457 ../jhbuild/versioncontrol/hg.py:103
 #: ../jhbuild/versioncontrol/mtn.py:142 ../jhbuild/versioncontrol/svn.py:313
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../jhbuild/commands/sanitycheck.py:87
-#, python-format
-msgid "aclocal can't see %s macros"
+#: ../jhbuild/commands/sanitycheck.py:88
+msgid "Could not find XML catalog"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:92
+#: ../jhbuild/commands/sanitycheck.py:97
 #, python-format
 msgid ""
-"Please copy the lacking macros (%(macros)s) in one of the following paths: "
-"%(path)s"
-msgstr ""
-
-#: ../jhbuild/commands/sanitycheck.py:100
-msgid "Could not find XML catalog"
+"Could not find %s in XML catalog (usually part of package 'docbook-xsl')"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:109
+#: ../jhbuild/commands/sanitycheck.py:104
 #, python-format
-msgid "Could not find %s in XML catalog"
-msgstr ""
+msgid "Could not find the Perl module %s"
+msgstr "Fant ikke Perl-modul %s"
 
 #: ../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:128
 msgid "curl or wget not found"
 msgstr "curl eller wget ble ikke funnet"
 
-#: ../jhbuild/commands/sanitycheck.py:137
+#: ../jhbuild/commands/sanitycheck.py:125
 msgid "Installed git program is not the right git"
 msgstr ""
 
-#: ../jhbuild/commands/sanitycheck.py:143
+#: ../jhbuild/commands/sanitycheck.py:131
 msgid "Could not check git program"
 msgstr "Kunne ikke sjekke git-program"
 
+#: ../jhbuild/commands/sanitycheck.py:149
+#, python-format
+msgid "aclocal can't see %s macros"
+msgstr ""
+
+#: ../jhbuild/commands/sanitycheck.py:154
+#, python-format
+msgid ""
+"Please copy the lacking macros (%(macros)s) in one of the following paths: "
+"%(path)s"
+msgstr ""
+
 #: ../jhbuild/commands/snapshot.py:34
 msgid "Print out a moduleset for the exact versions that are checked out"
 msgstr ""
 
-#: ../jhbuild/commands/sysdeps.py:30
+#: ../jhbuild/commands/sysdeps.py:32
 msgid "Check and install tarball dependencies using system packages"
 msgstr ""
 
-#: ../jhbuild/commands/sysdeps.py:38
+#: ../jhbuild/commands/sysdeps.py:40
 msgid "Install pkg-config modules via system"
 msgstr "Installer pkg-config-moduler via systemet"
 
-#: ../jhbuild/commands/sysdeps.py:58
+#: ../jhbuild/commands/sysdeps.py:69
 msgid "System installed packages which are new enough:"
 msgstr ""
 
-#: ../jhbuild/commands/sysdeps.py:69 ../jhbuild/commands/sysdeps.py:125
+#: ../jhbuild/commands/sysdeps.py:78 ../jhbuild/commands/sysdeps.py:148
 msgid "  (none)"
 msgstr "  (ingen)"
 
-#: ../jhbuild/commands/sysdeps.py:101
+#: ../jhbuild/commands/sysdeps.py:123
 msgid "Optional packages: (JHBuild will build the missing packages)"
 msgstr ""
 
-#: ../jhbuild/commands/sysdeps.py:130
+#: ../jhbuild/commands/sysdeps.py:156
+#, python-format
+msgid ""
+"%(cmd)s is required to install packages on this system. Please install "
+"%(cmd)s."
+msgstr ""
+
+#: ../jhbuild/commands/sysdeps.py:161
 msgid "Don't know how to install packages on this system"
 msgstr ""
 
-#: ../jhbuild/commands/sysdeps.py:133
+#: ../jhbuild/commands/sysdeps.py:165
 #, python-format
 msgid "No uninstalled system dependencies to install for modules: %r"
 msgstr ""
 
-#: ../jhbuild/commands/sysdeps.py:135
+#: ../jhbuild/commands/sysdeps.py:167
 #, python-format
 msgid "Installing dependencies on system: %s"
 msgstr ""
@@ -755,134 +809,144 @@ msgstr ""
 msgid "Report GNOME modules status wrt 3.0 goals"
 msgstr ""
 
-#: ../jhbuild/commands/uninstall.py:30
+#: ../jhbuild/commands/uninstall.py:31
 msgid "Uninstall all modules"
 msgstr "Avinstaller alle moduler"
 
-#: ../jhbuild/commands/uninstall.py:52
+#: ../jhbuild/commands/uninstall.py:48
+#, python-format
+msgid "unknown module %s and no default repository to try an automatic module"
+msgstr ""
+
+#: ../jhbuild/commands/uninstall.py:64
 #, python-format
 msgid "Module %(mod)r is not installed"
 msgstr ""
 
-#: ../jhbuild/config.py:174
+#: ../jhbuild/config.py:180
+#, python-format
+msgid "Invalid condition set modifier: '%s'.  Must start with '+' or '-'."
+msgstr ""
+
+#: ../jhbuild/config.py:206
 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
+#: ../jhbuild/config.py:218
 msgid ""
 "Obsolete JHBuild start script, make sure it is removed then do run 'make "
 "install'"
 msgstr ""
 
-#: ../jhbuild/config.py:197
+#: ../jhbuild/config.py:226
 msgid "could not load config defaults"
 msgstr ""
 
-#: ../jhbuild/config.py:208
+#: ../jhbuild/config.py:237
 #, python-format
 msgid "could not load config file, %s is missing"
 msgstr ""
 
-#: ../jhbuild/config.py:214
+#: ../jhbuild/config.py:243
 #, python-format
 msgid ""
 "The default location of the configuration file has changed. Please move "
 "%(old_path)s to %(new_path)s."
 msgstr ""
 
-#: ../jhbuild/config.py:244
+#: ../jhbuild/config.py:292
 #, python-format
 msgid "Could not include config file (%s)"
 msgstr "Kunne ikke inkludere konfigurasjonsfil (%s)"
 
-#: ../jhbuild/config.py:258
+#: ../jhbuild/config.py:306
 msgid "could not load config file"
 msgstr "kunne ikke laste konfigurasjonsfil"
 
-#: ../jhbuild/config.py:272
+#: ../jhbuild/config.py:320
 #, python-format
 msgid "unknown keys defined in configuration file: %s"
 msgstr ""
 
-#: ../jhbuild/config.py:279
+#: ../jhbuild/config.py:327
 #, python-format
 msgid ""
-"the \"%s\" configuration variable is deprecated, you should use \"repos"
-"['gnome.org']\"."
+"the \"%s\" configuration variable is deprecated, you should use "
+"\"repos['gnome.org']\"."
 msgstr ""
 
-#: ../jhbuild/config.py:284 ../jhbuild/config.py:289
+#: ../jhbuild/config.py:332 ../jhbuild/config.py:337
 #, python-format
 msgid ""
 "the \"%s\" configuration variable is deprecated, you should use \"repos\"."
 msgstr ""
 
-#: ../jhbuild/config.py:323
+#: ../jhbuild/config.py:371
 msgid "invalid checkout mode"
 msgstr ""
 
-#: ../jhbuild/config.py:327
+#: ../jhbuild/config.py:375
 #, python-format
 msgid "invalid checkout mode (module: %s)"
 msgstr ""
 
-#: ../jhbuild/config.py:329
+#: ../jhbuild/config.py:377
 msgid "copy mode requires copy_dir to be set"
 msgstr ""
 
-#: ../jhbuild/config.py:334
+#: ../jhbuild/config.py:382
 #, python-format
 msgid "modulesets directory (%s) not found, disabling use_local_modulesets"
 msgstr ""
 
-#: ../jhbuild/config.py:340 ../jhbuild/config.py:342 ../jhbuild/config.py:344
-#: ../jhbuild/config.py:346 ../jhbuild/config.py:349
+#: ../jhbuild/config.py:388 ../jhbuild/config.py:390 ../jhbuild/config.py:392
+#: ../jhbuild/config.py:394 ../jhbuild/config.py:397
 #, python-format
 msgid "%s must be an absolute path"
 msgstr ""
 
-#: ../jhbuild/config.py:362
+#: ../jhbuild/config.py:410
 #, python-format
 msgid "install prefix (%s) can not be created"
 msgstr ""
 
-#: ../jhbuild/config.py:369
+#: ../jhbuild/config.py:417
 #, python-format
 msgid "working directory (%s) can not be created"
 msgstr ""
 
-#: ../jhbuild/config.py:484
+#: ../jhbuild/config.py:533
 #, python-format
 msgid "Can't create %s directory"
 msgstr "Kan ikke lage katalog %s"
 
-#: ../jhbuild/config.py:515
+#: ../jhbuild/config.py:564
 #, python-format
 msgid ""
 "Unable to determine python version using the PYTHON environment variable "
 "(%s). Using default \"%s\""
 msgstr ""
 
-#: ../jhbuild/config.py:530
+#: ../jhbuild/config.py:579
 #, python-format
 msgid ""
 "Unable to determine python site-packages directory using the PYTHON "
 "environment variable (%s). Using default \"%s\""
 msgstr ""
 
-#: ../jhbuild/config.py:577
+#: ../jhbuild/config.py:626
 #, python-format
 msgid "Could not create GConf config (%s)"
 msgstr ""
 
-#: ../jhbuild/config.py:667
+#: ../jhbuild/config.py:718
 msgid "Failed to parse 'min_age' relative time"
 msgstr ""
 
-#: ../jhbuild/config.py:681
+#: ../jhbuild/config.py:732
 msgid ""
 "quiet mode has been disabled because the Python curses module is missing."
 msgstr ""
@@ -968,12 +1032,12 @@ msgstr ""
 msgid "module %(mod)s not built due to non buildable %(dep)s"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:246
+#: ../jhbuild/frontends/buildscript.py:248
 #, python-format
 msgid "Running post-installation trigger script: %r"
 msgstr ""
 
-#: ../jhbuild/frontends/buildscript.py:254 ../jhbuild/frontends/gtkui.py:596
+#: ../jhbuild/frontends/buildscript.py:256 ../jhbuild/frontends/gtkui.py:596
 #, python-format
 msgid "%(command)s returned with an error code (%(rc)s)"
 msgstr ""
@@ -1003,7 +1067,7 @@ msgstr "Start"
 msgid "Build Completed"
 msgstr "Bygg fullført"
 
-#: ../jhbuild/frontends/gtkui.py:377 ../jhbuild/frontends/terminal.py:283
+#: ../jhbuild/frontends/gtkui.py:377 ../jhbuild/frontends/terminal.py:286
 #, python-format
 msgid "Error during phase %(phase)s of %(module)s"
 msgstr ""
@@ -1012,25 +1076,25 @@ msgstr ""
 msgid "Pick an Action"
 msgstr "Velg en handling"
 
-#: ../jhbuild/frontends/gtkui.py:397 ../jhbuild/frontends/terminal.py:310
+#: ../jhbuild/frontends/gtkui.py:397 ../jhbuild/frontends/terminal.py:313
 #, python-format
 msgid "Rerun phase %s"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:400 ../jhbuild/frontends/terminal.py:312
+#: ../jhbuild/frontends/gtkui.py:400 ../jhbuild/frontends/terminal.py:315
 #, python-format
 msgid "Ignore error and continue to %s"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:403 ../jhbuild/frontends/terminal.py:314
+#: ../jhbuild/frontends/gtkui.py:403 ../jhbuild/frontends/terminal.py:317
 msgid "Ignore error and continue to next module"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:405 ../jhbuild/frontends/terminal.py:315
+#: ../jhbuild/frontends/gtkui.py:405 ../jhbuild/frontends/terminal.py:318
 msgid "Give up on module"
 msgstr ""
 
-#: ../jhbuild/frontends/gtkui.py:412 ../jhbuild/frontends/terminal.py:324
+#: ../jhbuild/frontends/gtkui.py:412 ../jhbuild/frontends/terminal.py:327
 #, python-format
 msgid "Go to phase \"%s\""
 msgstr "Gå til fase «%s»"
@@ -1042,7 +1106,7 @@ msgstr "Åpne terminal"
 #: ../jhbuild/frontends/gtkui.py:591
 #, python-format
 msgid "%(command)s died with signal %(rc)s"
-msgstr ""
+msgstr "%(command)s døde med signal %(rc)s"
 
 #: ../jhbuild/frontends/gtkui.py:646
 msgid "Module"
@@ -1058,13 +1122,18 @@ msgstr "Brukervalg"
 
 #: ../jhbuild/frontends/gtkui.py:720
 msgid "Disable network access"
-msgstr ""
+msgstr "Slå av nettverkstilgang"
 
 #: ../jhbuild/frontends/gtkui.py:721
+msgid "Always run autogen.sh"
+msgstr "Alltid kjør autogen.sh"
+
+#: ../jhbuild/frontends/gtkui.py:722
 msgid "Don't poison modules on failure"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:180 ../jhbuild/frontends/tinderbox.py:249
+#: ../jhbuild/frontends/terminal.py:180 ../jhbuild/frontends/tinderbox.py:251
+#: ../jhbuild/frontends/tinderbox.py:384 ../jhbuild/frontends/tinderbox.py:439
 #, python-format
 msgid "%(configuration_variable)s invalid key %(key)s"
 msgstr ""
@@ -1081,47 +1150,47 @@ msgstr ""
 msgid "########## Error running %s"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:274
+#: ../jhbuild/frontends/terminal.py:277
 msgid "success"
 msgstr "suksess"
 
-#: ../jhbuild/frontends/terminal.py:276
+#: ../jhbuild/frontends/terminal.py:279
 msgid "the following modules were not built"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:298 ../jhbuild/frontends/tinderbox.py:400
+#: ../jhbuild/frontends/terminal.py:301 ../jhbuild/frontends/tinderbox.py:415
 msgid "automatically retrying configure"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:302 ../jhbuild/frontends/tinderbox.py:405
+#: ../jhbuild/frontends/terminal.py:305 ../jhbuild/frontends/tinderbox.py:420
 msgid "automatically forcing a fresh checkout"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:316
+#: ../jhbuild/frontends/terminal.py:319
 msgid "Start shell"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:317
+#: ../jhbuild/frontends/terminal.py:320
 msgid "Reload configuration"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:326
+#: ../jhbuild/frontends/terminal.py:329
 msgid "choice: "
 msgstr "valg: "
 
-#: ../jhbuild/frontends/terminal.py:341
+#: ../jhbuild/frontends/terminal.py:344
 msgid "exit shell to continue with build"
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:351
+#: ../jhbuild/frontends/terminal.py:354
 msgid "invalid choice"
 msgstr "ugyldig valg"
 
-#: ../jhbuild/frontends/terminal.py:359
+#: ../jhbuild/frontends/terminal.py:362
 msgid "Type \"yes\" to confirm the action: "
 msgstr ""
 
-#: ../jhbuild/frontends/terminal.py:362
+#: ../jhbuild/frontends/terminal.py:365
 msgid "yes"
 msgstr ""
 
@@ -1155,155 +1224,167 @@ msgstr ""
 msgid "do not prompt for input"
 msgstr ""
 
-#: ../jhbuild/main.py:157
+#: ../jhbuild/main.py:129
+msgid "modify the condition set"
+msgstr ""
+
+#: ../jhbuild/main.py:160
 msgid "Interrupted"
 msgstr "Avbrutt"
 
-#: ../jhbuild/main.py:160
+#: ../jhbuild/main.py:163
 msgid "EOF"
 msgstr ""
 
-#: ../jhbuild/modtypes/autotools.py:120 ../jhbuild/modtypes/cmake.py:87
-#: ../jhbuild/modtypes/linux.py:113 ../jhbuild/modtypes/waf.py:74
+#: ../jhbuild/modtypes/autotools.py:228 ../jhbuild/modtypes/cmake.py:75
+#: ../jhbuild/modtypes/linux.py:109 ../jhbuild/modtypes/waf.py:76
 msgid "Configuring"
 msgstr "Konfigurerer"
 
-#: ../jhbuild/modtypes/autotools.py:214 ../jhbuild/modtypes/cmake.py:114
-#: ../jhbuild/modtypes/linux.py:145 ../jhbuild/modtypes/waf.py:85
+#: ../jhbuild/modtypes/autotools.py:268 ../jhbuild/modtypes/cmake.py:102
+#: ../jhbuild/modtypes/linux.py:141 ../jhbuild/modtypes/waf.py:87
 msgid "Cleaning"
 msgstr "Rydder"
 
-#: ../jhbuild/modtypes/autotools.py:223 ../jhbuild/modtypes/cmake.py:123
-#: ../jhbuild/modtypes/distutils.py:57 ../jhbuild/modtypes/linux.py:158
-#: ../jhbuild/modtypes/perl.py:52 ../jhbuild/modtypes/waf.py:92
+#: ../jhbuild/modtypes/autotools.py:277 ../jhbuild/modtypes/cmake.py:111
+#: ../jhbuild/modtypes/distutils.py:57 ../jhbuild/modtypes/linux.py:154
+#: ../jhbuild/modtypes/perl.py:52 ../jhbuild/modtypes/waf.py:95
 msgid "Building"
 msgstr "Bygger"
 
-#: ../jhbuild/modtypes/autotools.py:257 ../jhbuild/modtypes/waf.py:109
+#: ../jhbuild/modtypes/autotools.py:311 ../jhbuild/modtypes/waf.py:113
 msgid "Checking"
 msgstr "Sjekker"
 
-#: ../jhbuild/modtypes/autotools.py:270 ../jhbuild/modtypes/cmake.py:132
-#: ../jhbuild/modtypes/waf.py:120
+#: ../jhbuild/modtypes/autotools.py:324 ../jhbuild/modtypes/cmake.py:120
+#: ../jhbuild/modtypes/waf.py:125
 msgid "Creating tarball for"
 msgstr "Lager tarball for"
 
-#: ../jhbuild/modtypes/autotools.py:279
+#: ../jhbuild/modtypes/autotools.py:333
 msgid "Dist checking"
 msgstr "Sjekker distribusjon"
 
-#: ../jhbuild/modtypes/autotools.py:288 ../jhbuild/modtypes/cmake.py:141
+#: ../jhbuild/modtypes/autotools.py:342 ../jhbuild/modtypes/cmake.py:129
 #: ../jhbuild/modtypes/distutils.py:69 ../jhbuild/modtypes/perl.py:66
-#: ../jhbuild/modtypes/waf.py:130
+#: ../jhbuild/modtypes/waf.py:136
 msgid "Installing"
 msgstr "Installerer"
 
-#: ../jhbuild/modtypes/autotools.py:310
+#: ../jhbuild/modtypes/autotools.py:371
 msgid "Distcleaning"
 msgstr "Rydder for distribusjon"
 
-#: ../jhbuild/modtypes/__init__.py:59
+#: ../jhbuild/modtypes/autotools.py:405
+#, python-format
+msgid "<%s/> tag must contain value=''"
+msgstr ""
+
+#: ../jhbuild/modtypes/__init__.py:60
 #, python-format
 msgid "unknown module type %s"
 msgstr "ukjent type modul %s"
 
-#: ../jhbuild/modtypes/__init__.py:76
+#: ../jhbuild/modtypes/__init__.py:77
 #, python-format
 msgid "dep node for module %s is missing package attribute"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:85 ../jhbuild/modtypes/__init__.py:92
+#: ../jhbuild/modtypes/__init__.py:86 ../jhbuild/modtypes/__init__.py:93
 #, python-format
 msgid "%(node)s node for %(module)s module is missing %(attribute)s attribute"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:138
+#: ../jhbuild/modtypes/__init__.py:139
 #, python-format
 msgid "no <branch> element found for %s"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:146
+#: ../jhbuild/modtypes/__init__.py:148
 #, python-format
 msgid ""
 "Repository=%(missing)s not found for module id=%(module)s. Possible "
 "repositories are %(possible)s"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:153
+#: ../jhbuild/modtypes/__init__.py:155
 #, python-format
 msgid ""
-"Default repository=%(missing)s not found for module id=%(module)s. Possible "
-"repositories are %(possible)s"
+"No repository for module id=%(module)s. Either set branch/repo or default "
+"repository."
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:224
+#: ../jhbuild/modtypes/__init__.py:227
 #, python-format
 msgid "Deleting .la file: %r"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:270
-#, python-format
-msgid "Failed to rename %(src)r to %(dest)r: %(msg)s"
-msgstr ""
-
-#: ../jhbuild/modtypes/__init__.py:299
+#: ../jhbuild/modtypes/__init__.py:312
 #, python-format
 msgid "Moving temporary DESTDIR %r into build prefix"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:301
-#, python-format
-msgid "Install complete: %d files copied"
-msgstr ""
-
-#: ../jhbuild/modtypes/__init__.py:320
+#: ../jhbuild/modtypes/__init__.py:334
 #, python-format
 msgid ""
 "Files remaining in buildroot %(dest)r; module may have installed files "
 "outside of prefix."
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:338
+#: ../jhbuild/modtypes/__init__.py:352
 #, python-format
 msgid "Module failed to install into DESTDIR %(dest)r"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:348
+#: ../jhbuild/modtypes/__init__.py:362
 #, python-format
 msgid "%d files remaining from previous build"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:351 ../jhbuild/utils/packagedb.py:265
+#: ../jhbuild/modtypes/__init__.py:365 ../jhbuild/utils/packagedb.py:282
 #, python-format
 msgid "Deleted: %(file)r"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:356
+#: ../jhbuild/modtypes/__init__.py:370
 #, python-format
 msgid "Failed to delete no longer installed file %(file)r: %(msg)s"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:406
+#: ../jhbuild/modtypes/__init__.py:378
+#, python-format
+msgid ""
+"Install encountered errors: %(num)d errors raised, %(files)d files copied. "
+"The errors are:\n"
+"  %(err)s"
+msgstr ""
+
+#: ../jhbuild/modtypes/__init__.py:385
+#, python-format
+msgid "Install complete: %d files copied"
+msgstr ""
+
+#: ../jhbuild/modtypes/__init__.py:433
 #, python-format
 msgid "Skipping %s (not updated)"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:418
+#: ../jhbuild/modtypes/__init__.py:445
 #, python-format
 msgid "Skipping %s (package and dependencies not updated)"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:483 ../jhbuild/modtypes/__init__.py:501
-#: ../jhbuild/modtypes/linux.py:82 ../jhbuild/modtypes/linux.py:89
+#: ../jhbuild/modtypes/__init__.py:534 ../jhbuild/modtypes/__init__.py:552
+#: ../jhbuild/modtypes/linux.py:81 ../jhbuild/modtypes/linux.py:88
 msgid "Checking out"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:487
+#: ../jhbuild/modtypes/__init__.py:538
 #, python-format
 msgid "source directory %s was not created"
 msgstr ""
 
-#: ../jhbuild/modtypes/__init__.py:504
+#: ../jhbuild/modtypes/__init__.py:555
 msgid "wipe directory and start over"
 msgstr ""
 
@@ -1312,30 +1393,30 @@ msgstr ""
 msgid "kconfig file %s was not created"
 msgstr "kconfig-fil %s ble ikke laget"
 
-#: ../jhbuild/modtypes/linux.py:97
+#: ../jhbuild/modtypes/linux.py:93
 msgid "make mrproper"
 msgstr "make mrproper"
 
-#: ../jhbuild/modtypes/linux.py:171
+#: ../jhbuild/modtypes/linux.py:167
 msgid "Installing kernel"
 msgstr "Installerer kjerne"
 
-#: ../jhbuild/modtypes/linux.py:189
+#: ../jhbuild/modtypes/linux.py:185
 msgid "Installing modules"
 msgstr "Installerer moduler"
 
-#: ../jhbuild/modtypes/linux.py:204
+#: ../jhbuild/modtypes/linux.py:200
 msgid "Installing kernel headers"
 msgstr "Installerer kjernehoder"
 
-#: ../jhbuild/modtypes/linux.py:244
+#: ../jhbuild/modtypes/linux.py:240
 #, python-format
 msgid ""
 "Repository=%(missing)s not found for kconfig in linux id=%(linux_id)s. "
 "Possible repositories are %(possible)s"
 msgstr ""
 
-#: ../jhbuild/modtypes/linux.py:250
+#: ../jhbuild/modtypes/linux.py:246
 #, python-format
 msgid ""
 "Default repository=%(missing)s not found for kconfig in linux id="
@@ -1348,66 +1429,53 @@ 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"
+msgid "Python XML packages are required but could not be found"
 msgstr ""
 
-#: ../jhbuild/moduleset.py:78
+#: ../jhbuild/moduleset.py:79
 #, python-format
 msgid "fixed case of module '%(orig)s' to '%(new)s'"
 msgstr ""
 
-#: ../jhbuild/moduleset.py:117
+#: ../jhbuild/moduleset.py:118
 #, python-format
 msgid "%(module)s has a dependency on unknown \"%(invalid)s\" module"
 msgstr ""
 
-#: ../jhbuild/moduleset.py:130
+#: ../jhbuild/moduleset.py:131
 #, python-format
 msgid "Circular dependencies detected: %s"
 msgstr ""
 
-#: ../jhbuild/moduleset.py:212
-msgid "unknown"
-msgstr ""
-
-#: ../jhbuild/moduleset.py:273
+#: ../jhbuild/moduleset.py:282
 msgid "Unknown module:"
 msgstr "Ukjent modul:"
 
-#: ../jhbuild/moduleset.py:371
+#: ../jhbuild/moduleset.py:408
+msgid "<if> must have exactly one of condition-set='' or condition-unset=''"
+msgstr ""
+
+#: ../jhbuild/moduleset.py:427
 #, python-format
 msgid "could not download %s: %s"
 msgstr "kunne ikke laste ned %s: %s"
 
-#: ../jhbuild/moduleset.py:376 ../jhbuild/moduleset.py:378
+#: ../jhbuild/moduleset.py:432 ../jhbuild/moduleset.py:434
 #, python-format
 msgid "failed to parse %s: %s"
 msgstr ""
 
-#: ../jhbuild/moduleset.py:405
+#: ../jhbuild/moduleset.py:464
 msgid "Duplicate repository:"
 msgstr ""
 
-#: ../jhbuild/moduleset.py:508
+#: ../jhbuild/moduleset.py:567
 #, python-format
 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 %s."
 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 ""
@@ -1428,71 +1496,84 @@ msgid ""
 "to interrupt."
 msgstr ""
 
-#: ../jhbuild/utils/packagedb.py:71
+#: ../jhbuild/utils/packagedb.py:75
 #, python-format
 msgid "package %s has files with embedded new lines"
 msgstr ""
 
-#: ../jhbuild/utils/packagedb.py:148
+#: ../jhbuild/utils/packagedb.py:158
 msgid "Package DB modified externally, rereading"
 msgstr ""
 
-#: ../jhbuild/utils/packagedb.py:252
+#: ../jhbuild/utils/packagedb.py:269
 #, python-format
 msgid ""
 "no manifest for '%s', can't uninstall.  Try building again, then "
 "uninstalling."
 msgstr ""
 
-#: ../jhbuild/utils/packagedb.py:269
+#: ../jhbuild/utils/packagedb.py:286
 #, python-format
 msgid "Failed to delete %(file)r: %(msg)s"
 msgstr ""
 
-#: ../jhbuild/utils/systeminstall.py:131
+#: ../jhbuild/utils/systeminstall.py:140
 msgid "No suitable root privilege command found; you should install \"pkexec\""
 msgstr ""
 
-#: ../jhbuild/utils/systeminstall.py:150 ../jhbuild/utils/systeminstall.py:153
+#: ../jhbuild/utils/systeminstall.py:172 ../jhbuild/utils/systeminstall.py:175
 #, python-format
 msgid "PackageKit: %s"
 msgstr ""
 
-#: ../jhbuild/utils/systeminstall.py:182
+#: ../jhbuild/utils/systeminstall.py:251
 msgid "Nothing available to install"
 msgstr ""
 
-#: ../jhbuild/utils/systeminstall.py:185
+#: ../jhbuild/utils/systeminstall.py:254
 #, python-format
-msgid "Installing: %s"
-msgstr "Installerer: %s"
+msgid ""
+"Installing:\n"
+"  %s"
+msgstr ""
+"Installerer:\n"
+"  %s"
 
-#: ../jhbuild/utils/systeminstall.py:197
+#: ../jhbuild/utils/systeminstall.py:260
 msgid "Complete!"
 msgstr "Fullført!"
 
-#: ../jhbuild/utils/systeminstall.py:208
+#: ../jhbuild/utils/systeminstall.py:271
 msgid "Using yum to install packages.  Please wait."
 msgstr ""
 
-#: ../jhbuild/utils/systeminstall.py:215 ../jhbuild/utils/systeminstall.py:263
+#: ../jhbuild/utils/systeminstall.py:274
 #, python-format
-msgid "Installing: %(pkgs)s"
-msgstr "Installerer %(pkgs)s"
+msgid ""
+"Installing:\n"
+"  %(pkgs)s"
+msgstr ""
+"Installerer:\n"
+"  %(pkgs)s"
 
-#: ../jhbuild/utils/systeminstall.py:220 ../jhbuild/utils/systeminstall.py:268
+#: ../jhbuild/utils/systeminstall.py:284 ../jhbuild/utils/systeminstall.py:334
 msgid "Nothing to install"
 msgstr "Ingenting å installere"
 
-#: ../jhbuild/utils/systeminstall.py:253
+#: ../jhbuild/utils/systeminstall.py:315
 msgid "Using apt-file to search for providers; this may be slow.  Please wait."
 msgstr ""
 
-#: ../jhbuild/utils/systeminstall.py:260
+#: ../jhbuild/utils/systeminstall.py:324
 #, python-format
-msgid "No native package found for %(id)s"
+msgid "No native package found for %(id)s (%(filename)s)"
 msgstr ""
 
+#: ../jhbuild/utils/systeminstall.py:329
+#, python-format
+msgid "Installing: %(pkgs)s"
+msgstr "Installerer %(pkgs)s"
+
 #: ../jhbuild/utils/trigger.py:57
 #, python-format
 msgid "No keys specified in trigger script %r"
@@ -1560,8 +1641,8 @@ msgstr ""
 
 #: ../jhbuild/versioncontrol/darcs.py:86 ../jhbuild/versioncontrol/darcs.py:92
 #: ../jhbuild/versioncontrol/fossil.py:84
-#: ../jhbuild/versioncontrol/fossil.py:97 ../jhbuild/versioncontrol/git.py:558
-#: ../jhbuild/versioncontrol/git.py:598 ../jhbuild/versioncontrol/git.py:674
+#: ../jhbuild/versioncontrol/fossil.py:97 ../jhbuild/versioncontrol/git.py:567
+#: ../jhbuild/versioncontrol/git.py:607 ../jhbuild/versioncontrol/git.py:683
 #: ../jhbuild/versioncontrol/hg.py:87 ../jhbuild/versioncontrol/hg.py:93
 msgid "date based checkout not yet supported\n"
 msgstr ""
@@ -1570,59 +1651,59 @@ msgstr ""
 msgid "ignored bad branch redefinition for module:"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:199
+#: ../jhbuild/versioncontrol/git.py:201
 msgid "Need at least git-1.5.6 from June/08 to operate"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:213
+#: ../jhbuild/versioncontrol/git.py:215
 msgid "Unexpected: Checkoutdir is not a git repository:"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:269
+#: ../jhbuild/versioncontrol/git.py:271
 #, python-format
 msgid ""
 "The requested branch \"%s\" is not available. Neither locally, nor remotely "
 "in the origin remote."
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:277
+#: ../jhbuild/versioncontrol/git.py:279
 msgid "Refusing to switch a dirty tree."
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:353
+#: ../jhbuild/versioncontrol/git.py:357
 #, python-format
 msgid "Command %s returned no output"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:358
+#: ../jhbuild/versioncontrol/git.py:362
 #, python-format
 msgid "Command %s did not include commit line: %r"
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:420
+#: ../jhbuild/versioncontrol/git.py:429
 msgid ""
 "Failed to update module as it switched to git (you should check for changes "
 "then remove the directory)."
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:421
+#: ../jhbuild/versioncontrol/git.py:430
 msgid ""
 "Failed to update module (missing .git) (you should check for changes then "
 "remove the directory)."
 msgstr ""
 
-#: ../jhbuild/versioncontrol/git.py:525
+#: ../jhbuild/versioncontrol/git.py:534
 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:570
+#: ../jhbuild/versioncontrol/git.py:579
 #, python-format
 msgid "Cannot get last revision from %s. Check the module location."
 msgstr ""
 
-#: ../jhbuild/versioncontrol/__init__.py:193
+#: ../jhbuild/versioncontrol/__init__.py:196
 #, python-format
 msgid "unknown repository type %s"
 msgstr ""
@@ -1753,6 +1834,3 @@ msgstr ""
 #: ../jhbuild/versioncontrol/tarball.py:313
 msgid "could not checkout quilt patch set"
 msgstr ""
-
-#~ msgid "module \"%s\" not found"
-#~ msgstr "modul «%s» ble ikke funnet"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]