Merge branch 'maint'

1 files changed, 15 insertions, 15 deletions

diff --git a/lib/libalpm/po/nb.po b/lib/libalpm/po/nb.po
index 581ce7e5..1bd152e2 100644
--- a/lib/libalpm/po/nb.po
+++ b/lib/libalpm/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2014-11-18 15:12+1000\n"
+"POT-Creation-Date: 2015-02-14 11:13+1000\n"
 "PO-Revision-Date: 2014-11-20 17:31+0000\n"
 "Last-Translator: Eyolf Østrem <eyolf@oestrem.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/"
@@ -58,7 +58,7 @@ msgid "file not found in file list for package %s. skipping extraction of %s\n"
 msgstr ""
 "filen finnes ikke i fillisten for pakken %s. hopper over utpakking av %s\n"
 
-#: lib/libalpm/add.c:230
+#: lib/libalpm/add.c:232
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -67,7 +67,7 @@ msgstr ""
 "mapperettigheter er forskjellige i\n"
 "filsystem %s: %o  pakke: %o\n"
 
-#: lib/libalpm/add.c:240
+#: lib/libalpm/add.c:247
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
@@ -76,43 +76,43 @@ msgstr ""
 "mapperettigheter er forskjellige for %s\n"
 "i filsystem: %u:%u pakke: %u:%u\n"
 
-#: lib/libalpm/add.c:255
+#: lib/libalpm/add.c:263
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "utpakking: overskriver ikke mappe med fil %s\n"
 
-#: lib/libalpm/add.c:595 lib/libalpm/util.c:331 lib/libalpm/util.c:507
+#: lib/libalpm/add.c:603 lib/libalpm/util.c:331 lib/libalpm/util.c:507
 #, c-format
 msgid "could not get current working directory\n"
 msgstr "kunne ikke finne gjeldende mappe\n"
 
-#: lib/libalpm/add.c:600 lib/libalpm/util.c:336 lib/libalpm/util.c:512
+#: lib/libalpm/add.c:608 lib/libalpm/util.c:336 lib/libalpm/util.c:512
 #: lib/libalpm/util.c:553
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "kunne ikke endre mappe til %s (%s)\n"
 
-#: lib/libalpm/add.c:639 lib/libalpm/util.c:400 lib/libalpm/util.c:624
+#: lib/libalpm/add.c:647 lib/libalpm/util.c:400 lib/libalpm/util.c:624
 #, c-format
 msgid "could not restore working directory (%s)\n"
 msgstr "kunne ikke gjenopprette gjeldende mappe (%s)\n"
 
-#: lib/libalpm/add.c:647
+#: lib/libalpm/add.c:655
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "problem oppstod under oppgradering av %s\n"
 
-#: lib/libalpm/add.c:653
+#: lib/libalpm/add.c:661
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "problem oppstod under installasjon av %s\n"
 
-#: lib/libalpm/add.c:669
+#: lib/libalpm/add.c:677
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "kunne ikke oppdatere databaseoppføring %s-%s\n"
 
-#: lib/libalpm/add.c:680
+#: lib/libalpm/add.c:688
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "kunne ikke legge til oppføringen '%s' i mellomlageret\n"
@@ -736,22 +736,22 @@ msgstr "kunne ikke utføre transaksjon (fjerning)\n"
 msgid "could not commit transaction\n"
 msgstr "kunne ikke utføre transaksjon\n"
 
-#: lib/libalpm/trans.c:339
+#: lib/libalpm/trans.c:343
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "kunne ikke lage midlertidig mappe\n"
 
-#: lib/libalpm/trans.c:354
+#: lib/libalpm/trans.c:358
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "kunne ikke kopiere midertidig fil til %s (%s)\n"
 
-#: lib/libalpm/trans.c:385
+#: lib/libalpm/trans.c:389
 #, c-format
 msgid "could not remove %s\n"
 msgstr "kunne ikke fjerne %s\n"
 
-#: lib/libalpm/trans.c:389
+#: lib/libalpm/trans.c:393
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "kunne ikke fjerne midlertidig mappe %s\n"