GNOME.org
 

[gitg] Updated Norwegian bokmål translation.

commit 4dd3fbb377f80416e33a0e7e4a72ca302af206ec
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sun Feb 19 19:58:39 2017 +0100

    Updated Norwegian bokmål translation.

 po/nb.po | 1230 +++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 905 insertions(+), 325 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 1bbbde9..dd8b3e6 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,13 +1,13 @@
 # Norwegian Bokmål translation of gitg.
 # Copyright (C) 2001 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas gnome org>, 2001-2015.
+# Kjartan Maraas <kmaraas gnome org>, 2001-2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gitg 3.15.x\n"
+"Project-Id-Version: gitg 3.23.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-12 01:03+0100\n"
-"PO-Revision-Date: 2015-02-12 01:09+0100\n"
+"POT-Creation-Date: 2017-02-19 19:34+0100\n"
+"PO-Revision-Date: 2017-02-19 19:58+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb lister ping uio no>\n"
 "Language: nb\n"
@@ -16,7 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:54
+#: ../contrib/xml/xml-reader.c:327
+#, c-format
+msgid "Could not parse XML from stream"
+msgstr ""
+
+#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:39
 #: ../gitg/resources/ui/gitg-window.ui.h:1
 msgid "gitg"
 msgstr "gitg"
@@ -52,16 +57,42 @@ msgid "The activity which gitg activates by default when first launched."
 msgstr ""
 
 #: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
-msgid "When to Collapse Inactive Lanes"
+msgid "Use Gravatar"
 msgstr ""
 
 #: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
+msgid "Enable the use of gravatar to display user avatars."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+msgid "Enable Monitoring"
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:10
+msgid "Automatically update when external changes to .git are detected"
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
+msgid "Enable Diff Highlighting"
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+msgid ""
+"Setting that determines whether to enable syntax highlighting in diff views."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
+msgid "When to Collapse Inactive Lanes"
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
 msgid ""
 "Setting that indicates when an inactive lane should be collapsed. Valid "
 "values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
 msgid ""
 "Setting that indicates whether to collapse history lanes which do not show "
 "activity. Enabling this can provide a cleaner history view when there is a "
@@ -69,384 +100,483 @@ msgid ""
 "lanes should be collapsed."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
 msgid "Show History in Topological Order"
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
 msgid ""
 "Setting that indicates whether to show the history in topological order."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
 msgid "Show Stashed Changes"
 msgstr "Vis lagrede endringer"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
 msgid ""
 "Setting that indicates whether to show items for the stash in the history."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
 msgid "Show Staged Changes"
 msgstr "Vis klargjorte endringer"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
 msgid ""
 "Setting that indicates whether to show a virtual item for the currently "
 "staged changes in the history."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
-#, fuzzy
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
 msgid "Show Unstaged Changes"
-msgstr "_Forkast endringer"
+msgstr "Vis endringer som ikke er klargjort for insjekking"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
 msgid ""
 "Setting that indicates whether to show a virtual item for the currently "
 "unstaged changes in the history."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:24
 msgid "Mainline Head"
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
 msgid ""
 "Setting that indicates whether to always preserve a mainline in the history "
 "for the current HEAD."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:26
+msgid "Default selection of the history activity"
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+msgid ""
+"Setting that determines the default selection on startup of the history "
+"activity."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
+msgid "Reference Sort Order"
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+msgid "The order by which references in the history sidebar should be sorted."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
+msgid "Show Upstream With Branch"
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
+msgid ""
+"Determines whether to also show the upstream (remote) tracking branch when "
+"selecting a local branch in the history view."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:32
 msgid "Show Right Margin in Commit Message View"
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
 msgid ""
 "Show a right margin indicator in the commit message view. This can be used "
 "to easily see where to break the commit message at a particular column."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
 msgid "Column at Which Right Margin is Shown"
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
 msgid ""
 "The column at which the right margin is shown if the show-right-margin "
 "preference is set to TRUE."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:24
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
 msgid "Show Subject Margin in Commit Message View"
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:37
 msgid ""
 "Highlight the subject text of the commit message when it passes the margin "
 "specified by subject-margin-position."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:26
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:38
 msgid "Column at Which Subject Margin is Shown"
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:39
 msgid ""
 "The column at which the subject margin is shown if the show-subject-margin "
 "preference is set to TRUE."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:40
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:41
 msgid ""
 "Setting which determines whether or not spell checking is enabled when "
 "writing a commit message."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:42
 msgid "Spell Checking Language"
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:43
 msgid ""
 "The language to use when spell checking is enabled for writing a commit "
 "message."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:32
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:44
 msgid "Ignore Whitespace Changes"
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:45
 msgid ""
 "Setting that indicates whether to ignore whitespace changes when showing the "
 "diff of a commit."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:46
 msgid "Show Changes Inline"
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:47
 msgid ""
 "Setting that indicates whether changes within lines should be shown inline."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:48
+msgid "Wrap"
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:49
+msgid "Wrap lines."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:50
 msgid "Number of Before/After Context Lines"
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:37
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:51
 msgid ""
 "Setting that determines how many lines of context (before and after) should "
 "be shown when showing the diff of a commit."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:38
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:52
 msgid "Rendered Width of a Tab Character"
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:39
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:53
 msgid ""
 "Setting that determines how much space a tab character should occupy when "
 "showing the diff of a commit."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:40
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:54
 msgid ""
 "Setting that determines how many lines of context (before and after) should "
 "be shown when showing the diff to be staged/unstaged in the commit area."
 msgstr ""
 
-#: ../gitg/commit/gitg-commit-dialog.vala:283
+#: ../gitg/commit/gitg-commit-dialog.vala:308
 #, c-format
 msgid "Cannot set spell checking language: %s"
+msgstr "Kan ikke sette språk for stavekontroll: %s"
+
+#: ../gitg/commit/gitg-commit-dialog.vala:508
+#: ../gitg/commit/gitg-commit.vala:1076
+msgid "There are no changes to be committed"
+msgstr "Det er ingen endringer som skal sjekkes inn"
+
+#: ../gitg/commit/gitg-commit-dialog.vala:509
+#: ../gitg/commit/gitg-commit.vala:1077
+msgid "Use amend to change the commit message of the previous commit"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:72
-#: ../gitg/preferences/gitg-preferences-commit.vala:119
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:1
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:4
+#: ../gitg/commit/gitg-commit.vala:113
+msgctxt "Activity"
 msgid "Commit"
 msgstr "Sjekk inn"
 
-#: ../gitg/commit/gitg-commit.vala:77
+#: ../gitg/commit/gitg-commit.vala:118
 msgid "Create new commits and manage the staging area"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:152
+#: ../gitg/commit/gitg-commit.vala:193
 msgid "_Stage selection"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:188
+#: ../gitg/commit/gitg-commit.vala:232
 #, c-format
 msgid "Failed to stage the removal of submodule `%s'"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:204
