[gitg/gnome-3-18] Updated Slovenian translation
- From: Matej Urbančič <mateju src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg/gnome-3-18] Updated Slovenian translation
- Date: Sat, 5 Mar 2016 20:31:32 +0000 (UTC)
commit 91fb3be81028d8345a1d73843c97ea0224629090
Author: Matej Urbančič <mateju svn gnome org>
Date: Sat Mar 5 21:31:26 2016 +0100
Updated Slovenian translation
po/sl.po | 892 ++++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 659 insertions(+), 233 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index d41318f..bae365d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the gitg package.
#
# Andrej Žnidaršič <andrej znidarsic gmail com>, 2009-2010.
-# Matej Urbančič <mateju svn gnome org>, 2012-2015.
+# Matej Urbančič <mateju svn gnome org>, 2012-2016.
#
msgid ""
msgstr ""
"Project-Id-Version: gitg master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=gitg&keywords=I18N+L10N&component=gitg\n"
-"POT-Creation-Date: 2015-04-12 17:42+0000\n"
-"PO-Revision-Date: 2015-04-12 20:15+0100\n"
+"POT-Creation-Date: 2016-03-05 21:22+0100\n"
+"PO-Revision-Date: 2016-03-05 21:30+0100\n"
"Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
"Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
"Language: sl_SI\n"
@@ -21,9 +21,9 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
"%100==4 ? 3 : 0);\n"
"X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Generator: Poedit 1.8.4\n"
-#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:54
+#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:58
#: ../gitg/resources/ui/gitg-window.ui.h:1
msgid "gitg"
msgstr "gitg"
@@ -59,10 +59,27 @@ msgid "The activity which gitg activates by default when first launched."
msgstr "Dejavnost, ki jo privzeto zažene program gitg ob prvem zagonu."
#: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
+msgid "Use Gravatar"
+msgstr "Uporabi Gravatar"
+
+#: ../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 "Omogoči nadzor"
+
+#: ../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 "When to Collapse Inactive Lanes"
msgstr "Kdaj naj se zložijo nedejavne vrstice"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
msgid ""
"Setting that indicates when an inactive lane should be collapsed. Valid "
"values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
@@ -71,7 +88,7 @@ msgstr ""
"vrednosti so med 0 - 4, kjer vrednost 0 določa zgodaj' in vrednosti 4 "
"'pozno'."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
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 "
@@ -83,32 +100,32 @@ msgstr ""
"zgodovine, ko je veliko vzporednega razvoja. Poglejte collapse-inactive-"
"lanes za nadzor, kdaj naj bodo vrstice strnjene."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
msgid "Show History in Topological Order"
msgstr "Pokaži zgodovino v topološkem načinu razvrstitve"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
msgid ""
"Setting that indicates whether to show the history in topological order."
msgstr ""
"Nastavitev določi ali naj bo zgodovina prikazana v topološkem načinu "
"razvrstitve."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
msgid "Show Stashed Changes"
msgstr "Pokaži spremembe zaloge"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
msgid ""
"Setting that indicates whether to show items for the stash in the history."
msgstr ""
"Nastavitev določa, ali naj bodo prikazani predmeti za zalogo v zgodovini."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
msgid "Show Staged Changes"
msgstr "Pokaži spremembe v pripravljenosti"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
msgid ""
"Setting that indicates whether to show a virtual item for the currently "
"staged changes in the history."
@@ -116,11 +133,11 @@ msgstr ""
"Nastavitev določa, ali naj bo prikazan navidezni predmet za trenutne "
"spremembe v pripravljenosti."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
msgid "Show Unstaged Changes"
msgstr "Pokaži spremembe počiščene pripravljenosti"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
msgid ""
"Setting that indicates whether to show a virtual item for the currently "
"unstaged changes in the history."
@@ -128,11 +145,11 @@ msgstr ""
"Nastavitev določa, ali naj bo prikazan navidezni predmet za trenutne "
"spremembe počiščene pripravljenosti."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
msgid "Mainline Head"
msgstr "Glava glavne vrstice"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
msgid ""
"Setting that indicates whether to always preserve a mainline in the history "
"for the current HEAD."
@@ -140,11 +157,29 @@ msgstr ""
"Nastavitev določa, ali naj se ohrani glavna vrstica v zgodovini trenutne "
"glavne veje."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:24
+msgid "Default selection of the history activity"
+msgstr "Privzet izbor opravila iz zgodovine"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
+msgid ""
+"Setting that determines the default selection on startup of the history "
+"activity."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:26
+msgid "Reference Sort Order"
+msgstr "Sklicni način razvrščanja"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+msgid "The order by which references in the history sidebar should be sorted."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
msgid "Show Right Margin in Commit Message View"
msgstr "Pokaži desni rob v pogledu sporočil uveljavitev"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
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."
@@ -153,11 +188,11 @@ msgstr ""
"omogoča enostaven pogled za lažji prelom besedila sporočila uveljavitve v "
"določenem stolpcu."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
msgid "Column at Which Right Margin is Shown"
msgstr "Stolpec na katerem je prikazan desni rob"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
msgid ""
"The column at which the right margin is shown if the show-right-margin "
"preference is set to TRUE."
@@ -165,11 +200,11 @@ msgstr ""
"Stolpec, pri katerem je prikazan desni rob, kadar je izbrana možnost prikaza "
"desnega robu."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:24
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:32
msgid "Show Subject Margin in Commit Message View"
msgstr "Pokaži rob zadeve v pogledu sporočil uveljavitev"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
msgid ""
"Highlight the subject text of the commit message when it passes the margin "
"specified by subject-margin-position."
@@ -177,11 +212,11 @@ msgstr ""
"Poudari besedilo zadeve sporočila uveljavitve, ko preseže rob, ki ga določa "
"nastavitev."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:26
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
msgid "Column at Which Subject Margin is Shown"
msgstr "Stolpec, pri katerem je prikazan rob zadeve"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
msgid ""
"The column at which the subject margin is shown if the show-subject-margin "
"preference is set to TRUE."
@@ -189,11 +224,11 @@ msgstr ""
"Stolpec, pri katerem je prikazan rob zadeve, kadar je izbrana možnost "
"prikaza robu zadeve."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
msgid "Enable Spell Checking"
msgstr "Omogoči črkovanje"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:37
msgid ""
"Setting which determines whether or not spell checking is enabled when "
"writing a commit message."
@@ -201,22 +236,22 @@ msgstr ""
"Nastavitve, ki določajo ali je črkovanje sporočila uveljavitve omogočeno ali "
"ne."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:38
msgid "Spell Checking Language"
msgstr "Jezik črkovanja"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:39
msgid ""
"The language to use when spell checking is enabled for writing a commit "
"message."
msgstr ""
"Jezik, ki bo uporabljen za črkovanje, če je možnost omogočena za sporočila."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:32
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:40
msgid "Ignore Whitespace Changes"
msgstr "Prezri spremembe preslednih znakov"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:41
msgid ""
"Setting that indicates whether to ignore whitespace changes when showing the "
"diff of a commit."
@@ -224,22 +259,30 @@ msgstr ""
"Nastavitev določa, ali naj bodo prezrte spremembe preslednih z nakov med "
"izpisovanjem ukaza diff med uveljavitvijo."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:42
msgid "Show Changes Inline"
msgstr "Pokaži spremembe med besedilom"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:43
msgid ""
"Setting that indicates whether changes within lines should be shown inline."
msgstr ""
"Nastavitev določa, ali naj bodo spremembe med vrsticami prikazane znotraj "
"besedila."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:44
+msgid "Wrap"
+msgstr "Prelom"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:45
+msgid "Wrap lines."
+msgstr "Prelomi vrstice"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:46
msgid "Number of Before/After Context Lines"
msgstr "Število začetnih in končnih vsebinskih vrstic"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:37
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:47
msgid ""
"Setting that determines how many lines of context (before and after) should "
"be shown when showing the diff of a commit."
@@ -247,11 +290,11 @@ msgstr ""
"Nastavitev, ki določa, koliko črt vsebine (pred in za nizom) naj bo "
"prikazanih v izpisu ukaza diff med uveljavljanjem."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:38
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:48
msgid "Rendered Width of a Tab Character"
msgstr "Izris širine tabulatorja"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:39
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:49
msgid ""
"Setting that determines how much space a tab character should occupy when "
"showing the diff of a commit."
@@ -259,7 +302,7 @@ msgstr ""
"Nastavitev, ki določa, koliko prostora zavzema znak tab v izpisu ukaza diff "
"med uveljavljanjem."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:40
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:50
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."
@@ -267,41 +310,49 @@ msgstr ""
"Nastavitev, ki določa, koliko črt vsebine (pred in za nizom) naj bo "
"prikazanih v izpisu pripravljenih predmetov za uveljavitev."
-#: ../gitg/commit/gitg-commit-dialog.vala:283
+#: ../gitg/commit/gitg-commit-dialog.vala:298
#, c-format
msgid "Cannot set spell checking language: %s"
msgstr "Ni mogoče nastaviti jezika za črkovanje: %s"
-#: ../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-dialog.vala:498
+#: ../gitg/commit/gitg-commit.vala:1064
+msgid "There are no changes to be committed"
+msgstr "Ni sprememb za uveljavitev"
+
+#: ../gitg/commit/gitg-commit-dialog.vala:499
+#: ../gitg/commit/gitg-commit.vala:1065
+msgid "Use amend to change the commit message of the previous commit"
+msgstr "Uporabi dopolnitev za spremembo sporočila predhodne uveljavitve"
+
+#: ../gitg/commit/gitg-commit.vala:104
+msgctxt "Activity"
msgid "Commit"
msgstr "Uveljavi"
-#: ../gitg/commit/gitg-commit.vala:77
+#: ../gitg/commit/gitg-commit.vala:109
msgid "Create new commits and manage the staging area"
msgstr "Ustvari nove uveljavitve in upravljaj s spremembami v pripravljenosti"
-#: ../gitg/commit/gitg-commit.vala:152
+#: ../gitg/commit/gitg-commit.vala:184
msgid "_Stage selection"
msgstr "_Izbor datotek v pripravljenosti"
-#: ../gitg/commit/gitg-commit.vala:188
+#: ../gitg/commit/gitg-commit.vala:222
#, c-format
msgid "Failed to stage the removal of submodule `%s'"
msgstr ""
"Postavljanje v pripravljenost odstranjevanje podrejenega modula `%s' je "
"spodletelo."
-#: ../gitg/commit/gitg-commit.vala:204
+#: ../gitg/commit/gitg-commit.vala:238
#, c-format
msgid "Failed to open the repository of submodule `%s' while trying to stage"
msgstr ""
"Odpiranje skladišča podrejenega modula `%s' je med postavljanjem v "
"pripravljenost spodletelo."
-#: ../gitg/commit/gitg-commit.vala:218
+#: ../gitg/commit/gitg-commit.vala:252
#, c-format
msgid ""
"Failed to lookup the working directory commit of submodule `%s' while trying "
@@ -310,132 +361,103 @@ msgstr ""
"Pregled delovne mape uveljavitve podrejenega modula `%s' je med "
"postavljanjem v pripravljenost spodletel."
-#: ../gitg/commit/gitg-commit.vala:231
+#: ../gitg/commit/gitg-commit.vala:265
#, c-format
msgid "Failed to stage the submodule `%s'"
msgstr "Dodajanje podrejenega modula v pripravljenost `%s' je spodletelo."
-#: ../gitg/commit/gitg-commit.vala:253
+#: ../gitg/commit/gitg-commit.vala:287
#, c-format
msgid "Failed to stage the removal of file `%s'"
msgstr "Postavljanje odstranitve datoteke `%s' v pripravljenost je spodletelo."
-#: ../gitg/commit/gitg-commit.vala:267
+#: ../gitg/commit/gitg-commit.vala:301
#, c-format
msgid "Failed to stage the file `%s'"
msgstr "Postavljanje datoteke `%s' v pripravljenost je spodletelo."
-#: ../gitg/commit/gitg-commit.vala:536
+#: ../gitg/commit/gitg-commit.vala:572
msgid "_Unstage selection"
msgstr "_Odstranitev datotek iz pripravljenosti"
-#: ../gitg/commit/gitg-commit.vala:601
+#: ../gitg/commit/gitg-commit.vala:637
#, c-format
msgid "Failed to unstage the removal of file `%s'"
msgstr ""
"Postavljanje odstranitve datoteke `%s' iz pripravljenosti je spodletelo."
-#: ../gitg/commit/gitg-commit.vala:602
+#: ../gitg/commit/gitg-commit.vala:638
#, c-format
msgid "Failed to unstage the file `%s'"
msgstr "Postavljanje datoteke `%s' iz pripravljenosti je spodletelo"
-#: ../gitg/commit/gitg-commit.vala:609
+#: ../gitg/commit/gitg-commit.vala:645
#, c-format
msgid "Failed to unstage the removal of submodule `%s'"
msgstr "Odstranjevanje pripravljenosti podrejenega modula `%s' je spodletelo."
-#: ../gitg/commit/gitg-commit.vala:610
+#: ../gitg/commit/gitg-commit.vala:646
#, c-format
msgid "Failed to unstage the submodule `%s'"
msgstr "Odstranjevanje pripravljenosti podrejenega modula `%s' je spodletelo"
#. Populate staged items
-#: ../gitg/commit/gitg-commit.vala:805
+#: ../gitg/commit/gitg-commit.vala:850
msgid "Staged"
msgstr "V pripravljenosti"
-#: ../gitg/commit/gitg-commit.vala:813
+#: ../gitg/commit/gitg-commit.vala:858
msgid "No staged files"
msgstr "Ni datotek v pripravljenosti."
#. Populate unstaged items
-#: ../gitg/commit/gitg-commit.vala:829
+#: ../gitg/commit/gitg-commit.vala:881
msgid "Unstaged"
msgstr "Nepripravljeno"
-#: ../gitg/commit/gitg-commit.vala:837
+#: ../gitg/commit/gitg-commit.vala:889
msgid "No unstaged files"
msgstr "Ni nepripravljenih datotek."
#. Populate untracked items
-#: ../gitg/commit/gitg-commit.vala:853
+#: ../gitg/commit/gitg-commit.vala:912
msgid "Untracked"
msgstr "Brez sledenja"
-#: ../gitg/commit/gitg-commit.vala:857
+#: ../gitg/commit/gitg-commit.vala:916
msgid "No untracked files"
msgstr "Ni datotek brez sledenja."
-#: ../gitg/commit/gitg-commit.vala:875
+#: ../gitg/commit/gitg-commit.vala:941
msgid "Submodule"
msgstr "Podrejeni modul"
-#: ../gitg/commit/gitg-commit.vala:879
+#: ../gitg/commit/gitg-commit.vala:945
msgid "No dirty submodules"
msgstr "Ni neveljavnih podrejenih modulov"
-#: ../gitg/commit/gitg-commit.vala:991
-msgid "There are no changes to be committed"
-msgstr "Ni sprememb za uveljavitev"
-
-#: ../gitg/commit/gitg-commit.vala:992
-msgid "Use amend to change the commit message of the previous commit"
-msgstr "Uporabi dopolnitev za spremembo sporočila predhodne uveljavitve"
-
-#: ../gitg/commit/gitg-commit.vala:1018
+#: ../gitg/commit/gitg-commit.vala:1092
msgid "Failed to commit"
msgstr "Uveljavitev je spodletela"
-#. 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:1108
msgid "Failed to pass pre-commit"
msgstr "Pred-uveljavitev je spodletela"
-#: ../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 ""
-"Vaše uporabniško ime in elektronski naslov še nista nastavljena. Odprite "
-"nastavitve uporabnika in manjkajoče podatke vnesite."
-
-#: ../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 ""
-"Vaše ime še ni nastavljeno. Odprite nastavitve uporabnika in vnesite podatek."
-
-#: ../gitg/commit/gitg-commit.vala:1209
-msgid ""
-"Your email is not configured yet. Please go to the user configuration and "
-"provide your email."
-msgstr ""
-"Vaš elektronski naslov še ni nastavljen. Odprite nastavitve uporabnika in "
-"vnesite podatek."
-
-#: ../gitg/commit/gitg-commit.vala:1268 ../gitg/commit/gitg-commit.vala:1415
+#: ../gitg/commit/gitg-commit.vala:1311 ../gitg/commit/gitg-commit.vala:1461
msgid "Discard changes"
msgstr "Prezri spremembe"
-#: ../gitg/commit/gitg-commit.vala:1269
+#: ../gitg/commit/gitg-commit.vala:1312
msgid "Are you sure you want to permanently discard the selected changes?"
msgstr "Ali ste prepričani, da želite trajno izbrisati izbrane spremembe?"
-#: ../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:1321 ../gitg/commit/gitg-commit.vala:1487
+#: ../gitg/commit/gitg-commit.vala:1602
+#: ../gitg/gitg-commit-action-create-patch.vala:145
+#: ../gitg/gitg-dash-view.vala:467 ../gitg/gitg-dash-view.vala:598
+#: ../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
@@ -444,34 +466,34 @@ msgstr "Ali ste prepričani, da želite trajno izbrisati izbrane spremembe?"
msgid "_Cancel"
msgstr "_Prekliči"
-#: ../gitg/commit/gitg-commit.vala:1279 ../gitg/commit/gitg-commit.vala:1442
+#: ../gitg/commit/gitg-commit.vala:1322 ../gitg/commit/gitg-commit.vala:1488
msgid "Discard"
msgstr "Zavrzi"
-#: ../gitg/commit/gitg-commit.vala:1307
+#: ../gitg/commit/gitg-commit.vala:1351
msgid "Failed to discard selection"
msgstr "Prezrtje izbire je spodletelo"
-#: ../gitg/commit/gitg-commit.vala:1336
+#: ../gitg/commit/gitg-commit.vala:1381
msgid "Failed to stage selection"
msgstr "Postavljanje datotek v pripravljenost je spodletelo"
-#: ../gitg/commit/gitg-commit.vala:1340
+#: ../gitg/commit/gitg-commit.vala:1385
msgid "Failed to unstage selection"
msgstr "Odstranitev postavljanja datotek iz pripravljenosti je spodletelo"
-#: ../gitg/commit/gitg-commit.vala:1399
+#: ../gitg/commit/gitg-commit.vala:1445
msgid "Failed to discard changes"
msgstr "Prezrtje sprememb je spodletelo"
-#: ../gitg/commit/gitg-commit.vala:1420
+#: ../gitg/commit/gitg-commit.vala:1466
#, c-format
msgid ""
"Are you sure you want to permanently discard all changes made to the file `"
"%s'?"
msgstr "Ali ste prepričani, da želite zavreči vse spremembe v datoteki %s?"
-#: ../gitg/commit/gitg-commit.vala:1431
+#: ../gitg/commit/gitg-commit.vala:1477
#, c-format
msgid ""
"Are you sure you want to permanently discard all changes made to the files "
@@ -479,22 +501,95 @@ msgid ""
msgstr ""
"Ali ste prepričani, da želite zavreči vse spremembe v datotekah %s in `%s'?"
-#: ../gitg/commit/gitg-commit.vala:1475
+#: ../gitg/commit/gitg-commit.vala:1560
+msgid "Failed to delete files"
+msgstr "Brisanje datotek je spodletelo"
+
+#: ../gitg/commit/gitg-commit.vala:1576
+msgid "Delete file"
+msgid_plural "Delete files"
+msgstr[0] "Izbriši datoteke"
+msgstr[1] "Izbriši datoteko"
+msgstr[2] "Izbriši datoteki"
+msgstr[3] "Izbriši datoteke"
+
+#: ../gitg/commit/gitg-commit.vala:1581
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the file `%s'?"
+msgstr "Ali zares želite trajno izbrisati %s?"
+
+#: ../gitg/commit/gitg-commit.vala:1592
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the files %s and `%s'?"
+msgstr "Ali zares želite trajno izbrisati %s?"
+
+#: ../gitg/commit/gitg-commit.vala:1637
msgid "_Stage changes"
msgstr "_Pripravi spremembe"
-#: ../gitg/commit/gitg-commit.vala:1485
+#: ../gitg/commit/gitg-commit.vala:1647
msgid "_Unstage changes"
msgstr "_Počisti pripravljene spremembe"
-#: ../gitg/commit/gitg-commit.vala:1495
+#: ../gitg/commit/gitg-commit.vala:1657
msgid "_Discard changes"
msgstr "_Zavrzi spremembe"
-#: ../gitg/commit/gitg-commit.vala:1518
+#: ../gitg/commit/gitg-commit.vala:1667
+msgid "D_elete file"
+msgid_plural "D_elete files"
+msgstr[0] "_Izbriši datoteke"
+msgstr[1] "_Izbriši datoteko"
+msgstr[2] "_Izbriši datoteki"
+msgstr[3] "_Izbriši datoteke"
+
+#: ../gitg/commit/gitg-commit.vala:1690
msgid "_Edit file"
msgstr "_Uredi datoteko"
+#: ../gitg/gitg-action-support.vala:93
+#, fuzzy, c-format
+msgid "Failed to stash changes: %s"
+msgstr "Založi neuveljavljene spremembe"
+
+#: ../gitg/gitg-action-support.vala:128
+#, fuzzy
+msgid "Unstaged changes"
+msgstr "Pokaži spremembe počiščene pripravljenosti"
+
+#: ../gitg/gitg-action-support.vala:129
+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:131 ../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 "Prekliči"
+
+#: ../gitg/gitg-action-support.vala:132
+#, fuzzy
+msgid "Stash changes"
+msgstr "Založi določene spremembe"
+
+#: ../gitg/gitg-action-support.vala:136 ../gitg/gitg-ref-action-merge.vala:199
+msgid "Merge failed with conflicts"
+msgstr "Združevanje je spodletelo zaradi sporov"
+
+#: ../gitg/gitg-action-support.vala:163
+msgid "Failed with conflicts"
+msgstr "Opravilo je spodletelo zaradi sporov"
+
+#: ../gitg/gitg-action-support.vala:179
+#, fuzzy, c-format
+msgid "Failed to checkout conflicts: %s"
+msgstr ""
+"\n"
+"Spori med prevzemom kode:\n"
+
#: ../gitg/gitg-application.vala:56
msgid "Show the application's version"
msgstr "Pokaži različico programa"
@@ -516,66 +611,77 @@ msgstr "Ne skušajte naložiti skladišča iz trenutne delovne mape"
msgid "- Git repository viewer"
msgstr "- Pregledovalnik skladišč Git"
-#: ../gitg/gitg-application.vala:209
+#: ../gitg/gitg-application.vala:222
msgid "gitg is a Git repository viewer for gtk+/GNOME"
msgstr "Program gitg je pregledovalnik git skladišč za gtk+/GNOME"
-#: ../gitg/gitg-application.vala:218
+#: ../gitg/gitg-application.vala:231
msgid "translator-credits"
msgstr "Matej Urbančič <mateju svn gnome org>"
-#: ../gitg/gitg-application.vala:221
+#: ../gitg/gitg-application.vala:234
msgid "gitg homepage"
msgstr "Spletna stran programa gitg"
-#: ../gitg/gitg-author-details-dialog.vala:67
-msgid "Unable to open the .gitconfig file."
-msgstr "Datoteke .gitconfig ni mogoče odpreti."
+#. ex: ts=4 noet
+#: ../gitg/gitg-author-details-dialog.vala:85
+#: ../gitg/gitg-author-details-dialog.vala:105
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1
+msgid "Author Details"
+msgstr "Podrobnosti avtorja"
+
+#: ../gitg/gitg-author-details-dialog.vala:86
+msgid "Enter default details used for all repositories:"
+msgstr "Vnesite privzete podrobnosti za vsa skladišča:"
-#: ../gitg/gitg-author-details-dialog.vala:148
+#. Translators: %s is the repository name
+#: ../gitg/gitg-author-details-dialog.vala:108
+#, fuzzy, c-format
+msgid "Override global details for repository '%s':"
+msgstr "Vnesite podrobnosti za skladišče '%s':"
+
+#: ../gitg/gitg-author-details-dialog.vala:220
msgid "Failed to set Git user config."
msgstr "Nastavljanje uporabniških določil je spodletelo."
-#: ../gitg/gitg-clone-dialog.vala:87
+#: ../gitg/gitg-clone-dialog.vala:89
msgid "The URL introduced is not supported"
msgstr "Podan naslov URL ni podprt"
#: ../gitg/gitg-commit-action-create-branch.vala:48
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
-msgid "Create Branch"
+msgid "Create branch"
msgstr "Ustvari vejo"
#: ../gitg/gitg-commit-action-create-branch.vala:53
msgid "Create a new branch at the selected commit"
msgstr "Ustvari novo vejo pri izbrani uveljavitvi"
-#: ../gitg/gitg-commit-action-create-branch.vala:85
+#: ../gitg/gitg-commit-action-create-branch.vala:75
msgid "Failed to create branch"
msgstr "Ustvarjanje veje je spodletelo"
#: ../gitg/gitg-commit-action-create-patch.vala:63
-msgid "Create Patch"
+msgid "Create patch"
msgstr "Ustvari popravek"
#: ../gitg/gitg-commit-action-create-patch.vala:68
msgid "Create a patch from the selected commit"
msgstr "Ustvari popravek iz izbrane uveljavitve"
-#: ../gitg/gitg-commit-action-create-patch.vala:141
+#: ../gitg/gitg-commit-action-create-patch.vala:143
msgid "Save Patch File"
msgstr "Shrani datoteko popravka"
-#: ../gitg/gitg-commit-action-create-patch.vala:145
+#: ../gitg/gitg-commit-action-create-patch.vala:147
msgid "_Save Patch"
msgstr "_Shrani popravek"
-#: ../gitg/gitg-commit-action-create-patch.vala:168
+#: ../gitg/gitg-commit-action-create-patch.vala:172
msgid "Failed to create patch"
msgstr "Ustvarjanje popravka je spodletelo"
#: ../gitg/gitg-commit-action-create-tag.vala:48
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:1
-msgid "Create Tag"
+msgid "Create tag"
msgstr "Ustvari oznako"
#: ../gitg/gitg-commit-action-create-tag.vala:53
@@ -594,10 +700,102 @@ msgstr "Iskanje oznake je spodletelo"
msgid "Provide a message to create an annotated tag"
msgstr "Navedi sporočilo za ustvarjanje oznake"
-#: ../gitg/gitg-dash-view.vala:148
+#: ../gitg/gitg-dash-view.vala:190
msgid "_Delete"
msgstr "_Delete"
+#. Translators: the two %s will be replaced to create a link to perform the scanning action.
+#: ../gitg/gitg-dash-view.vala:247
+#, 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:250
+#, c-format
+msgid "In the mean time, you may want to %sset up your git profile%s."
+msgstr ""
+
+#: ../gitg/gitg-dash-view.vala:395
+msgid "Failed to clone repository"
+msgstr "Kloniranje skladišča je spodletelo"
+
+#: ../gitg/gitg-dash-view.vala:443
+msgid "Failed to add repository"
+msgstr "Dodajanje skladišča je spodletelo"
+
+#: ../gitg/gitg-dash-view.vala:459
+msgid "Create new repository"
+msgstr "Ustvari novo skladišče"
+
+#. Translators: %s is a file name
+#: ../gitg/gitg-dash-view.vala:462
+#, 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:468
+msgid "Create repository"
+msgstr "Ustvari skladišče"
+
+#: ../gitg/gitg-dash-view.vala:484
+msgid "Failed to create repository"
+msgstr "Ustvarjanje skladišča je spodletelo"
+
+#: ../gitg/gitg-dash-view.vala:554
+#, c-format
+msgid "Scanning for repositories in %s"
+msgstr "Preiskovanje skladišč v %s"
+
+#: ../gitg/gitg-dash-view.vala:595
+msgid "Add Repository"
+msgstr "Dodaj skladišče"
+
+#: ../gitg/gitg-dash-view.vala:599
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: ../gitg/gitg-dash-view.vala:601
+msgid "_Scan for all git repositories from this directory"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-checkout.vala:48
+#: ../gitg/gitg-ref-action-merge.vala:195
+#, fuzzy
+msgid "Checkout"
+msgstr "poskusi vsiliti prevzem in autogen ob napaki"
+
+#: ../gitg/gitg-ref-action-checkout.vala:53
+#, fuzzy
+msgid "Checkout the selected reference"
+msgstr "Izbriši izbrane sklice"
+
+#: ../gitg/gitg-ref-action-checkout.vala:72
+#, fuzzy, c-format
+msgid "Checkout %s"
+msgstr "korena prevzema (%s) ni mogoče ustvariti"
+
+#: ../gitg/gitg-ref-action-checkout.vala:88
+#, fuzzy, c-format
+msgid "Failed to lookup commit: %s"
+msgstr "Iskanje za gostitelja '%s' ni uspelo: %s"
+
+#: ../gitg/gitg-ref-action-checkout.vala:101
+#, fuzzy, c-format
+msgid "Failed to checkout branch: %s"
+msgstr "Brisanje veje %s je spodletelo"
+
+#: ../gitg/gitg-ref-action-checkout.vala:111
+#, fuzzy, c-format
+msgid "Failed to update HEAD: %s"
+msgstr "Posodabljanje metapodatkov je spodletelo: %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"
msgstr "Kopiraj ime"
@@ -607,7 +805,7 @@ msgid "Copy the name of the reference to the clipboard"
msgstr "Kopiraj ime sklica v odložišče"
#: ../gitg/gitg-ref-action-delete.vala:48
-#: ../gitg/gitg-ref-action-delete.vala:88
+#: ../gitg/gitg-ref-action-delete.vala:89
msgid "Delete"
msgstr "Delete"
@@ -645,12 +843,6 @@ msgstr "Odstrani oddaljeno vejo %s"
msgid "Are you sure that you want to permanently delete the remote branch %s?"
msgstr "Ali ste prepričani, da želite trajno izbrisati oddaljeno vejo %s?"
-#: ../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 "Prekliči"
-
#. Translators: %s is the name of the tag
#: ../gitg/gitg-ref-action-delete.vala:119
#, c-format
@@ -685,39 +877,127 @@ msgstr "Pridobi preko %s"
msgid "Fetch remote objects from %s"
msgstr "Pridobi oddaljeni predmet iz %s"
-#: ../gitg/gitg-ref-action-fetch.vala:110
+#: ../gitg/gitg-ref-action-fetch.vala:98
#, c-format
msgid "Fetching from %s"
msgstr "Pridobivanje iz %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 "novo"
#. 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 "posodobljeno"
-#: ../gitg/gitg-ref-action-fetch.vala:134
+#: ../gitg/gitg-ref-action-fetch.vala:121
#, c-format
msgid "Failed to fetch from %s: %s"
msgstr "Ni mogoče pridobiti iz %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 "Pridobljeno preko %s: vse je posodobljeno"
#. 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 "Pridobljeno iz %s: %s"
+#: ../gitg/gitg-ref-action-merge.vala:63
+#, c-format
+msgid "Merge into %s"
+msgstr "Združi v %s"
+
+#. TODO
+#: ../gitg/gitg-ref-action-merge.vala:69
+#, fuzzy, c-format
+msgid "Merge another branch into branch %s"
+msgstr "Združi posamezno uveljavitev iz druge veje"
+
+#: ../gitg/gitg-ref-action-merge.vala:106
+#, fuzzy, c-format
+msgid "Failed to merge commits: %s"
+msgstr "Uveljavitev vključuje tudi neuspešno združevanje (uporabite -i)"
+
+#: ../gitg/gitg-ref-action-merge.vala:175
+#: ../gitg/gitg-ref-action-merge.vala:191
+msgid "Merge has conflicts"
+msgstr "Združevanje povzroča spore"
+
+#: ../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: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 "Združi %s v %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:231
+#, fuzzy, c-format
+msgid "Failed to lookup our commit: %s"
+msgstr "Iskanje za gostitelja '%s' ni uspelo: %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:241
+#, fuzzy, c-format
+msgid "Failed to lookup their commit: %s"
+msgstr "Iskanje za gostitelja '%s' ni uspelo: %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:262
+msgid "Failed to obtain author details"
+msgstr "Pridobivanje podatkov avtorja je spodletelo"
+
+#: ../gitg/gitg-ref-action-merge.vala:298
+#, c-format
+msgid "Failed to obtain HEAD tree: %s"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:316
+#, c-format
+msgid "Failed to create commit: %s"
+msgstr "Neuspešno ustvarjanje uveljavitve: %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:338
+#, fuzzy, c-format
+msgid "Failed to checkout index: %s"
+msgstr "neveljavni način prevzema (modul: %s)"
+
+#: ../gitg/gitg-ref-action-merge.vala:343
+#, c-format
+msgid "Successfully merged %s into %s"
+msgstr "Uspešno združitev %s v %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:383
+#, c-format
+msgid "Merge %s into branch %s"
+msgstr "Združi %s v vejo %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:545
+#: ../gitg/history/gitg-history-refs-list.vala:1139
+msgid "Tags"
+msgstr "Oznake"
+
#: ../gitg/gitg-ref-action-rename.vala:48
msgid "Rename"
msgstr "Rename"
@@ -735,11 +1015,11 @@ msgstr "Navedeno ime ‘%s’ vsebuje neveljavne znake"
msgid "Invalid name"
msgstr "Neveljavno ime"
-#: ../gitg/gitg-ref-action-rename.vala:141
+#: ../gitg/gitg-ref-action-rename.vala:131
msgid "Failed to rename"
msgstr "Preimenovanje je spodletelo"
-#: ../gitg/gitg.vala:64
+#: ../gitg/gitg.vala:68
msgid ""
"We are terribly sorry, but gitg requires libgit2 (a library on which gitg "
"depends) to be compiled with threading support.\n"
@@ -759,54 +1039,105 @@ msgstr ""
"Seveda se lahko zgodi, da je tudi sistemska knjižnica izgrajena brez "
"ustrezne podpore. V tem primeru je treba poslati poročilo o hrošču."
-#: ../gitg/gitg-window.vala:403
+#: ../gitg/gitg-window.vala:410
msgid "Projects"
msgstr "Projekti"
-#: ../gitg/gitg-window.vala:466
-msgid "Open Repository"
-msgstr "Odpri skladišče"
-
-#: ../gitg/gitg-window.vala:469
-msgid "_Open"
-msgstr "_Odpri"
-
-#: ../gitg/gitg-window.vala:764
+#: ../gitg/gitg-window.vala:826
#, c-format
msgid "'%s' is not a Git repository."
msgstr "'%s' ni skladišče Git."
-#: ../gitg/history/gitg-history-refs-list.vala:136
+#: ../gitg/gitg-window.vala:975
+msgid ""
+"Your user name and email are not configured yet. Please go to the user "
+"configuration and provide your name and email."
+msgstr ""
+"Vaše uporabniško ime in elektronski naslov še nista nastavljena. Odprite "
+"nastavitve uporabnika in manjkajoče podatke vnesite."
+
+#: ../gitg/gitg-window.vala:979
+msgid ""
+"Your user name is not configured yet. Please go to the user configuration "
+"and provide your name."
+msgstr ""
+"Vaše ime še ni nastavljeno. Odprite nastavitve uporabnika in vnesite podatek."
+
+#: ../gitg/gitg-window.vala:983
+msgid ""
+"Your email is not configured yet. Please go to the user configuration and "
+"provide your email."
+msgstr ""
+"Vaš elektronski naslov še ni nastavljen. Odprite nastavitve uporabnika in "
+"vnesite podatek."
+
+#: ../gitg/gitg-window.vala:986
+msgid "Missing author details"
+msgstr "Manjkajo podrobnosti avtorja"
+
+#: ../gitg/gitg-remote-notification.vala:90
+#: ../gitg/gitg-simple-notification.vala:99
+#: ../gitg/resources/ui/gitg-window.ui.h:6
+msgid "Close"
+msgstr "Zapri"
+
+#: ../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-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 "SKLICI"
+
+#: ../gitg/history/gitg-history-refs-list.vala:170
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
msgid "All commits"
msgstr "Vse uveljavitve"
-#: ../gitg/history/gitg-history-refs-list.vala:835
+#: ../gitg/history/gitg-history-refs-list.vala:1137
msgid "Branches"
msgstr "Veje"
-#: ../gitg/history/gitg-history-refs-list.vala:836
+#: ../gitg/history/gitg-history-refs-list.vala:1138
msgid "Remotes"
msgstr "Oddaljeno"
-#: ../gitg/history/gitg-history-refs-list.vala:837
-msgid "Tags"
-msgstr "Oznake"
-
-#: ../gitg/history/gitg-history.vala:246
-#: ../gitg/preferences/gitg-preferences-history.vala:128
+#: ../gitg/history/gitg-history.vala:302
+#: ../gitg/preferences/gitg-preferences-history.vala:210
#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:3
msgid "History"
msgstr "Zgodovina"
-#: ../gitg/history/gitg-history.vala:251
+#: ../gitg/history/gitg-history.vala:307
msgid "Examine the history of the repository"
msgstr "Preglej zgodovino skladišča"
-#: ../gitg/history/gitg-history.vala:602
+#: ../gitg/history/gitg-history.vala:787
msgid "Mainline"
msgstr "Glavna veja"
-#: ../gitg/preferences/gitg-preferences-interface.vala:96
+#: ../gitg/preferences/gitg-preferences-commit.vala:119
+msgctxt "Preferences"
+msgid "Commit"
+msgstr "Uveljavi"
+
+#: ../gitg/preferences/gitg-preferences-interface.vala:112
msgid "Interface"
msgstr "Vmesnik"
@@ -873,39 +1204,57 @@ msgstr "%b %e %Y, %H:%M"
msgid "%b %e %Y, %I:%M %p"
msgstr "%b %e %Y, %I:%M %p"
-#: ../libgitg/gitg-diff-view.vala:249
+#: ../libgitg/gitg-diff-view.vala:282
msgid "stage"
msgstr "v pripravljenost"
-#: ../libgitg/gitg-diff-view.vala:250
+#: ../libgitg/gitg-diff-view.vala:283
msgid "unstage"
msgstr "iz pripravljenosti"
-#: ../libgitg/gitg-diff-view.vala:251
+#: ../libgitg/gitg-diff-view.vala:284
msgid "Loading diff…"
msgstr "Nalaganje programa diff ..."
-#: ../libgitg/gitg-diff-view.vala:252
+#: ../libgitg/gitg-diff-view.vala:285
msgid "Notes:"
msgstr "Opombe:"
-#: ../libgitg/gitg-diff-view.vala:253
+#: ../libgitg/gitg-diff-view.vala:286
msgid "Parents:"
msgstr "Nadrejeno:"
-#: ../libgitg/gitg-diff-view.vala:254
+#: ../libgitg/gitg-diff-view.vala:287
msgid "Diff against:"
msgstr "Primerjaj z:"
-#: ../libgitg/gitg-diff-view.vala:255
+#: ../libgitg/gitg-diff-view.vala:288
msgid "Committed by:"
msgstr "Uveljavil:"
-#: ../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 "Zapri"
+#: ../libgitg/gitg-diff-view.vala:289
+msgid "Expand all"
+msgstr "Razširi vse"
+
+#: ../libgitg/gitg-diff-view.vala:290
+msgid "Collapse all"
+msgstr "Zloži vse"
+
+#. Translators: this is used to construct: "at <directory>", to indicate where the repository is at.
+#: ../libgitg/gitg-repository-list-box.vala:175
+#, c-format
+msgid "at %s"
+msgstr "na %s"
+
+#. Translators: this is used to construct: "<branch-name> at <directory>"
+#: ../libgitg/gitg-repository-list-box.vala:184
+#, c-format
+msgid "%s at %s"
+msgstr "%s na %s"
+
+#: ../libgitg/gitg-repository-list-box.vala:423
+msgid "Cloning..."
+msgstr "Poteka kloniranje ..."
#: ../libgitg/gitg-stage.vala:334
#, c-format
@@ -914,11 +1263,11 @@ msgstr ""
"Branje sporočila uveljavitve po zagonu skriptne kljuke commit-msg je "
"spodletelo: %s"
-#: ../plugins/diff/gitg-diff.vala:106
+#: ../plugins/diff/gitg-diff.vala:120
msgid "Diff"
msgstr "Primerjava"
-#: ../plugins/diff/gitg-diff.vala:111
+#: ../plugins/diff/gitg-diff.vala:125
msgid "Show the changes introduced by the selected commit"
msgstr "Pokaži spremembe, ki so uvedene z izbrano uveljavitvijo"
@@ -930,36 +1279,21 @@ msgstr "Datoteke"
msgid "Show the files in the tree of the selected commit"
msgstr "Pokaži datoteke v drevesni strukturi za izbrano uveljavitev"
-#. ex: ts=4 noet
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1
-msgid "Author Details"
-msgstr "Podrobnosti avtorja"
-
#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:3
-#, no-c-format
-msgid "Note: The Git config file '%s' does not exist."
-msgstr "Opomba: nastavitvena datoteka git '%s' ne obstaja."
+msgid "_Save"
+msgstr "_Shrani"
#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:4
-msgid "Enter details to set as default for all repositories:"
-msgstr "Vnesite privzete podrobnosti za vsa skladišča:"
-
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
-#, no-c-format
-msgid "Enter details for repository '%s':"
-msgstr "Vnesite podrobnosti za skladišče '%s':"
-
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:7
-msgid "E-mail: "
-msgstr "Elektronska pošta:"
+msgid "Default details used for all repositories"
+msgstr "Privzeti podatki za vsa skladišča"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:8
-msgid "Name: "
-msgstr "Ime: "
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:5
+msgid "E-mail:"
+msgstr "Elektronski naslov:"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:10
-msgid "Save"
-msgstr "Shrani"
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
+msgid "Name:"
+msgstr "Ime:"
#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:1
msgid "Clone Repository"
@@ -985,6 +1319,11 @@ msgstr "Izbor mesta ..."
msgid "Bare repository"
msgstr "Golo skladišče"
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:1
+msgctxt "Create Dialog"
+msgid "Commit"
+msgstr "Uveljavi"
+
#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:3
#: ../gitg/resources/ui/gitg-commit-paned.ui.h:2
msgid "C_ommit"
@@ -1045,6 +1384,10 @@ msgstr "Datum"
msgid "Open"
msgstr "Odpri"
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
+msgid "Create Branch"
+msgstr "Ustvari vejo"
+
#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:3
#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:3
msgid "C_reate"
@@ -1054,43 +1397,53 @@ msgstr "Ustva_ri"
msgid "Branch _name:"
msgstr "Ime veje:"
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:1
+msgid "Create Tag"
+msgstr "Ustvari oznako"
+
#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:4
msgid "Tag _name:"
msgstr "Ime _oznake:"
+#: ../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-dash-view.ui.h:2
+msgid "_Add repository"
+msgstr "_Dodaj skladišče"
+
+#: ../gitg/resources/ui/gitg-dash-view.ui.h:3
+msgid "_Clone repository"
+msgstr "_Kloniraj skladišče"
+
#: ../gitg/resources/ui/gitg-menus.ui.h:1
msgid "_New Window"
msgstr "_Novo okno"
#: ../gitg/resources/ui/gitg-menus.ui.h:2
+msgid "_Author Details"
+msgstr "Podrobnosti _avtorja"
+
+#: ../gitg/resources/ui/gitg-menus.ui.h:3
msgid "_Preferences"
msgstr "_Možnosti"
-#: ../gitg/resources/ui/gitg-menus.ui.h:3
+#: ../gitg/resources/ui/gitg-menus.ui.h:4
msgid "_Help"
msgstr "Pomo_č"
-#: ../gitg/resources/ui/gitg-menus.ui.h:4
+#: ../gitg/resources/ui/gitg-menus.ui.h:5
msgid "_About"
msgstr "_O programu"
-#: ../gitg/resources/ui/gitg-menus.ui.h:5
+#: ../gitg/resources/ui/gitg-menus.ui.h:6
msgid "_Quit"
msgstr "_Končaj"
-#: ../gitg/resources/ui/gitg-menus.ui.h:6
-msgid "_Open Repository…"
-msgstr "_Odpri skladišče ..."
-
#: ../gitg/resources/ui/gitg-menus.ui.h:7
-msgid "_Clone Repository…"
-msgstr "_Kloniraj skladišče ..."
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:8
-msgid "_Author Details"
-msgstr "Podrobnosti _avtorja"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:9
msgid "_Reload"
msgstr "_Ponovno naloži"
@@ -1115,26 +1468,46 @@ msgid "Commit Message"
msgstr "Sporočilo uveljavljanja"
#: ../gitg/resources/ui/gitg-preferences-history.ui.h:1
+msgid "Default selection"
+msgstr "Privzet izbor"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
+msgid "Current branch"
+msgstr "Trenutna veja"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+msgid "All branches"
+msgstr "Vse veje"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
+msgid "References"
+msgstr "Sklici"
+
+#: ../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 "Commits"
msgstr "<b>Uveljavitve</b>"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:8
msgid "Collapse inactive lanes"
msgstr "Zloži nedejavne vrstice"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:9
msgid "Early"
msgstr "Zgodnje"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:10
msgid "Late"
msgstr "Pozno"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:11
msgid "Show history in topological order"
msgstr "Pokaži zgodovino v topološkem zaporedju"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:6
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:12
msgid "Preserve mainline for currently checked out branch"
msgstr "Ohrani glavno vrstico v trenutno dejavni veji"
@@ -1146,6 +1519,10 @@ msgstr "Zagon"
msgid "Start with activity:"
msgstr "Začni novo dejavnost:"
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:4
+msgid "Commit"
+msgstr "Uveljavi"
+
#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:5
msgid "Layout"
msgstr "Razporeditev"
@@ -1154,6 +1531,18 @@ msgstr "Razporeditev"
msgid "Use horizontal layout"
msgstr "Uporabi vodoravno razporeditev"
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:7
+msgid "Avatars"
+msgstr "Avatarji"
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:8
+msgid "Use gravatar service to provide user avatars"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:9
+msgid "Monitoring"
+msgstr "Nadziranje"
+
#: ../gitg/resources/ui/gitg-preferences.ui.h:1
msgid "Preferences"
msgstr "Možnosti"
@@ -1179,14 +1568,18 @@ msgid "Show changes inline"
msgstr "Pokaži spremembe med besedilom"
#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:3
+msgid "Wrap lines"
+msgstr "Prelomi vrstice"
+
+#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:4
msgid "Developer tools"
msgstr "Razvojna orodja"
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:4
+#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:5
msgid "Tab width"
msgstr "Širina zavihka"
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:5
+#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:6
msgid "Context"
msgstr "Vsebina"
@@ -1232,6 +1625,42 @@ msgstr "Odstrani skladišče iz seznama (ne izbriši seznama z diska)"
msgid "column"
msgstr "stolpec"
+#~ msgid "Unable to open the .gitconfig file."
+#~ msgstr "Datoteke .gitconfig ni mogoče odpreti."
+
+#~ msgid "Create Patch"
+#~ msgstr "Ustvari popravek"
+
+#~ msgid "Open Repository"
+#~ msgstr "Odpri skladišče"
+
+#~ msgid "_Open"
+#~ msgstr "_Odpri"
+
+#~ msgid "Note: The Git config file '%s' does not exist."
+#~ msgstr "Opomba: nastavitvena datoteka git '%s' ne obstaja."
+
+#~ msgid "Enter details to set as default for all repositories:"
+#~ msgstr "Vnesite privzete podrobnosti za vsa skladišča:"
+
+#~ msgid "Enter details for repository '%s':"
+#~ msgstr "Vnesite podrobnosti za skladišče '%s':"
+
+#~ msgid "E-mail: "
+#~ msgstr "Elektronska pošta:"
+
+#~ msgid "Name: "
+#~ msgstr "Ime: "
+
+#~ msgid "Save"
+#~ msgstr "Shrani"
+
+#~ msgid "_Open Repository…"
+#~ msgstr "_Odpri skladišče ..."
+
+#~ msgid "_Clone Repository…"
+#~ msgstr "_Kloniraj skladišče ..."
+
#~ msgid "Show stash in history"
#~ msgstr "Pokaži zalogo v zgodovini"
@@ -1241,9 +1670,6 @@ msgstr "stolpec"
#~ msgid "Show unstaged changes in history"
#~ msgstr "Pokaži spremembe počiščene pripravljenosti"
-#~ msgid "_Save"
-#~ msgstr "_Shrani"
-
#~ msgid "%d minutes ago"
#~ msgstr "Pred %d minutami"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
