{"thread":{"id":"49944","subject":"git-gui: Norwegian Bokmål translation","startedAt":"2018-12-04T09:35:32Z","lastAt":"2018-12-04T09:35:32Z","messageCount":1,"participants":["Petter Reinholdtsen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"364542","messageId":"sa68t15abcq.fsf@meta.reinholdtsen.name","threadId":"49944","inReplyTo":null,"subject":"git-gui: Norwegian Bokmål translation","fromName":"Petter Reinholdtsen","fromEmail":"pere@hungry.com","sentAt":"2018-12-04T09:29:41Z","receivedAt":"2018-12-04T09:35:32Z","isPatch":false,"sender":{"key":"pere@hungry.com","avatar":null},"body":"\nFrom 9a7edd7f94b82335177917463cb334541b4d2cb0 Mon Sep 17 00:00:00 2001\nFrom: Petter Reinholdtsen <pere@hungry.com>\nDate: Mon, 3 Dec 2018 12:24:22 +0100\nSubject: [PATCH] i18n: Update the nb translation of git-gui and start on\n glossary list.\n\nSigned-off-by: Petter Reinholdtsen <pere@hungry.com>\n---\n po/glossary/nb.po | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++\n po/nb.po          |  57 ++++++++++++------\n 2 files changed, 210 insertions(+), 18 deletions(-)\n create mode 100644 po/glossary/nb.po\n\ndiff --git a/po/glossary/nb.po b/po/glossary/nb.po\nnew file mode 100644\nindex 0000000..1a80451\n--- /dev/null\n+++ b/po/glossary/nb.po\n@@ -0,0 +1,171 @@\n+# Copyright (C) 2018 Free Software Foundation, Inc.\n+#\n+# Petter Reinholdtsen <pere@hungry.com>, 2018.\n+msgid \"\"\n+msgstr \"\"\n+\"Project-Id-Version: \\n\"\n+\"POT-Creation-Date: 2008-01-07 21:20+0100\\n\"\n+\"PO-Revision-Date: 2018-12-03 12:35+0100\\n\"\n+\"Last-Translator: Petter Reinholdtsen <pere@hungry.com>\\n\"\n+\"Language-Team: NorwegianBokmal <i18n-no@lister.ping.uio.no>\\n\"\n+\"MIME-Version: 1.0\\n\"\n+\"Content-Type: text/plain; charset=UTF-8\\n\"\n+\"Content-Transfer-Encoding: ENCODING\\n\"\n+\"Language: nb\\n\"\n+\"Plural-Forms: nplurals=2; plural=(n != 1);\\n\"\n+\"X-Generator: Lokalize 2.0\\n\"\n+\n+#. \"English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)\"\n+msgid \"\"\n+\"English Term (Dear translator: This file will never be visible to the user!)\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"amend\"\n+msgstr \"legg til\"\n+\n+#. \"\"\n+msgid \"annotate\"\n+msgstr \"kommenter\"\n+\n+#. \"A 'branch' is an active line of development.\"\n+msgid \"branch [noun]\"\n+msgstr \"gren [substantiv]\"\n+\n+#. \"\"\n+msgid \"branch [verb]\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"checkout [noun]\"\n+msgstr \"utsjekk [substantiv]\"\n+\n+#. \"The action of updating the working tree to a revision which was stored in the object database.\"\n+msgid \"checkout [verb]\"\n+msgstr \"sjekk ut [verb]\"\n+\n+#. \"\"\n+msgid \"clone [verb]\"\n+msgstr \"klone [verb]\"\n+\n+#. \"A single point in the git history.\"\n+msgid \"commit [noun]\"\n+msgstr \"endring [substantiv]\"\n+\n+#. \"The action of storing a new snapshot of the project's state in the git history.\"\n+msgid \"commit [verb]\"\n+msgstr \"sjekk inn [verb]\"\n+\n+#. \"\"\n+msgid \"diff [noun]\"\n+msgstr \"forskjell [substantiv]\"\n+\n+#. \"\"\n+msgid \"diff [verb]\"\n+msgstr \"\"\n+\n+#. \"A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have.\"\n+msgid \"fast forward merge\"\n+msgstr \"\"\n+\n+#. \"Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too.\"\n+msgid \"fetch\"\n+msgstr \"hent\"\n+\n+#. \"One context of consecutive lines in a whole patch, which consists of many such hunks\"\n+msgid \"hunk\"\n+msgstr \"\"\n+\n+#. \"A collection of files. The index is a stored version of your working tree.\"\n+msgid \"index (in git-gui: staging area)\"\n+msgstr \"\"\n+\n+#. \"A successful merge results in the creation of a new commit representing the result of the merge.\"\n+msgid \"merge [noun]\"\n+msgstr \"\"\n+\n+#. \"To bring the contents of another branch into the current branch.\"\n+msgid \"merge [verb]\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"message\"\n+msgstr \"melding\"\n+\n+#. \"Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'.\"\n+msgid \"prune\"\n+msgstr \"\"\n+\n+#. \"Pulling a branch means to fetch it and merge it.\"\n+msgid \"pull\"\n+msgstr \"dra inn\"\n+\n+#. \"Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)\"\n+msgid \"push\"\n+msgstr \"skyv\"\n+\n+#. \"\"\n+msgid \"redo\"\n+msgstr \"gjør om\"\n+\n+#. \"An other repository ('remote'). One might have a set of remotes whose branches one tracks.\"\n+msgid \"remote\"\n+msgstr \"\"\n+\n+#. \"A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)\"\n+msgid \"repository\"\n+msgstr \"depot\"\n+\n+#. \"\"\n+msgid \"reset\"\n+msgstr \"nullstill\"\n+\n+#. \"\"\n+msgid \"revert\"\n+msgstr \"\"\n+\n+#. \"A particular state of files and directories which was stored in the object database.\"\n+msgid \"revision\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"sign off\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"staging area\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"status\"\n+msgstr \"status\"\n+\n+#. \"A ref pointing to a tag or commit object\"\n+msgid \"tag [noun]\"\n+msgstr \"merkelapp [substantiv] \"\n+\n+#. \"\"\n+msgid \"tag [verb]\"\n+msgstr \"merk [verb]\"\n+\n+#. \"A regular git branch that is used to follow changes from another repository.\"\n+msgid \"tracking branch\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"undo\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"update\"\n+msgstr \"oppdater\"\n+\n+#. \"\"\n+msgid \"verify\"\n+msgstr \"\"\n+\n+#. \"The tree of actual checked out files.\"\n+msgid \"working copy, working tree\"\n+msgstr \"\"\n+\n+\ndiff --git a/po/nb.po b/po/nb.po\nindex d66aa50..92a7f5d 100644\n--- a/po/nb.po\n+++ b/po/nb.po\n@@ -2,19 +2,23 @@\n # Copyright (C) 2007-2008 Shawn Pearce, et al.\n # This file is distributed under the same license as the git-gui package.\n #\n-# Fredrik Skolmli <fredrik@frsk.net>, 2008.\n #\n+# Fredrik Skolmli <fredrik@frsk.net>, 2008.\n+# Petter Reinholdtsen <pere@hungry.com>, 2018.\n msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: nb\\n\"\n \"Report-Msgid-Bugs-To: \\n\"\n \"POT-Creation-Date: 2008-11-16 13:56-0800\\n\"\n-\"PO-Revision-Date: 2008-12-03 16:05+0100\\n\"\n-\"Last-Translator: Fredrik Skolmli <fredrik@frsk.net>\\n\"\n-\"Language-Team: Norwegian Bokmål\\n\"\n+\"PO-Revision-Date: 2018-12-03 12:23+0100\\n\"\n+\"Last-Translator: Petter Reinholdtsen <pere@hungry.com>\\n\"\n+\"Language-Team: NorwegianBokmal <i18n-no@lister.ping.uio.no>\\n\"\n \"MIME-Version: 1.0\\n\"\n \"Content-Type: text/plain; charset=UTF-8\\n\"\n \"Content-Transfer-Encoding: 8bit\\n\"\n+\"Language: nb\\n\"\n+\"Plural-Forms: nplurals=2; plural=(n != 1);\\n\"\n+\"X-Generator: Lokalize 2.0\\n\"\n \n #: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847\n #: git-gui.sh:866\n@@ -71,7 +75,7 @@ msgstr \"Kan ikke gå til toppen av arbeidskatalogen:\"\n \n #: git-gui.sh:1076\n msgid \"Cannot use funny .git directory:\"\n-msgstr \"\"\n+msgstr \"Kan ikke bruke merkelig .git-katalog:\"\n \n #: git-gui.sh:1081\n msgid \"No working directory\"\n@@ -87,11 +91,11 @@ msgstr \"Søker etter endrede filer...\"\n \n #: git-gui.sh:1367\n msgid \"Calling prepare-commit-msg hook...\"\n-msgstr \"\"\n+msgstr \"Kjører kroken prepare-common-msg...\"\n \n #: git-gui.sh:1384\n msgid \"Commit declined by prepare-commit-msg hook.\"\n-msgstr \"\"\n+msgstr \"Innsjekking avvist av kroken prepare-commit-msg.\"\n \n #: git-gui.sh:1542 lib/browser.tcl:246\n msgid \"Ready.\"\n@@ -516,6 +520,9 @@ msgid \"\"\n \"This is due to a known issue with the\\n\"\n \"Tcl binary distributed by Cygwin.\"\n msgstr \"\"\n+\"\\n\"\n+\"Dette kommer av et kjent problem med\\n\"\n+\"Tcl-binæren distribuert av Cygwin.\"\n \n #: git-gui.sh:3336\n #, tcl-format\n@@ -527,6 +534,12 @@ msgid \"\"\n \"user.email settings into your personal\\n\"\n \"~/.gitconfig file.\\n\"\n msgstr \"\"\n+\"\\n\"\n+\"\\n\"\n+\"En god erstatning for %s\\n\"\n+\"er å legge inn verdier for innstillingene til\\n\"\n+\"user.name og user.email i din personlige\\n\"\n+\"~/.gitconfig-fil.\\n\"\n \n #: lib/about.tcl:26\n msgid \"git-gui - a graphical user interface for Git.\"\n@@ -558,7 +571,7 @@ msgstr \"Vis historikkens innhold\"\n \n #: lib/blame.tcl:291\n msgid \"Blame Parent Commit\"\n-msgstr \"\"\n+msgstr \"Skyld på foreldreendring\"\n \n #: lib/blame.tcl:450\n #, tcl-format\n@@ -1516,14 +1529,16 @@ msgstr \"Laster inn forskjellene av %s...\"\n msgid \"\"\n \"LOCAL: deleted\\n\"\n \"REMOTE:\\n\"\n-msgstr \"LOKAL: slettet\\n\"\n+msgstr \"\"\n+\"LOKAL: slettet\\n\"\n \"FJERN:\\n\"\n \n #: lib/diff.tcl:125\n msgid \"\"\n \"REMOTE: deleted\\n\"\n \"LOCAL:\\n\"\n-msgstr \"FJERN: slettet\\n\"\n+msgstr \"\"\n+\"FJERN: slettet\\n\"\n \"LOKAL:\\n\"\n \n #: lib/diff.tcl:132\n@@ -1662,7 +1677,8 @@ msgstr \"Reverter endringene i disse %i filene?\"\n \n #: lib/index.tcl:406\n msgid \"Any unstaged changes will be permanently lost by the revert.\"\n-msgstr \"Endringer som ikke ligger i innsjekkingskøen vil bli tapt av denne \"\n+msgstr \"\"\n+\"Endringer som ikke ligger i innsjekkingskøen vil bli tapt av denne \"\n \"reverteringen\"\n \n #: lib/index.tcl:409\n@@ -1852,16 +1868,16 @@ msgstr \"Konfliktfil eksisterer ikke\"\n #: lib/mergetool.tcl:264\n #, tcl-format\n msgid \"Not a GUI merge tool: '%s'\"\n-msgstr \"\"\n+msgstr \"Ikke et grafisk sammenslåingsverktøy: '%s'\"\n \n #: lib/mergetool.tcl:268\n #, tcl-format\n msgid \"Unsupported merge tool '%s'\"\n-msgstr \"\"\n+msgstr \"Ikke-støttet sammenlåingsverktøy '%s'\"\n \n #: lib/mergetool.tcl:303\n msgid \"Merge tool is already running, terminate it?\"\n-msgstr \"\"\n+msgstr \"Sammenslåingsverktøyet kjører allerede.  Stoppe det?\"\n \n #: lib/mergetool.tcl:323\n #, tcl-format\n@@ -1879,24 +1895,27 @@ msgid \"\"\n \"\\n\"\n \"%s\"\n msgstr \"\"\n+\"Klarte ikke starte sammenslåingsverktøyet:\\n\"\n+\"\\n\"\n+\"%s\"\n \n #: lib/mergetool.tcl:347\n msgid \"Running merge tool...\"\n-msgstr \"\"\n+msgstr \"Kjører sammenslåingsverktøyet...\"\n \n #: lib/mergetool.tcl:375 lib/mergetool.tcl:383\n msgid \"Merge tool failed.\"\n-msgstr \"\"\n+msgstr \"Sammenslåingsverktøyet feilet.\"\n \n #: lib/option.tcl:11\n #, tcl-format\n msgid \"Invalid global encoding '%s'\"\n-msgstr \"\"\n+msgstr \"Ugyldig global enkoding '%s'\"\n \n #: lib/option.tcl:19\n #, tcl-format\n msgid \"Invalid repo encoding '%s'\"\n-msgstr \"\"\n+msgstr \"Ugyldig depot-enkoding '%s'\"\n \n #: lib/option.tcl:117\n msgid \"Restore Defaults\"\n@@ -2472,3 +2491,5 @@ msgstr \"Bruk tynne pakker (for tregere nettverkstilkoblinger)\"\n #: lib/transport.tcl:168\n msgid \"Include tags\"\n msgstr \"Inkluder tagger\"\n+\n+\n-- \n2.11.0\n"}]}