+#: ../gitg/commit/gitg-commit.vala:248
 #, c-format
 msgid "Failed to open the repository of submodule `%s' while trying to stage"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:218
+#: ../gitg/commit/gitg-commit.vala:262
 #, c-format
 msgid ""
 "Failed to lookup the working directory commit of submodule `%s' while trying "
 "to stage"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:231
+#: ../gitg/commit/gitg-commit.vala:275
 #, fuzzy, c-format
 msgid "Failed to stage the submodule `%s'"
 msgstr "Velg kataloger"
 
-#: ../gitg/commit/gitg-commit.vala:253
+#: ../gitg/commit/gitg-commit.vala:297
 #, c-format
 msgid "Failed to stage the removal of file `%s'"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:267
+#: ../gitg/commit/gitg-commit.vala:311
 #, c-format
 msgid "Failed to stage the file `%s'"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:536
+#: ../gitg/commit/gitg-commit.vala:583
 msgid "_Unstage selection"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:601
+#: ../gitg/commit/gitg-commit.vala:649
 #, c-format
 msgid "Failed to unstage the removal of file `%s'"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:602
+#: ../gitg/commit/gitg-commit.vala:650
 #, c-format
 msgid "Failed to unstage the file `%s'"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:609
+#: ../gitg/commit/gitg-commit.vala:657
 #, c-format
 msgid "Failed to unstage the removal of submodule `%s'"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:610
+#: ../gitg/commit/gitg-commit.vala:658
 #, fuzzy, c-format
 msgid "Failed to unstage the submodule `%s'"
 msgstr "Velg kataloger"
 
 #. Populate staged items
-#: ../gitg/commit/gitg-commit.vala:805
+#: ../gitg/commit/gitg-commit.vala:862
 msgid "Staged"
 msgstr "Klargjort"
 
-#: ../gitg/commit/gitg-commit.vala:813
-#, fuzzy
+#: ../gitg/commit/gitg-commit.vala:870
 msgid "No staged files"
-msgstr "Endrede filer"
+msgstr "Ingen klargjorte filer"
 
 #. Populate unstaged items
-#: ../gitg/commit/gitg-commit.vala:829
-#, fuzzy
+#: ../gitg/commit/gitg-commit.vala:893
 msgid "Unstaged"
-msgstr "Lastet ut"
+msgstr "Fjernet fra klargjøringsområde"
 
-#: ../gitg/commit/gitg-commit.vala:837
+#: ../gitg/commit/gitg-commit.vala:901
 #, fuzzy
 msgid "No unstaged files"
 msgstr "Endrede filer"
 
 #. Populate untracked items
-#: ../gitg/commit/gitg-commit.vala:853
+#: ../gitg/commit/gitg-commit.vala:924
 msgid "Untracked"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:857
+#: ../gitg/commit/gitg-commit.vala:928
 msgid "No untracked files"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:875
+#: ../gitg/commit/gitg-commit.vala:953
 msgid "Submodule"
-msgstr ""
+msgstr "Undermodul"
 
-#: ../gitg/commit/gitg-commit.vala:879
+#: ../gitg/commit/gitg-commit.vala:957
 msgid "No dirty submodules"
-msgstr ""
-
-#: ../gitg/commit/gitg-commit.vala:991
-msgid "There are no changes to be committed"
-msgstr ""
-
-#: ../gitg/commit/gitg-commit.vala:992
-msgid "Use amend to change the commit message of the previous commit"
-msgstr ""
+msgstr "Ingen skitne undermoduler"
 
-#: ../gitg/commit/gitg-commit.vala:1018
-#, fuzzy
+#: ../gitg/commit/gitg-commit.vala:1106
 msgid "Failed to commit"
-msgstr "Velg kataloger"
+msgstr "Klarte ikke å sjekke inn"
 
-#. TODO: better to show user info dialog directly or something
-#: ../gitg/commit/gitg-commit.vala:1034 ../gitg/commit/gitg-commit.vala:1213
+#: ../gitg/commit/gitg-commit.vala:1122
 msgid "Failed to pass pre-commit"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:1201
-msgid ""
-"Your user name and email are not configured yet. Please go to the user "
-"configuration and provide your name and email."
-msgstr ""
-
-#: ../gitg/commit/gitg-commit.vala:1205
-msgid ""
-"Your user name is not configured yet. Please go to the user configuration "
-"and provide your name."
-msgstr ""
-
-#: ../gitg/commit/gitg-commit.vala:1209
-msgid ""
-"Your email is not configured yet. Please go to the user configuration and "
-"provide your email."
-msgstr ""
-
-#: ../gitg/commit/gitg-commit.vala:1268 ../gitg/commit/gitg-commit.vala:1415
+#: ../gitg/commit/gitg-commit.vala:1330 ../gitg/commit/gitg-commit.vala:1480
 msgid "Discard changes"
 msgstr "Forkast endringer"
 
-#: ../gitg/commit/gitg-commit.vala:1269
+#: ../gitg/commit/gitg-commit.vala:1331
 msgid "Are you sure you want to permanently discard the selected changes?"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:1278 ../gitg/commit/gitg-commit.vala:1441
-#: ../gitg/gitg-commit-action-create-patch.vala:143
-#: ../gitg/gitg-window.vala:468 ../gitg/resources/ui/gitg-clone-dialog.ui.h:2
+#: ../gitg/commit/gitg-commit.vala:1340 ../gitg/commit/gitg-commit.vala:1506
+#: ../gitg/commit/gitg-commit.vala:1621
+#: ../gitg/gitg-commit-action-create-patch.vala:145
+#: ../gitg/gitg-dash-view.vala:444 ../gitg/gitg-window.vala:190
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:2
+#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2
 #: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2
 #: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:2
 #: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:2
-#: ../gitg/resources/ui/gitg-window.ui.h:5
+#: ../gitg/resources/ui/gitg-window.ui.h:9
 #: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:1
 msgid "_Cancel"
 msgstr "A_vbryt"
 
-#: ../gitg/commit/gitg-commit.vala:1279 ../gitg/commit/gitg-commit.vala:1442
+#: ../gitg/commit/gitg-commit.vala:1341 ../gitg/commit/gitg-commit.vala:1507
 msgid "Discard"
 msgstr "Forkast"
 
-#: ../gitg/commit/gitg-commit.vala:1307
-#, fuzzy
+#: ../gitg/commit/gitg-commit.vala:1370
 msgid "Failed to discard selection"
-msgstr "Velg kataloger"
+msgstr "Klarte ikke å forkaste utvalg"
 
-#: ../gitg/commit/gitg-commit.vala:1336
-#, fuzzy
+#: ../gitg/commit/gitg-commit.vala:1400
 msgid "Failed to stage selection"
-msgstr "Velg kataloger"
+msgstr "Klarte ikke å klargjøre utvalg"
 
-#: ../gitg/commit/gitg-commit.vala:1340
+#: ../gitg/commit/gitg-commit.vala:1404
+#, fuzzy
 msgid "Failed to unstage selection"
-msgstr ""
+msgstr "Klarte ikke å fjerne utvalg fra klargjøring"
 
-#: ../gitg/commit/gitg-commit.vala:1399
-#, fuzzy
+#: ../gitg/commit/gitg-commit.vala:1464
 msgid "Failed to discard changes"
-msgstr "Velg kataloger"
+msgstr "Klarte ikke å forkaste endringer"
 
-#: ../gitg/commit/gitg-commit.vala:1420
+#: ../gitg/commit/gitg-commit.vala:1485
 #, c-format
 msgid ""
 "Are you sure you want to permanently discard all changes made to the file `"
 "%s'?"
-msgstr ""
+msgstr "Er du sikker på at du vil forkaste alle endringer gjort i filen «%s» permanent?"
 
-#: ../gitg/commit/gitg-commit.vala:1431
+#: ../gitg/commit/gitg-commit.vala:1496
 #, c-format
 msgid ""
 "Are you sure you want to permanently discard all changes made to the files "
 "%s and `%s'?"
-msgstr ""
+msgstr "Er du sikker på at du vil forkaste alle endringer gjort i filene %s og «%s» permanent?"
+
+#: ../gitg/commit/gitg-commit.vala:1579
+msgid "Failed to delete files"
+msgstr "Klarte ikke å slette filer"
+
+#: ../gitg/commit/gitg-commit.vala:1595
+msgid "Delete file"
+msgid_plural "Delete files"
+msgstr[0] "Slett fil"
+msgstr[1] "Slett filer"
 
-#: ../gitg/commit/gitg-commit.vala:1475
+#: ../gitg/commit/gitg-commit.vala:1600
+#, c-format
+msgid "Are you sure you want to permanently delete the file `%s'?"
+msgstr "Er du sikker på at du vil slette filen «%s» permanent?"
+
+#: ../gitg/commit/gitg-commit.vala:1611
+#, c-format
+msgid "Are you sure you want to permanently delete the files %s and `%s'?"
+msgstr "Er du sikker på at du vil slette filene %s og «%s» permanent?"
+
+#: ../gitg/commit/gitg-commit.vala:1657
 #, fuzzy
 msgid "_Stage changes"
 msgstr "_Forkast endringer"
 
-#: ../gitg/commit/gitg-commit.vala:1485
+#: ../gitg/commit/gitg-commit.vala:1669
 #, fuzzy
 msgid "_Unstage changes"
 msgstr "_Forkast endringer"
 
-#: ../gitg/commit/gitg-commit.vala:1495
+#: ../gitg/commit/gitg-commit.vala:1681
 msgid "_Discard changes"
 msgstr "_Forkast endringer"
 
-#: ../gitg/commit/gitg-commit.vala:1518
+#: ../gitg/commit/gitg-commit.vala:1693
+msgid "D_elete file"
+msgid_plural "D_elete files"
+msgstr[0] "Sl_ett fil"
+msgstr[1] "Sl_ett filer"
+
+#: ../gitg/commit/gitg-commit.vala:1723
 msgid "_Edit file"
 msgstr "R_ediger fil"
 
+#: ../gitg/gitg-action-support.vala:95
+#, c-format, fuzzy
+msgid "Failed to stash changes: %s"
+msgstr "Velg kataloger"
+
+#: ../gitg/gitg-action-support.vala:130
+#, fuzzy
+msgid "Unstaged changes"
+msgstr "_Forkast endringer"
+
+#: ../gitg/gitg-action-support.vala:131
+msgid ""
+"You appear to have unstaged changes in your working directory. Would you "
+"like to stash the changes before the checkout?"
+msgstr ""
+
+#: ../gitg/gitg-action-support.vala:133
+#: ../gitg/gitg-commit-action-cherry-pick.vala:163
+#: ../gitg/gitg-ref-action-delete.vala:88
+#: ../gitg/gitg-ref-action-merge.vala:194
+#: ../gitg/resources/ui/gitg-remote-notification.ui.h:1
+#: ../gitg/resources/ui/gitg-simple-notification.ui.h:1
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: ../gitg/gitg-action-support.vala:134
+#, fuzzy
+msgid "Stash changes"
+msgstr "_Forkast endringer"
+
+#: ../gitg/gitg-action-support.vala:138 ../gitg/gitg-action-support.vala:165
+msgid "Failed with conflicts"
+msgstr "Feilet med konflikter"
+
+#: ../gitg/gitg-action-support.vala:181
+#, fuzzy, c-format
+msgid "Failed to checkout conflicts: %s"
+msgstr "Velg kataloger"
+
+#: ../gitg/gitg-action-support.vala:199
+msgid "Failed to obtain author details"
+msgstr ""
+
+#: ../gitg/gitg-action-support.vala:223
+#: ../gitg/gitg-ref-action-checkout.vala:88
+#, c-format
+msgid "Failed to lookup commit: %s"
+msgstr "Klarte ikke å finne innsjekking: %s"
+
+#: ../gitg/gitg-action-support.vala:255
+#, fuzzy, c-format
+msgid "Failed to create commit: %s"
+msgstr "Velg kataloger"
+
+#: ../gitg/gitg-action-support.vala:277
+#, c-format
+msgid "Failed to checkout index: %s"
+msgstr "Klarte ikke å sjekke ut indeks: %s"
+
 #: ../gitg/gitg-application.vala:56
 msgid "Show the application's version"
 msgstr "Vis versjon for programmet"
@@ -463,77 +593,166 @@ msgstr ""
 msgid "Do not try to load a repository from the current working directory"
 msgstr ""
 
-#: ../gitg/gitg-application.vala:90
+#: ../gitg/gitg-application.vala:94
 msgid "- Git repository viewer"
 msgstr "- Git utforsker"
 
-#: ../gitg/gitg-application.vala:209
-#, fuzzy
+#: ../gitg/gitg-application.vala:222
 msgid "gitg is a Git repository viewer for gtk+/GNOME"
-msgstr "Ekste_rnt lager"
+msgstr "gitg er et program for å vise Git-lager for gtk+/GNOME"
 
-#: ../gitg/gitg-application.vala:218
+#: ../gitg/gitg-application.vala:231
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas gnome org>"
 
-#: ../gitg/gitg-application.vala:221
+#: ../gitg/gitg-application.vala:234
 msgid "gitg homepage"
+msgstr "gitg hjemmeside"
+
+#: ../gitg/gitg-application.vala:364
+msgid ""
+"We are terribly sorry, but gitg requires libgit2 (a library on which gitg "
+"depends) to be compiled with threading support.\n"
+"\n"
+"If you manually compiled libgit2, then please configure libgit2 with -"
+"DTHREADSAFE:BOOL=ON.\n"
+"\n"
+"Otherwise, report a bug in your distributions' bug reporting system for "
+"providing libgit2 without threading support."
+msgstr ""
+
+#. ex: ts=4 noet
+#: ../gitg/gitg-author-details-dialog.vala:97
+#: ../gitg/gitg-author-details-dialog.vala:117
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1
+msgid "Author Details"
+msgstr "Detaljer om forfatter"
+
+#: ../gitg/gitg-author-details-dialog.vala:98
+msgid "Enter default details used for all repositories:"
 msgstr ""
 
-#: ../gitg/gitg-author-details-dialog.vala:67
-msgid "Unable to open the .gitconfig file."
+#. Translators: %s is the repository name
+#: ../gitg/gitg-author-details-dialog.vala:120
+#, c-format
+msgid "Override global details for repository '%s':"
 msgstr ""
 
-#: ../gitg/gitg-author-details-dialog.vala:148
+#: ../gitg/gitg-author-details-dialog.vala:232
 #, fuzzy
 msgid "Failed to set Git user config."
 msgstr "Velg kataloger"
 
-#: ../gitg/gitg-clone-dialog.vala:87
+#: ../gitg/gitg-clone-dialog.vala:89
 msgid "The URL introduced is not supported"
 msgstr ""
 
+#: ../gitg/gitg-commit-action-cherry-pick.vala:53
+msgid "Cherry pick onto"
+msgstr ""
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:58
+msgid "Cherry pick this commit onto a branch"
+msgstr ""
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:117
+#, fuzzy, c-format
+msgid "Failed to lookup the commit for branch %s: %s"
+msgstr "Velg kataloger"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:132
+#, fuzzy, c-format
+msgid "Failed to cherry-pick the commit: %s"
+msgstr "Velg kataloger"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:144
+#: ../gitg/gitg-commit-action-cherry-pick.vala:160
+msgid "Cherry pick has conflicts"
+msgstr ""
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:153
+#, c-format
+msgid ""
+"The cherry pick of %s onto %s has caused conflicts, would you like to "
+"checkout branch %s with the cherry pick to your working directory to resolve "
+"the conflicts?"
+msgstr ""
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:157
+#, c-format
+msgid ""
+"The cherry-pick of %s onto %s has caused conflicts, would you like to "
+"checkout the cherry pick to your working directory to resolve the conflicts?"
+msgstr ""
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:164
+#: ../gitg/gitg-ref-action-checkout.vala:48
+#: ../gitg/gitg-ref-action-merge.vala:195
+msgid "Checkout"
+msgstr "Sjekk ut"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:168
+msgid "Cherry pick failed with conflicts"
+msgstr ""
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:179
+msgid "Cherry pick finished with conflicts in working directory"
+msgstr ""
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:199
+#, c-format
+msgid "Cherry pick %s onto %s"
+msgstr ""
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:224
+msgid "Successfully cherry picked"
+msgstr ""
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:261
+#, c-format
+msgid "Cherry pick onto %s"
+msgstr ""
+
 #: ../gitg/gitg-commit-action-create-branch.vala:48
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
-msgid "Create Branch"
+#, fuzzy
+msgid "Create branch"
 msgstr "Lag gren"
 
 #: ../gitg/gitg-commit-action-create-branch.vala:53
 msgid "Create a new branch at the selected commit"
 msgstr ""
 
-#: ../gitg/gitg-commit-action-create-branch.vala:85
+#: ../gitg/gitg-commit-action-create-branch.vala:75
 msgid "Failed to create branch"
 msgstr "Klarte ikke å lage gren"
 
 #: ../gitg/gitg-commit-action-create-patch.vala:63
 #, fuzzy
-msgid "Create Patch"
+msgid "Create patch"
 msgstr "Opprett"
 
 #: ../gitg/gitg-commit-action-create-patch.vala:68
 msgid "Create a patch from the selected commit"
 msgstr ""
 
-#: ../gitg/gitg-commit-action-create-patch.vala:141
+#: ../gitg/gitg-commit-action-create-patch.vala:143
 #, fuzzy
 msgid "Save Patch File"
 msgstr "Lagre alle filer"
 
-#: ../gitg/gitg-commit-action-create-patch.vala:145
+#: ../gitg/gitg-commit-action-create-patch.vala:147
 #, fuzzy
 msgid "_Save Patch"
-msgstr "Lagre alle filer"
+msgstr "_Lagre endringsfil"
 
-#: ../gitg/gitg-commit-action-create-patch.vala:168
+#: ../gitg/gitg-commit-action-create-patch.vala:172
 #, fuzzy
 msgid "Failed to create patch"
 msgstr "Velg kataloger"
 
 #: ../gitg/gitg-commit-action-create-tag.vala:48
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:1
 #, fuzzy
-msgid "Create Tag"
+msgid "Create tag"
 msgstr "Opprett"
 
 #: ../gitg/gitg-commit-action-create-tag.vala:53
@@ -554,9 +773,83 @@ msgstr "Velg kataloger"
 msgid "Provide a message to create an annotated tag"
 msgstr ""
 
-#: ../gitg/gitg-dash-view.vala:148
-msgid "_Delete"
-msgstr "_Slett"
+#: ../gitg/gitg-dash-view.vala:87
+msgid "Select and manage projects"
+msgstr "Velg og håndter prosjekter"
+
+#: ../gitg/gitg-dash-view.vala:176
+msgid "_Remove"
+msgstr "Fje_rn"
+
+#. Translators: the two %s will be replaced to create a link to perform the scanning action.
+#: ../gitg/gitg-dash-view.vala:232
+#, c-format
+msgid "We can also %sscan your home directory%s for git repositories."
+msgstr ""
+
+#. Translators: the two %s will be used to create a link to the author dialog.
+#: ../gitg/gitg-dash-view.vala:235
+#, c-format
+msgid "In the mean time, you may want to %sset up your git profile%s."
+msgstr ""
+
+#: ../gitg/gitg-dash-view.vala:389
+msgid "Failed to clone repository"
+msgstr "Klarte ikke å klone lager"
+
+#: ../gitg/gitg-dash-view.vala:420
+msgid "Failed to add repository"
+msgstr "Klarte ikke å legge til lager"
+
+#: ../gitg/gitg-dash-view.vala:436
+msgid "Create new repository"
+msgstr "Lag nytt lager"
+
+#. Translators: %s is a file name
+#: ../gitg/gitg-dash-view.vala:439
+#, c-format
+msgid ""
+"The location <i>%s</i> does not appear to be a valid git repository. Would "
+"you like to initialize a new git repository at this location?"
+msgstr ""
+
+#: ../gitg/gitg-dash-view.vala:445
+msgid "Create repository"
+msgstr "Lag lager"
+
+#: ../gitg/gitg-dash-view.vala:461
+#, fuzzy
+msgid "Failed to create repository"
+msgstr "Velg kataloger"
+
+#: ../gitg/gitg-dash-view.vala:531
+#, c-format
+msgid "Scanning for repositories in %s"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-checkout.vala:53
+#, fuzzy
+msgid "Checkout the selected reference"
+msgstr "Slett valgt referanse"
+
+#: ../gitg/gitg-ref-action-checkout.vala:72
+#, c-format
+msgid "Checkout %s"
+msgstr "Sjekk ut %s"
+
+#: ../gitg/gitg-ref-action-checkout.vala:101
+#, fuzzy, c-format
+msgid "Failed to checkout branch: %s"
+msgstr "Velg kataloger"
+
+#: ../gitg/gitg-ref-action-checkout.vala:111
+#, fuzzy, c-format
+msgid "Failed to update HEAD: %s"
+msgstr "Klarte ikke å slette merking %s"
+
+#: ../gitg/gitg-ref-action-checkout.vala:121
+msgid "Successfully checked out branch to working directory"
+msgstr ""
 
 #: ../gitg/gitg-ref-action-copy-name.vala:48
 msgid "Copy name"
@@ -567,7 +860,7 @@ msgid "Copy the name of the reference to the clipboard"
 msgstr ""
 
 #: ../gitg/gitg-ref-action-delete.vala:48
-#: ../gitg/gitg-ref-action-delete.vala:88
+#: ../gitg/gitg-ref-action-delete.vala:89
 msgid "Delete"
 msgstr "Slett"
 
@@ -605,12 +898,6 @@ msgstr "Slett ekstern gren %s"
 msgid "Are you sure that you want to permanently delete the remote branch %s?"
 msgstr ""
 
-#: ../gitg/gitg-ref-action-delete.vala:89
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:9
-#: ../libgitg/resources/ui/gitg-remote-notification.ui.h:1
-msgid "Cancel"
-msgstr "Avbryt"
-
 #. Translators: %s is the name of the tag
 #: ../gitg/gitg-ref-action-delete.vala:119
 #, c-format
@@ -625,57 +912,130 @@ msgstr ""
 
 #. Translators: %s is the name of the branch
 #: ../gitg/gitg-ref-action-delete.vala:127
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to delete branch %s"
-msgstr "Velg kataloger"
+msgstr "Klarte ikke å slette gren %s"
 
 #. Translators: the first %s is the name of the branch, the second is an error message
 #: ../gitg/gitg-ref-action-delete.vala:130
 #, c-format
 msgid "The branch %s could not be deleted: %s"
-msgstr ""
+msgstr "Gren %s kunne ikke slettes: %s"
 
 #: ../gitg/gitg-ref-action-fetch.vala:74
 #, c-format
 msgid "Fetch from %s"
-msgstr ""
+msgstr "Hent fra %s"
 
 #: ../gitg/gitg-ref-action-fetch.vala:85
 #, c-format
 msgid "Fetch remote objects from %s"
-msgstr ""
+msgstr "Hent eksterne objekter fra %s"
 
-#: ../gitg/gitg-ref-action-fetch.vala:110
+#: ../gitg/gitg-ref-action-fetch.vala:98
 #, c-format
 msgid "Fetching from %s"
-msgstr ""
+msgstr "Henter fra %s"
 
 #. Translators: new refers to a new remote reference having been fetched,
-#: ../gitg/gitg-ref-action-fetch.vala:118
+#: ../gitg/gitg-ref-action-fetch.vala:106
 msgid "new"
-msgstr ""
+msgstr "ny"
 
 #. Translators: updated refers to a remote reference having been updated,
-#: ../gitg/gitg-ref-action-fetch.vala:123
+#: ../gitg/gitg-ref-action-fetch.vala:111
 msgid "updated"
-msgstr ""
+msgstr "oppdatert"
 
-#: ../gitg/gitg-ref-action-fetch.vala:134
-#, fuzzy, c-format
+#: ../gitg/gitg-ref-action-fetch.vala:121
+#, c-format
 msgid "Failed to fetch from %s: %s"
-msgstr "Velg kataloger"
+msgstr "Klarte ikke å hente fra %s: %s"
 
 #. Translators: the %s will get replaced with the remote url,
-#: ../gitg/gitg-ref-action-fetch.vala:146
+#: ../gitg/gitg-ref-action-fetch.vala:134
 #, c-format
 msgid "Fetched from %s: everything is up to date"
-msgstr ""
+msgstr "Hentet fra %s: alt er oppdatert"
 
 #. Translators: the first %s is the remote url to fetch from,
 #. * the second is a list of references that got updated.
-#: ../gitg/gitg-ref-action-fetch.vala:152
+#: ../gitg/gitg-ref-action-fetch.vala:140
 #, c-format
 msgid "Fetched from %s: %s"
+msgstr "Hentet fra %s: %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:63
+#, c-format
+msgid "Merge into %s"
+msgstr "Flett inn i %s"
+
+#. TODO
+#: ../gitg/gitg-ref-action-merge.vala:69
+#, c-format
+msgid "Merge another branch into branch %s"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:106
+#, fuzzy, c-format
+msgid "Failed to merge commits: %s"
+msgstr "Velg kataloger"
+
+#: ../gitg/gitg-ref-action-merge.vala:175
+#: ../gitg/gitg-ref-action-merge.vala:191
+msgid "Merge has conflicts"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:184
+#, c-format
+msgid ""
+"The merge of %s into %s has caused conflicts, would you like to checkout "
+"branch %s with the merge to your working directory to resolve the conflicts?"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:188
+#, c-format
+msgid ""
+"The merge of %s into %s has caused conflicts, would you like to checkout the "
+"merge to your working directory to resolve the conflicts?"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:199
+msgid "Merge failed with conflicts"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:210
+msgid "Finished merge with conflicts in working directory"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:222
+#, c-format
+msgid "Merge %s into %s"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:231
+#, fuzzy, c-format
+msgid "Failed to lookup our commit: %s"
+msgstr "Velg kataloger"
+
+#: ../gitg/gitg-ref-action-merge.vala:241
+#, fuzzy, c-format
+msgid "Failed to lookup their commit: %s"
+msgstr "Velg kataloger"
+
+#: ../gitg/gitg-ref-action-merge.vala:278
+#, c-format
+msgid "Successfully merged %s into %s"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:320
+#, fuzzy, c-format
+msgid "Merge %s into branch %s"
+msgstr "Slett gren %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:482
+#: ../gitg/history/gitg-history-refs-list.vala:1176
+msgid "Tags"
 msgstr ""
 
 #: ../gitg/gitg-ref-action-rename.vala:48
@@ -684,7 +1044,7 @@ msgstr "Endre navn"
 
 #: ../gitg/gitg-ref-action-rename.vala:53
 msgid "Rename the selected reference"
-msgstr ""
+msgstr "Endre navn på valgt referanse"
 
 #: ../gitg/gitg-ref-action-rename.vala:100
 #, c-format
@@ -695,76 +1055,145 @@ msgstr ""
 msgid "Invalid name"
 msgstr "Ugyldig navn"
 
-#: ../gitg/gitg-ref-action-rename.vala:141
-#, fuzzy
+#: ../gitg/gitg-ref-action-rename.vala:131
 msgid "Failed to rename"
-msgstr "Velg kataloger"
+msgstr "Klarte ikke å endre navn"
 
-#: ../gitg/gitg.vala:64
-msgid ""
-"We are terribly sorry, but gitg requires libgit2 (a library on which gitg "
-"depends) to be compiled with threading support.\n"
-"\n"
-"If you manually compiled libgit2, then please configure libgit2 with -"
-"DTHREADSAFE:BOOL=ON.\n"
-"\n"
-"Otherwise, report a bug in your distributions' bug reporting system for "
-"providing libgit2 without threading support."
+#: ../gitg/gitg-remote-notification.vala:90
+#: ../gitg/gitg-simple-notification.vala:99
+#: ../gitg/resources/ui/gitg-window.ui.h:10
+msgid "Close"
+msgstr "Lukk"
+
+#: ../gitg/gitg-window.vala:187
+msgid "Add Repository"
+msgstr "Legg til lager"
+
+#: ../gitg/gitg-window.vala:191
+msgid "_Add"
+msgstr "_Legg til"
+
+#: ../gitg/gitg-window.vala:193
+msgid "_Scan for all git repositories from this directory"
 msgstr ""
 
-#: ../gitg/gitg-window.vala:403
+#: ../gitg/gitg-window.vala:501
 msgid "Projects"
 msgstr "Prosjekter"
 
-#: ../gitg/gitg-window.vala:466
-#, fuzzy
-msgid "Open Repository"
-msgstr "Ekste_rnt lager"
-
-#: ../gitg/gitg-window.vala:469
-msgid "_Open"
-msgstr "_Åpne"
+#: ../gitg/gitg-window.vala:751
+msgid "Select items"
+msgstr ""
 
-#: ../gitg/gitg-window.vala:764
-#, fuzzy, c-format
+#: ../gitg/gitg-window.vala:958
+#, c-format
 msgid "'%s' is not a Git repository."
-msgstr "Velg katalog"
+msgstr "«%s» er ikke et Git-lager."
 
-#: ../gitg/history/gitg-history-refs-list.vala:136
-msgid "All commits"
+#: ../gitg/gitg-window.vala:1107
+msgid ""
+"Your user name and email are not configured yet. Please go to the user "
+"configuration and provide your name and email."
+msgstr ""
+
+#: ../gitg/gitg-window.vala:1111
+msgid ""
+"Your user name is not configured yet. Please go to the user configuration "
+"and provide your name."
+msgstr ""
+
+#: ../gitg/gitg-window.vala:1115
+msgid ""
+"Your email is not configured yet. Please go to the user configuration and "
+"provide your email."
+msgstr ""
+
+#: ../gitg/gitg-window.vala:1118
+msgid "Missing author details"
+msgstr "Mangler detaljer om forfatter"
+
+#: ../gitg/history/gitg-history-command-line.vala:42
+msgid "Select all commits by default in the history activity"
+msgstr ""
+
+#: ../gitg/history/gitg-history-command-line.vala:44
+msgid "Select all branches by default in the history activity"
+msgstr ""
+
+#: ../gitg/history/gitg-history-command-line.vala:46
+msgid "Select all remotes by default in the history activity"
 msgstr ""
 
-#: ../gitg/history/gitg-history-refs-list.vala:835
+#: ../gitg/history/gitg-history-command-line.vala:48
+msgid "Select all tags by default in the history activity"
+msgstr ""
+
+#: ../gitg/history/gitg-history-command-line.vala:50
+msgid "Select the specified reference by default in the history activity"
+msgstr ""
+
+#: ../gitg/history/gitg-history-command-line.vala:50
+msgid "REFERENCE"
+msgstr "REFERANSE"
+
+#: ../gitg/history/gitg-history-refs-list.vala:165
+#, c-format
+msgid "%zu ahead, %zu behind"
+msgstr "%zu foran, %zu etter"
+
+#: ../gitg/history/gitg-history-refs-list.vala:169
+#, c-format
+msgid "%zu ahead"
+msgstr "%zu foran"
+
+#: ../gitg/history/gitg-history-refs-list.vala:173
+#, c-format
+msgid "%zu behind"
+msgstr "%zu etter"
+
+#: ../gitg/history/gitg-history-refs-list.vala:207
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
+msgid "All commits"
+msgstr "Alle innsjekkinger"
+
+#: ../gitg/history/gitg-history-refs-list.vala:1174
 msgid "Branches"
 msgstr "Grener"
 
-#: ../gitg/history/gitg-history-refs-list.vala:836
-#, fuzzy
+#: ../gitg/history/gitg-history-refs-list.vala:1175
 msgid "Remotes"
-msgstr "Ekstern"
+msgstr "Eksterne"
 
-#: ../gitg/history/gitg-history-refs-list.vala:837
-msgid "Tags"
-msgstr ""
-
-#: ../gitg/history/gitg-history.vala:246
-#: ../gitg/preferences/gitg-preferences-history.vala:128
+#: ../gitg/history/gitg-history.vala:342
+#: ../gitg/preferences/gitg-preferences-history.vala:218
 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:3
 msgid "History"
 msgstr "Historikk"
 
-#: ../gitg/history/gitg-history.vala:251
+#: ../gitg/history/gitg-history.vala:347
 msgid "Examine the history of the repository"
 msgstr ""
 
-#: ../gitg/history/gitg-history.vala:602
+#: ../gitg/history/gitg-history.vala:843
 msgid "Mainline"
 msgstr ""
 
-#: ../gitg/preferences/gitg-preferences-interface.vala:96
+#: ../gitg/preferences/gitg-preferences-commit.vala:119
+msgctxt "Preferences"
+msgid "Commit"
+msgstr "Sjekk inn"
+
+#: ../gitg/preferences/gitg-preferences-interface.vala:120
 msgid "Interface"
 msgstr "Grensesnitt"
 
+#. Translators: %s will be replaced with a URL indicating the resource
+#. for which the authentication is required.
+#: ../libgitg/gitg-authentication-dialog.vala:69
+#, c-format
+msgid "Password required for %s"
+msgstr "Passord kreves for %s"
+
 #: ../libgitg/gitg-date.vala:346
 msgid "Now"
 msgstr "Nå"
@@ -799,71 +1228,110 @@ msgstr[1] "%d dager siden"
 #. clock.
 #: ../libgitg/gitg-date.vala:374
 msgid "%b %e, %H:%M"
-msgstr ""
+msgstr "%e %b, %H.%M"
 
 #. Translators: this is a strftime type date format which is
 #. used when the date is in the current year and uses a 12 hour
 #. clock.
 #: ../libgitg/gitg-date.vala:381
 msgid "%b %e, %I:%M %p"
-msgstr ""
+msgstr "%e %b, %H.%M"
 
 #. Translators: this is a strftime type date format which is
 #. used when the date is not in the current year and uses a 24
 #. hour clock.
 #: ../libgitg/gitg-date.vala:391
 msgid "%b %e %Y, %H:%M"
-msgstr ""
+msgstr "%e %b %Y, %H.%M"
 
 #. Translators: this is a strftime type date format which is
 #. used when the date is not in the current year and uses a 12
 #. hour clock.
 #: ../libgitg/gitg-date.vala:398
 msgid "%b %e %Y, %I:%M %p"
-msgstr ""
+msgstr "%e %b %Y, %H.%M"
 
-#: ../libgitg/gitg-diff-view.vala:246
-#, fuzzy
-msgid "stage"
-msgstr "Lastet ut"
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: ../libgitg/gitg-diff-image-side-by-side.vala:39
+#, c-format
+msgid "before (%s)"
+msgstr "før (%s)"
 
-#: ../libgitg/gitg-diff-view.vala:247
-#, fuzzy
-msgid "unstage"
-msgstr "Lastet ut"
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: ../libgitg/gitg-diff-image-side-by-side.vala:45
+#, c-format
+msgid "removed (%s)"
+msgstr "fjernet (%s)"
+
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: ../libgitg/gitg-diff-image-side-by-side.vala:67
+#, c-format
+msgid "after (%s)"
+msgstr "etter (%s)"
+
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: ../libgitg/gitg-diff-image-side-by-side.vala:73
+#, c-format
+msgid "added (%s)"
+msgstr "lagt til (%s)"
+
+#: ../libgitg/gitg-diff-view-commit-details.vala:145
+msgid "Collapse all"
+msgstr "Slå sammen alle"
+
+#: ../libgitg/gitg-diff-view-commit-details.vala:149
+#: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:2
+msgid "Expand all"
+msgstr "Utvid alle"
+
+#: ../libgitg/gitg-diff-view-commit-details.vala:202
+#, fuzzy, c-format
+msgid "Committed by %s"
+msgstr "Sjekk inn"
+
+#: ../libgitg/gitg-diff-view-file.vala:177
+msgid "_Open file"
+msgstr "_Åpne fil"
 
-#: ../libgitg/gitg-diff-view.vala:248
-msgid "Loading diff…"
+#: ../libgitg/gitg-diff-view-file.vala:209
+msgid "Open containing _folder"
 msgstr ""
 
-#: ../libgitg/gitg-diff-view.vala:249
-msgid "Notes:"
-msgstr "Notater:"
+#: ../libgitg/gitg-diff-view-file.vala:229
+msgid "_Copy file path"
+msgstr ""
 
-#: ../libgitg/gitg-diff-view.vala:250
-msgid "Parents:"
+#. Translators: this is used to construct: "at <directory>", to indicate where the repository is at.
+#: ../libgitg/gitg-repository-list-box.vala:154
+#, c-format
+msgid "at %s"
 msgstr ""
 
-#: ../libgitg/gitg-diff-view.vala:251
-msgid "Diff against:"
+#. Translators: this is used to construct: "<branch-name> at <directory>"
+#: ../libgitg/gitg-repository-list-box.vala:163
+#, c-format
+msgid "%s at %s"
 msgstr ""
 
-#: ../libgitg/gitg-remote-notification.vala:72
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:6
-#: ../gitg/resources/ui/gitg-window.ui.h:6
-msgid "Close"
-msgstr "Lukk"
+#: ../libgitg/gitg-repository-list-box.vala:541
+msgid "Cloning…"
+msgstr ""
 
 #: ../libgitg/gitg-stage.vala:334
 #, c-format
 msgid "Could not read commit message after running commit-msg hook: %s"
 msgstr ""
 
-#: ../plugins/diff/gitg-diff.vala:106
+#: ../plugins/diff/gitg-diff.vala:115
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:11
 msgid "Diff"
 msgstr ""
 
-#: ../plugins/diff/gitg-diff.vala:111
+#: ../plugins/diff/gitg-diff.vala:120
 msgid "Show the changes introduced by the selected commit"
 msgstr ""
 
@@ -875,36 +1343,21 @@ msgstr "Filer"
 msgid "Show the files in the tree of the selected commit"
 msgstr ""
 
-#. ex: ts=4 noet
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1
-msgid "Author Details"
-msgstr "Detaljer om forfatter"
-
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:3
-#, no-c-format
-msgid "Note: The Git config file '%s' does not exist."
-msgstr ""
+msgid "_Save"
+msgstr "_Lagre"
 
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:4
-msgid "Enter details to set as default for all repositories:"
-msgstr ""
-
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
-#, no-c-format
-msgid "Enter details for repository '%s':"
+msgid "Default details used for all repositories"
 msgstr ""
 
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:7
-msgid "E-mail: "
-msgstr "E-post: "
-
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:8
-msgid "Name: "
-msgstr "Navn: "
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:5
+msgid "E-mail:"
+msgstr "E-post:"
 
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:10
-msgid "Save"
-msgstr "Lagre"
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
+msgid "Name:"
+msgstr "Navn:"
 
 #: ../gitg/resources/ui/gitg-clone-dialog.ui.h:1
 #, fuzzy
@@ -931,6 +1384,11 @@ msgstr "Velg lokasjon …"
 msgid "Bare repository"
 msgstr "Kun lager"
 
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:1
+msgctxt "Create Dialog"
+msgid "Commit"
+msgstr "Sjekk inn"
+
 #: ../gitg/resources/ui/gitg-commit-dialog.ui.h:3
 #: ../gitg/resources/ui/gitg-commit-paned.ui.h:2
 msgid "C_ommit"
@@ -992,6 +1450,10 @@ msgstr "Dato"
 msgid "Open"
 msgstr "Åpne"
 
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
+msgid "Create Branch"
+msgstr "Lag gren"
+
 #: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:3
 #: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:3
 msgid "C_reate"
@@ -1001,49 +1463,49 @@ msgstr "_Lag"
 msgid "Branch _name:"
 msgstr "_Navn på gren:"
 
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:1
+#, fuzzy
+msgid "Create Tag"
+msgstr "Opprett"
+
 #: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:4
 #, fuzzy
 msgid "Tag _name:"
 msgstr "Navn på mål:"
 
+#: ../gitg/resources/ui/gitg-dash-view.ui.h:1
+msgid ""
+"No repositories have been added yet. To get started, you can add an existing "
+"repository or clone a new one."
+msgstr ""
+
 #: ../gitg/resources/ui/gitg-menus.ui.h:1
 msgid "_New Window"
 msgstr "_Nytt vindu"
 
 #: ../gitg/resources/ui/gitg-menus.ui.h:2
-msgid "_Preferences"
-msgstr "_Brukervalg"
+msgid "_Author Details"
+msgstr "_Detaljer om forfatter"
 
 #: ../gitg/resources/ui/gitg-menus.ui.h:3
-msgid "_Help"
-msgstr "_Hjelp"
+msgid "_Preferences"
+msgstr "_Brukervalg"
 
 #: ../gitg/resources/ui/gitg-menus.ui.h:4
+msgid "_Keyboard Shortcuts"
+msgstr "Tastat_ursnarveier"
+
+#: ../gitg/resources/ui/gitg-menus.ui.h:5
 msgid "_About"
 msgstr "_Om"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:5
+#: ../gitg/resources/ui/gitg-menus.ui.h:6
 msgid "_Quit"
 msgstr "A_vslutt"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:6
-#, fuzzy
-msgid "_Open Repository…"
-msgstr "Ekste_rnt lager"
-
 #: ../gitg/resources/ui/gitg-menus.ui.h:7
-#, fuzzy
-msgid "_Clone Repository…"
-msgstr "_Historikk"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:8
-#, fuzzy
-msgid "_Author Details"
-msgstr "_Detaljer"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:9
 msgid "_Reload"
-msgstr ""
+msgstr "_Last på nytt"
 
 #: ../gitg/resources/ui/gitg-preferences-commit.ui.h:1
 msgid "Show markup"
@@ -1062,32 +1524,54 @@ msgid "Enable spell checking"
 msgstr "Slå på stavekontroll"
 
 #: ../gitg/resources/ui/gitg-preferences-commit.ui.h:5
-#, fuzzy
 msgid "Commit Message"
-msgstr "Sjekk inn endringer"
+msgstr "Innsjekkingsmelding"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:1
-#, fuzzy
-msgid "Commits"
-msgstr "Sjekk inn"
+msgid "Default selection"
+msgstr "Forvalgt utvalg"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
+msgid "Current branch"
+msgstr "Aktiv gren"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+msgid "All branches"
+msgstr "Alle grener"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
+msgid "References"
+msgstr "Referanser"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:6
+msgid "Sort references in the sidebar by latest activity"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:7
+msgid "Show upstream (remote) branch when selecting a local branch"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:8
+msgid "Commits"
+msgstr "Innsjekkinger"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:9
 msgid "Collapse inactive lanes"
 msgstr ""
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:10
 msgid "Early"
 msgstr "Tidlig"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:11
 msgid "Late"
 msgstr "Sent"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:12
 msgid "Show history in topological order"
-msgstr ""
+msgstr "Vis historikk i topologisk rekkefølge"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:6
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:13
 msgid "Preserve mainline for currently checked out branch"
 msgstr ""
 
@@ -1097,7 +1581,11 @@ msgstr ""
 
 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:2
 msgid "Start with activity:"
-msgstr ""
+msgstr "Start med aktivitet:"
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:4
+msgid "Commit"
+msgstr "Sjekk inn"
 
 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:5
 msgid "Layout"
@@ -1107,42 +1595,94 @@ msgstr "Utforming"
 msgid "Use horizontal layout"
 msgstr "Bruk horisontal utforming"
 
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:7
+msgid "Avatars"
+msgstr "Avatarer"
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:8
+msgid "Use gravatar service to provide user avatars"
+msgstr "Bruk gravatar-tjenesten for å gi brukere avatarer"
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:9
+msgid "Monitoring"
+msgstr "Overvåking"
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:12
+msgid "Enable syntax highlighting of source code in diff views"
+msgstr "Slå på syntaksutheving av kildekoden i forskjellsvisninger"
+
 #: ../gitg/resources/ui/gitg-preferences.ui.h:1
 msgid "Preferences"
 msgstr "Brukervalg"
 
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "Windows"
+msgstr "Vinduer"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:2
+msgctxt "shortcut window"
+msgid "Open a new window"
+msgstr "Åpne et nytt vindu"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:3
+msgctxt "shortcut window"
+msgid "Open the window menu"
+msgstr "Åpne vindusmenyen"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:4
+msgctxt "shortcut window"
+msgid "Open a repository"
+msgstr "Åpne et lager"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:5
+msgctxt "shortcut window"
+msgid "Open the help"
+msgstr "Åpne hjelp"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:6
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "Finn"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:7
+msgctxt "shortcut window"
+msgid "Close the active window"
+msgstr "Lukk det aktive vinduet"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:8
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr "Avslutt programmet"
+
 #: ../gitg/resources/ui/gitg-window.ui.h:2
 msgid "Show the list of recently used repositories"
 msgstr "Vis liste med nylig brukte lagre"
 
 #: ../gitg/resources/ui/gitg-window.ui.h:3
-msgid "Find a word or phrase"
-msgstr "Finn et ord eller en frase"
+msgid "Clone"
+msgstr "Klon"
 
 #: ../gitg/resources/ui/gitg-window.ui.h:4
-msgid "General settings and options"
-msgstr "Generelle innstillinger og valg"
-
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:1
-msgid "Ignore whitespace changes"
+msgid "Clone repository"
 msgstr ""
 
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:2
-#, fuzzy
-msgid "Show changes inline"
-msgstr "Gå tilbake i angrehistorikken"
+#: ../gitg/resources/ui/gitg-window.ui.h:5
+msgid "Add"
+msgstr "Legg til"
 
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:3
-msgid "Developer tools"
-msgstr "Utviklerverktøy"
+#: ../gitg/resources/ui/gitg-window.ui.h:6
+#, fuzzy
+msgid "Add repository"
+msgstr "Kun lager"
 
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:4
-msgid "Tab width"
-msgstr ""
+#: ../gitg/resources/ui/gitg-window.ui.h:7
+msgid "Find a word or phrase"
+msgstr "Finn et ord eller en frase"
 
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:5
-msgid "Context"
-msgstr "Kontekst"
+#: ../gitg/resources/ui/gitg-window.ui.h:8
+msgid "General settings and options"
+msgstr "Generelle innstillinger og valg"
 
 #: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:2
 msgid "_Authenticate"
@@ -1174,12 +1714,52 @@ msgstr "Husk passord til du _logger ut"
 msgid "Remember _forever"
 msgstr "Husk _for alltid"
 
+#: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:1
+msgid "Parents"
+msgstr "Opphav"
+
+#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-binary.ui.h:1
+msgid "Unable to display changes for binary file"
+msgstr ""
+
+#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:1
+msgid "Side by side"
+msgstr "Side ved side"
+
+#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:2
+msgid "Slider"
+msgstr ""
+
+#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:3
+msgid "Overlay"
+msgstr ""
+
+#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:4
+msgid "Difference"
+msgstr "Forskjell"
+
+#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1
+msgid "Tab width:"
+msgstr ""
+
+#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:2
+msgid "Wrap lines:"
+msgstr ""
+
+#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:3
+msgid "Ignore whitespace:"
+msgstr ""
+
+#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:1
+msgid "Context:"
+msgstr "Kontekst:"
+
+#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:2
+msgid "Spacing"
+msgstr "Mellomrom"
+
 #: ../libgitg/resources/ui/gitg-repository-list-box-row.ui.h:1
 msgid ""
 "Remove the repository from the list (does not delete the repository from "
 "disk)"
 msgstr ""
-
-#: ../plugins/files/resources/view-files.ui.h:1
-msgid "column"
-msgstr "kolonne"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]