[gitg] Updated Lithuanian translation

From: Aurimas Černius <aurimasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gitg] Updated Lithuanian translation
Date: Sat, 28 Nov 2015 16:12:47 +0000 (UTC)
commit c40b965c2e9723285a8f10c2bff99b6e997e9ccc
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sat Nov 28 18:12:27 2015 +0200

    Updated Lithuanian translation

 po/lt.po |  495 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 279 insertions(+), 216 deletions(-)
---
diff --git a/po/lt.po b/po/lt.po
index cf5c74a..473baab 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: gitg\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gitg&keywords=I18N+L10N&component=gitg\n"
-"POT-Creation-Date: 2015-08-21 05:41+0000\n"
-"PO-Revision-Date: 2015-08-21 20:08+0300\n"
+"POT-Creation-Date: 2015-11-28 07:16+0000\n"
+"PO-Revision-Date: 2015-11-28 18:11+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4 gmail com>\n"
 "Language-Team: Lietuvių <gnome-lt lists akl lt>\n"
 "Language: lt\n"
@@ -21,7 +21,7 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:58
+#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:39
 #: ../gitg/resources/ui/gitg-window.ui.h:1
 msgid "gitg"
 msgstr "gitg"
@@ -172,10 +172,22 @@ msgid "The order by which references in the history sidebar should be sorted."
 msgstr "Kokia tvarka istorijos šoniniame polangyje rikiuojamos nuorodos."
 
 #: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
+msgid "Show Upstream With Branch"
+msgstr "Rodyti šaltinį su šaka"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+msgid ""
+"Determines whether to also show the upstream (remote) tracking branch when "
+"selecting a local branch in the history view."
+msgstr ""
+"Nusako, ar taip pat rodyti šaltinio (nutolusio) sekamą šaką, kai pažymima "
+"vietinė šaka istorijos vaizde."
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
 msgid "Show Right Margin in Commit Message View"
 msgstr "Rodyti dešinę paraštę patvirtinimo pranešimo rodinyje"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
 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."
@@ -184,11 +196,11 @@ msgstr ""
 "gali būti naudojama lengvam pastebėjimui, kur laužyti patvirtinimo "
 "pranešimus."
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:32
 msgid "Column at Which Right Margin is Shown"
 msgstr "Stulpelis, kuriame rodoma dešinė paraštė"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
 msgid ""
 "The column at which the right margin is shown if the show-right-margin "
 "preference is set to TRUE."
@@ -196,11 +208,11 @@ msgstr ""
 "Stulpelis, kuriame rodoma dešinė paraštė, jei right-margin nustatymas yra "
 "nustatytas TEIGIAMAI."
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:32
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
 msgid "Show Subject Margin in Commit Message View"
 msgstr "Rodyti dešinę paraštę patvirtinimo pranešimo rodinyje"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
 msgid ""
 "Highlight the subject text of the commit message when it passes the margin "
 "specified by subject-margin-position."
@@ -208,11 +220,11 @@ msgstr ""
 "Paryškinti antraštės tekstą patvirtinimo pranešime, kai jis peržengia "
 "subject-margin-position nurodytą paraštę."
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
 msgid "Column at Which Subject Margin is Shown"
 msgstr "Stulpelis, kuriame rodoma antraštės paraštė"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:37
 msgid ""
 "The column at which the subject margin is shown if the show-subject-margin "
 "preference is set to TRUE."
@@ -220,11 +232,11 @@ msgstr ""
 "Stulpelis, kuriame rodoma antraštės paraštė, jei show-subject-margin "
 "nustatymas yra nustatytas TEIGIAMAI."
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:38
 msgid "Enable Spell Checking"
 msgstr "Įjungti rašybos tikrinimą"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:37
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:39
 msgid ""
 "Setting which determines whether or not spell checking is enabled when "
 "writing a commit message."
@@ -232,49 +244,49 @@ msgstr ""
 "Nustatymas, kuris nurodo, ar rašybos tikrinimas yra įjungtas rašant "
 "patvirtinimo pranešimą."
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:38
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:40
 msgid "Spell Checking Language"
 msgstr "Rašybos tikrinimo kalba"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:39
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:41
 msgid ""
 "The language to use when spell checking is enabled for writing a commit "
 "message."
 msgstr "Kalba, naudojama tikrinant rašybą patvirtinimo pranešimui."
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:40
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:42
 msgid "Ignore Whitespace Changes"
 msgstr "Nepaisyti nespausdinamų simbolių pakeitimų"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:41
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:43
 msgid ""
 "Setting that indicates whether to ignore whitespace changes when showing the "
 "diff of a commit."
 msgstr ""
 "To nustatymas nurodo, ar nepaisyti nespausdinamų simbolių rodant pakeitimus."
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:42
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:44
 msgid "Show Changes Inline"
 msgstr "Tiesiogiai rodyti pakeitimus"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:43
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:45
 msgid ""
 "Setting that indicates whether changes within lines should be shown inline."
 msgstr "To nustatymas nurodo, ar eilučių pakeitimus rodyti tiesiogiai."
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:44
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:46
 msgid "Wrap"
 msgstr "Laužyti"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:45
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:47
 msgid "Wrap lines."
 msgstr "Laužyti eilutes."
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:46
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:48
 msgid "Number of Before/After Context Lines"
 msgstr "Prieš/po konteksto eilučių skaičius"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:47
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:49
 msgid ""
 "Setting that determines how many lines of context (before and after) should "
 "be shown when showing the diff of a commit."
@@ -282,11 +294,11 @@ msgstr ""
 "Nustatymas, nurodantis, kiek konteksto eilučių (prieš ir po) rodyti rodant "
 "pakeitimą."
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:48
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:50
 msgid "Rendered Width of a Tab Character"
 msgstr "Tab simbolio plotis"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:49
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:51
 msgid ""
 "Setting that determines how much space a tab character should occupy when "
 "showing the diff of a commit."
@@ -294,7 +306,7 @@ msgstr ""
 "Nustatymas, nurodantis, kiek vietos turi užimti tab simbolis rodant "
 "pakeitimą."
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:50
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:52
 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."
@@ -318,7 +330,6 @@ msgid "Use amend to change the commit message of the previous commit"
 msgstr "Pakeisti prieš tai buvusio patvirtinimo pranešimą"
 
 #: ../gitg/commit/gitg-commit.vala:104
-#| msgid "Commit"
 msgctxt "Activity"
 msgid "Commit"
 msgstr "Patvirtinti"
@@ -490,12 +501,10 @@ msgstr ""
 "Ar tikrai norite visam laikui atmesti visus failų „%s“ ir „%s“ pakeitimus?"
 
 #: ../gitg/commit/gitg-commit.vala:1560
-#| msgid "Failed to delete tag %s"
 msgid "Failed to delete files"
 msgstr "Nepavyko ištrinti failų"
 
 #: ../gitg/commit/gitg-commit.vala:1576
-#| msgid "Delete"
 msgid "Delete file"
 msgid_plural "Delete files"
 msgstr[0] "Ištrinti failą"
@@ -504,13 +513,11 @@ msgstr[2] "Ištrinti failus"
 
 #: ../gitg/commit/gitg-commit.vala:1581
 #, c-format
-#| msgid "Are you sure that you want to permanently delete the tag %s?"
 msgid "Are you sure you want to permanently delete the file `%s'?"
 msgstr "Ar tikrai norite visam laikui ištrinti žymą  failą „%s“?"
 
 #: ../gitg/commit/gitg-commit.vala:1592
 #, c-format
-#| msgid "Are you sure that you want to permanently delete the tag %s?"
 msgid "Are you sure you want to permanently delete the files %s and `%s'?"
 msgstr "Ar tikrai norite visam laikui ištrinti failus %s ir „%s“?"
 
@@ -527,7 +534,6 @@ msgid "_Discard changes"
 msgstr "_Atmesti pakeitimus"
 
 #: ../gitg/commit/gitg-commit.vala:1667
-#| msgid "Delete"
 msgid "D_elete file"
 msgid_plural "D_elete files"
 msgstr[0] "Iš_trinti failą"
@@ -538,18 +544,16 @@ msgstr[2] "Iš_trinti failus"
 msgid "_Edit file"
 msgstr "_Keisti failą"
 
-#: ../gitg/gitg-action-support.vala:93
+#: ../gitg/gitg-action-support.vala:95
 #, c-format
-#| msgid "Failed to discard changes"
 msgid "Failed to stash changes: %s"
 msgstr "Nepavyko atidėti pakeitimų: %s"
 
-#: ../gitg/gitg-action-support.vala:128
-#| msgid "_Unstage changes"
+#: ../gitg/gitg-action-support.vala:130
 msgid "Unstaged changes"
 msgstr "Neparuošti pakeitimai"
 
-#: ../gitg/gitg-action-support.vala:129
+#: ../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?"
@@ -557,33 +561,48 @@ msgstr ""
 "Atrodo turite neparuoštų pakeitimų darbiniame kataloge. Ar norite juos "
 "atidėti prieš išskleidžiant?"
 
-#: ../gitg/gitg-action-support.vala:131 ../gitg/gitg-ref-action-delete.vala:88
+#: ../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 "Atsisakyti"
 
-#: ../gitg/gitg-action-support.vala:132
-#| msgid "_Stage changes"
+#: ../gitg/gitg-action-support.vala:134
 msgid "Stash changes"
 msgstr "Atidėti pakeitimus"
 
-#: ../gitg/gitg-action-support.vala:136 ../gitg/gitg-ref-action-merge.vala:199
-msgid "Merge failed with conflicts"
-msgstr "Nepavyko apjungti su konfliktais"
-
-#: ../gitg/gitg-action-support.vala:163
-#| msgid "Failed to commit"
+#: ../gitg/gitg-action-support.vala:138 ../gitg/gitg-action-support.vala:165
 msgid "Failed with conflicts"
 msgstr "Nepavyko su konfliktais"
 
-#: ../gitg/gitg-action-support.vala:179
+#: ../gitg/gitg-action-support.vala:181
 #, c-format
-#| msgid "Failed to fetch from %s: %s"
 msgid "Failed to checkout conflicts: %s"
 msgstr "Nepavyko išskleisti konfliktų: %s"
 
+#: ../gitg/gitg-action-support.vala:199
+msgid "Failed to obtain author details"
+msgstr "Nepavyko gauti autoriaus informacijos"
+
+#: ../gitg/gitg-action-support.vala:223
+#: ../gitg/gitg-ref-action-checkout.vala:88
+#, c-format
+msgid "Failed to lookup commit: %s"
+msgstr "Nepavyko surasti patvirtinimo: %s"
+
+#: ../gitg/gitg-action-support.vala:255
+#, c-format
+msgid "Failed to create commit: %s"
+msgstr "Nepavyko sukurti patvirtinimo: %s"
+
+#: ../gitg/gitg-action-support.vala:277
+#, c-format
+msgid "Failed to checkout index: %s"
+msgstr "Nepavyko išskleisti indekso: %s"
+
 #: ../gitg/gitg-application.vala:56
 msgid "Show the application's version"
 msgstr "Rodyti programos versiją"
@@ -616,7 +635,27 @@ msgstr ""
 
 #: ../gitg/gitg-application.vala:234
 msgid "gitg homepage"
-msgstr "gitg namų tinklapis"
+msgstr "gitg namų tinklalapis"
+
+#: ../gitg/gitg-application.vala:332
+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 ""
+"Atsiprašome, bet gitg reikalauja, kad libgit2 (naudojama biblioteka) būtų "
+"sukompiliuota su gijų palaikymu.\n"
+"\n"
+"Jei pats sukompiliavote libgit2, tuomet konfigūruokite su -DTHREADSAFE:"
+"BOOL=ON.\n"
+"\n"
+"Priešingu atveju praneškite apie klaidą savo distribucijos klaidų sistemoje, "
+"prašydami pateikti libgit2 su gijų palaikymu."
 
 #. ex: ts=4 noet
 #: ../gitg/gitg-author-details-dialog.vala:85
@@ -626,14 +665,12 @@ msgid "Author Details"
 msgstr "Autoriaus informacija"
 
 #: ../gitg/gitg-author-details-dialog.vala:86
-#| msgid "Enter details to set as default for all repositories:"
 msgid "Enter default details used for all repositories:"
 msgstr "Įveskite numatytąją informaciją visoms saugykloms:"
 
 #. Translators: %s is the repository name
 #: ../gitg/gitg-author-details-dialog.vala:108
 #, c-format
-#| msgid "Enter details for repository '%s':"
 msgid "Override global details for repository '%s':"
 msgstr "Pakeisti visuotinę informaciją saugyklai „%s“:"
 
@@ -645,8 +682,92 @@ msgstr "Nepavyko nustatyti Git naudotojo konfigūracijos."
 msgid "The URL introduced is not supported"
 msgstr "Įtrauktas URL nepalaikomas"
 
+#: ../gitg/gitg-commit-action-cherry-pick.vala:53
+msgid "Cherry pick onto"
+msgstr "Perkelti į"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:58
+msgid "Cherry pick this commit onto a branch"
+msgstr "Perkelti šį patvirtinimą į šaką"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:117
+#, c-format
+#| msgid "Failed to lookup their commit: %s"
+msgid "Failed to lookup the commit for branch %s: %s"
+msgstr "Nepavyko surasti patvirtinimo šakai %s: %s"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:132
+#, c-format
+#| msgid "Failed to create commit: %s"
+msgid "Failed to cherry-pick the commit: %s"
+msgstr "Nepavyko perkelti patvirtinimo: %s"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:144
+#: ../gitg/gitg-commit-action-cherry-pick.vala:160
+#| msgid "Merge has conflicts"
+msgid "Cherry pick has conflicts"
+msgstr "Perkėlime yra konfliktų"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:153
+#, 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?"
+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 ""
+"%s perkėlimas į %s sukėlė konfliktų, ar norite išskleisti šaką %s su "
+"perkėlimu į darbinį katalogą konfliktams išspręsti?"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:157
+#, 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?"
+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 ""
+"%s perkėlimas į %s sukėlė konfliktų, ar norite išskleisti perkėlimą į "
+"darbinį katalogą konfliktams išspręsti?"
+
+#: ../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 "Išskleisti"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:168
+#| msgid "Merge failed with conflicts"
+msgid "Cherry pick failed with conflicts"
+msgstr "Perkelti nepavyko su konfliktais"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:179
+#| msgid "Finished merge with conflicts in working directory"
+msgid "Cherry pick finished with conflicts in working directory"
+msgstr "Baigtas perkėlimas su konfliktais darbiniame kataloge"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:199
+#, c-format
+#| msgid "Merge %s into %s"
+msgid "Cherry pick %s onto %s"
+msgstr "Perkelti %s į %s"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:224
+#| msgid "Successfully merged %s into %s"
+msgid "Successfully cherry picked"
+msgstr "Sėkmingai perkelta"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:261
+#, c-format
+#| msgid "Merge into %s"
+msgid "Cherry pick onto %s"
+msgstr "Perkelti į %s"
+
 #: ../gitg/gitg-commit-action-create-branch.vala:48
-#| msgid "Create Branch"
 msgid "Create branch"
 msgstr "Sukurti šaką"
 
@@ -659,7 +780,6 @@ msgid "Failed to create branch"
 msgstr "Nepavyko sukurti šakos"
 
 #: ../gitg/gitg-commit-action-create-patch.vala:63
-#| msgid "Create Patch"
 msgid "Create patch"
 msgstr "Sukurti pataisą"
 
@@ -680,7 +800,6 @@ msgid "Failed to create patch"
 msgstr "Nepavyko sukurti pataisos"
 
 #: ../gitg/gitg-commit-action-create-tag.vala:48
-#| msgid "Create Tag"
 msgid "Create tag"
 msgstr "Sukurti žymą"
 
@@ -718,17 +837,14 @@ msgid "In the mean time, you may want to %sset up your git profile%s."
 msgstr "Tuo tarpu jūs gal norite %snustatyti savo git profilius%s."
 
 #: ../gitg/gitg-dash-view.vala:395
-#| msgid "Failed to commit"
 msgid "Failed to clone repository"
 msgstr "Nepavyko klonuoti saugyklos"
 
 #: ../gitg/gitg-dash-view.vala:443
-#| msgid "Failed to pass pre-commit"
 msgid "Failed to add repository"
 msgstr "Nepavyko pridėti saugyklos"
 
 #: ../gitg/gitg-dash-view.vala:459
-#| msgid "Bare repository"
 msgid "Create new repository"
 msgstr "Sukurti naują saugyklą"
 
@@ -743,12 +859,10 @@ msgstr ""
 "naują git saugyklą šioje vietoje?"
 
 #: ../gitg/gitg-dash-view.vala:468
-#| msgid "Bare repository"
 msgid "Create repository"
 msgstr "Sukurti saugyklą"
 
 #: ../gitg/gitg-dash-view.vala:484
-#| msgid "Failed to create patch"
 msgid "Failed to create repository"
 msgstr "Nepavyko sukurti saugyklos"
 
@@ -758,7 +872,6 @@ msgid "Scanning for repositories in %s"
 msgstr "Ieškomą saugyklų aplanke %s"
 
 #: ../gitg/gitg-dash-view.vala:595
-#| msgid "Open Repository"
 msgid "Add Repository"
 msgstr "Pridėti saugyklą"
 
@@ -767,17 +880,10 @@ msgid "_Add"
 msgstr "_Pridėti"
 
 #: ../gitg/gitg-dash-view.vala:601
-#| msgid "Do not try to load a repository from the current working directory"
 msgid "_Scan for all git repositories from this directory"
 msgstr "_Ieškoti visų git saugyklų nuo šio katalogo"
 
-#: ../gitg/gitg-ref-action-checkout.vala:48
-#: ../gitg/gitg-ref-action-merge.vala:195
-msgid "Checkout"
-msgstr "Išskleisti"
-
 #: ../gitg/gitg-ref-action-checkout.vala:53
-#| msgid "Delete the selected reference"
 msgid "Checkout the selected reference"
 msgstr "Išskleisti pažymėtą nuorodą"
 
@@ -786,21 +892,13 @@ msgstr "Išskleisti pažymėtą nuorodą"
 msgid "Checkout %s"
 msgstr "Išskleisti %s"
 
-#: ../gitg/gitg-ref-action-checkout.vala:88
-#, c-format
-#| msgid "Failed to lookup tag"
-msgid "Failed to lookup commit: %s"
-msgstr "Nepavyko surasti patvirtinimo: %s"
-
 #: ../gitg/gitg-ref-action-checkout.vala:101
 #, c-format
-#| msgid "Failed to delete branch %s"
 msgid "Failed to checkout branch: %s"
 msgstr "Nepavyko išskleisti šakos: %s"
 
 #: ../gitg/gitg-ref-action-checkout.vala:111
 #, c-format
-#| msgid "Failed to delete tag %s"
 msgid "Failed to update HEAD: %s"
 msgstr "Nepavyko atnaujinti HEAD: %s"
 
@@ -935,7 +1033,6 @@ msgstr "Įlieti kitą šaką į %s"
 
 #: ../gitg/gitg-ref-action-merge.vala:106
 #, c-format
-#| msgid "Failed to commit"
 msgid "Failed to merge commits: %s"
 msgstr "Nepavyko sulieti patvirtinimų: %s"
 
@@ -962,6 +1059,10 @@ msgstr ""
 "%s suliejimas su %s sukėlė konfliktų, ar norite išskleisti sujungimą į "
 "darbinį katalogą konfliktams išspręsti?"
 
+#: ../gitg/gitg-ref-action-merge.vala:199
+msgid "Merge failed with conflicts"
+msgstr "Nepavyko apjungti su konfliktais"
+
 #: ../gitg/gitg-ref-action-merge.vala:210
 msgid "Finished merge with conflicts in working directory"
 msgstr "Baigtas suliejimas su konfliktais darbiniame kataloge"
@@ -973,52 +1074,26 @@ msgstr "Sulieti %s su %s"
 
 #: ../gitg/gitg-ref-action-merge.vala:231
 #, c-format
-#| msgid "Failed to lookup tag"
 msgid "Failed to lookup our commit: %s"
 msgstr "Nepavyko surasti mūsų patvirtinimo: %s"
 
 #: ../gitg/gitg-ref-action-merge.vala:241
 #, c-format
-#| msgid "Failed to lookup tag"
 msgid "Failed to lookup their commit: %s"
 msgstr "Nepavyko surasti jų patvirtinimo: %s"
 
-#: ../gitg/gitg-ref-action-merge.vala:262
-#| msgid "Failed to stage the file `%s'"
-msgid "Failed to obtain author details"
-msgstr "Nepavyko gauti autoriaus informacijos"
-
-#: ../gitg/gitg-ref-action-merge.vala:298
-#, c-format
-#| msgid "Failed to stage the file `%s'"
-msgid "Failed to obtain HEAD tree: %s"
-msgstr "Nepavyko gauti HEAD medžio: %s"
-
-#: ../gitg/gitg-ref-action-merge.vala:316
-#, c-format
-#| msgid "Failed to create tag"
-msgid "Failed to create commit: %s"
-msgstr "Nepavyko sukurti patvirtinimo: %s"
-
-#: ../gitg/gitg-ref-action-merge.vala:338
-#, c-format
-#| msgid "Failed to fetch from %s: %s"
-msgid "Failed to checkout index: %s"
-msgstr "Nepavyko išskleisti indekso: %s"
-
-#: ../gitg/gitg-ref-action-merge.vala:343
+#: ../gitg/gitg-ref-action-merge.vala:278
 #, c-format
 msgid "Successfully merged %s into %s"
 msgstr "Sėkmingai sulieta %s su %s"
 
-#: ../gitg/gitg-ref-action-merge.vala:383
+#: ../gitg/gitg-ref-action-merge.vala:320
 #, c-format
-#| msgid "Delete branch %s"
 msgid "Merge %s into branch %s"
 msgstr "Sulieti %s su %s"
 
-#: ../gitg/gitg-ref-action-merge.vala:545
-#: ../gitg/history/gitg-history-refs-list.vala:1139
+#: ../gitg/gitg-ref-action-merge.vala:482
+#: ../gitg/history/gitg-history-refs-list.vala:1176
 msgid "Tags"
 msgstr "Žymos"
 
@@ -1043,36 +1118,16 @@ msgstr "Netinkamas pavadinimas"
 msgid "Failed to rename"
 msgstr "Nepavyko pervadinti"
 
-#: ../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"
-"\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 ""
-"Atsiprašome, bet gitg reikalauja, kad libgit2 (naudojama biblioteka) būtų "
-"sukompiliuota su gijų palaikymu.\n"
-"\n"
-"Jei pats sukompiliavote libgit2, tuomet konfigūruokite su -DTHREADSAFE:"
-"BOOL=ON.\n"
-"\n"
-"Priešingu atveju praneškite apie klaidą savo distribucijos klaidų sistemoje, "
-"prašydami pateikti libgit2 su gijų palaikymu."
-
-#: ../gitg/gitg-window.vala:410
+#: ../gitg/gitg-window.vala:413
 msgid "Projects"
 msgstr "Projektai"
 
-#: ../gitg/gitg-window.vala:826
+#: ../gitg/gitg-window.vala:841
 #, c-format
 msgid "'%s' is not a Git repository."
 msgstr "„%s“ nėra Git saugykla."
 
-#: ../gitg/gitg-window.vala:975
+#: ../gitg/gitg-window.vala:990
 msgid ""
 "Your user name and email are not configured yet. Please go to the user "
 "configuration and provide your name and email."
@@ -1080,7 +1135,7 @@ msgstr ""
 "Jūsų naudotojo vardas ir el. paštas dar nenustatyti. Eikite į naudotojo "
 "konfigūraciją ir nurodykite savo vardą ir el. paštą."
 
-#: ../gitg/gitg-window.vala:979
+#: ../gitg/gitg-window.vala:994
 msgid ""
 "Your user name is not configured yet. Please go to the user configuration "
 "and provide your name."
@@ -1088,7 +1143,7 @@ msgstr ""
 "Jūsų naudotojo vardas dar nenustatyta. Eikite į naudojo konfigūraciją ir "
 "nurodykite savo vardą."
 
-#: ../gitg/gitg-window.vala:983
+#: ../gitg/gitg-window.vala:998
 msgid ""
 "Your email is not configured yet. Please go to the user configuration and "
 "provide your email."
@@ -1096,8 +1151,7 @@ msgstr ""
 "Jūsų el. paštas dar nenustatytas. Eikite į naudotojo konfigūraciją ir "
 "nurodykite savo el. paštą."
 
-#: ../gitg/gitg-window.vala:986
-#| msgid "Author Details"
+#: ../gitg/gitg-window.vala:1001
 msgid "Missing author details"
 msgstr "Trūksta autoriaus informacijos"
 
@@ -1131,35 +1185,49 @@ msgstr "Numatytai pažymėti nurodytą nuorodą istorijos veikloje"
 msgid "REFERENCE"
 msgstr "NUORODA"
 
-#: ../gitg/history/gitg-history-refs-list.vala:170
+#: ../gitg/history/gitg-history-refs-list.vala:165
+#, c-format
+msgid "%d ahead, %d behind"
+msgstr "%d priešakyje, nuo %d atsiliekama"
+
+#: ../gitg/history/gitg-history-refs-list.vala:169
+#, c-format
+msgid "%d ahead"
+msgstr "%d priešakyje"
+
+#: ../gitg/history/gitg-history-refs-list.vala:173
+#, c-format
+msgid "%d behind"
+msgstr "atsiliekama %d"
+
+#: ../gitg/history/gitg-history-refs-list.vala:207
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
 msgid "All commits"
 msgstr "Visi pakeitimai"
 
-#: ../gitg/history/gitg-history-refs-list.vala:1137
+#: ../gitg/history/gitg-history-refs-list.vala:1174
 msgid "Branches"
 msgstr "Šakos"
 
-#: ../gitg/history/gitg-history-refs-list.vala:1138
+#: ../gitg/history/gitg-history-refs-list.vala:1175
 msgid "Remotes"
 msgstr "Nutolusios saugyklos"
 
-#: ../gitg/history/gitg-history.vala:302
-#: ../gitg/preferences/gitg-preferences-history.vala:210
+#: ../gitg/history/gitg-history.vala:306
+#: ../gitg/preferences/gitg-preferences-history.vala:218
 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:3
 msgid "History"
 msgstr "Istorija"
 
-#: ../gitg/history/gitg-history.vala:307
+#: ../gitg/history/gitg-history.vala:311
 msgid "Examine the history of the repository"
 msgstr "Naršyti saugyklos istoriją"
 
-#: ../gitg/history/gitg-history.vala:787
+#: ../gitg/history/gitg-history.vala:796
 msgid "Mainline"
 msgstr "Pagrindinė linija"
 
 #: ../gitg/preferences/gitg-preferences-commit.vala:119
-#| msgid "Commit"
 msgctxt "Preferences"
 msgid "Commit"
 msgstr "Patvirtinimas"
@@ -1228,42 +1296,20 @@ msgstr "%Y %b %e, %H:%M"
 msgid "%b %e %Y, %I:%M %p"
 msgstr "%Yn%b %e, %I:%M"
 
-#: ../libgitg/gitg-diff-view.vala:282
-msgid "stage"
-msgstr "paruošti"
-
-#: ../libgitg/gitg-diff-view.vala:283
-msgid "unstage"
-msgstr "atšaukti paruošimą"
-
-#: ../libgitg/gitg-diff-view.vala:284
-msgid "Loading diff…"
-msgstr "Įkeliami skirtumai…"
-
-#: ../libgitg/gitg-diff-view.vala:285
-msgid "Notes:"
-msgstr "Pastabos:"
-
-#: ../libgitg/gitg-diff-view.vala:286
-msgid "Parents:"
-msgstr "Tėvai:"
-
-#: ../libgitg/gitg-diff-view.vala:287
-msgid "Diff against:"
-msgstr "Skirtumai su:"
-
-#: ../libgitg/gitg-diff-view.vala:288
-msgid "Committed by:"
-msgstr "Patvirtino:"
+#: ../libgitg/gitg-diff-view-commit-details.vala:134
+msgid "Collapse all"
+msgstr "Suskleisti viską"
 
-#: ../libgitg/gitg-diff-view.vala:289
+#: ../libgitg/gitg-diff-view-commit-details.vala:138
+#: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:2
 msgid "Expand all"
 msgstr "Išskleisti viską"
 
-#: ../libgitg/gitg-diff-view.vala:290
-#| msgid "Collapse inactive lanes"
-msgid "Collapse all"
-msgstr "Suskleisti viską"
+#: ../libgitg/gitg-diff-view-commit-details.vala:191
+#, c-format
+#| msgid "Committed by:"
+msgid "Committed by %s"
+msgstr "Patvirtino %s"
 
 #. Translators: this is used to construct: "at <directory>", to indicate where the repository is at.
 #: ../libgitg/gitg-repository-list-box.vala:175
@@ -1278,8 +1324,9 @@ msgid "%s at %s"
 msgstr "%s ties %s"
 
 #: ../libgitg/gitg-repository-list-box.vala:423
-msgid "Cloning..."
-msgstr "Klonuojama..."
+#| msgid "Cloning..."
+msgid "Cloning…"
+msgstr "Klonuojama…"
 
 #: ../libgitg/gitg-stage.vala:334
 #, c-format
@@ -1287,11 +1334,11 @@ msgid "Could not read commit message after running commit-msg hook: %s"
 msgstr ""
 "Nepayvko perskaityti patvirtinimo pranešimo vykdant commit-msg susiejimą: %s"
 
-#: ../plugins/diff/gitg-diff.vala:120
+#: ../plugins/diff/gitg-diff.vala:114
 msgid "Diff"
 msgstr "Diff"
 
-#: ../plugins/diff/gitg-diff.vala:125
+#: ../plugins/diff/gitg-diff.vala:119
 msgid "Show the changes introduced by the selected commit"
 msgstr "Rodyti pasirinkto patvirtinimo atliktus pakeitimus"
 
@@ -1304,22 +1351,18 @@ msgid "Show the files in the tree of the selected commit"
 msgstr "Rodyti pasirinkto patvirtinimo failus medyje"
 
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:3
-#| msgid "Save"
 msgid "_Save"
 msgstr "Į_rašyti"
 
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:4
-#| msgid "Enter details to set as default for all repositories:"
 msgid "Default details used for all repositories"
 msgstr "Numatytoji informaciją visoms saugykloms"
 
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:5
-#| msgid "E-mail: "
 msgid "E-mail:"
 msgstr "El. paštas:"
 
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
-#| msgid "Name: "
 msgid "Name:"
 msgstr "Vardas:"
 
@@ -1348,7 +1391,6 @@ msgid "Bare repository"
 msgstr "Tuščia saugykla"
 
 #: ../gitg/resources/ui/gitg-commit-dialog.ui.h:1
-#| msgid "Commit"
 msgctxt "Create Dialog"
 msgid "Commit"
 msgstr "Patvirtinti"
@@ -1443,12 +1485,10 @@ msgstr ""
 "esamą."
 
 #: ../gitg/resources/ui/gitg-dash-view.ui.h:2
-#| msgid "Bare repository"
 msgid "_Add repository"
 msgstr "_Pridėti saugyklą"
 
 #: ../gitg/resources/ui/gitg-dash-view.ui.h:3
-#| msgid "Clone Repository"
 msgid "_Clone repository"
 msgstr "_Klonuoti saugyklą"
 
@@ -1501,22 +1541,18 @@ msgid "Commit Message"
 msgstr "Patvirtinimo pranešimas"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:1
-#| msgid "D_iscard selection"
 msgid "Default selection"
 msgstr "Numatytasis pasirinkimas"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
-#| msgid "Create Branch"
 msgid "Current branch"
 msgstr "Dabartinė šaka"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
-#| msgid "Branches"
 msgid "All branches"
 msgstr "Visos šakos"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
-#| msgid "Preferences"
 msgid "References"
 msgstr "Nuorodos"
 
@@ -1525,26 +1561,30 @@ msgid "Sort references in the sidebar by latest activity"
 msgstr "Rikiuoti nuorodas šoniniame polangyje pagal paskutinę veiklą"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:7
+msgid "Show upstream (remote) branch when selecting a local branch"
+msgstr "Rodyti šaltinio (nutolusio) šaką pažymint vietinę šaką"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:8
 msgid "Commits"
 msgstr "Pakeitimai"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:8
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:9
 msgid "Collapse inactive lanes"
 msgstr "Sutraukti neaktyvias eilutes"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:9
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:10
 msgid "Early"
 msgstr "Anksti"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:10
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:11
 msgid "Late"
 msgstr "Vėlai"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:11
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:12
 msgid "Show history in topological order"
 msgstr "Rodyti istoriją topologijos tvarka"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:12
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:13
 msgid "Preserve mainline for currently checked out branch"
 msgstr "Išlaikyti pagrindinę liniją šiuo metu išskleistai šakai"
 
@@ -1596,30 +1636,6 @@ msgstr "Surasti žodį ar frazę"
 msgid "General settings and options"
 msgstr "Bendri nustatymai ir parametrai"
 
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:1
-msgid "Ignore whitespace changes"
-msgstr "Nepaisyti nespausdinamų simbolių pakeitimų"
-
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:2
-msgid "Show changes inline"
-msgstr "Rodyti pakeitimus tiesiogiai"
-
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:3
-msgid "Wrap lines"
-msgstr "Laužyti eilutes"
-
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:4
-msgid "Developer tools"
-msgstr "Kūrėjo įrankiai"
-
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:5
-msgid "Tab width"
-msgstr "Tab plotis"
-
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:6
-msgid "Context"
-msgstr "Kontekstas"
-
 #: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:2
 msgid "_Authenticate"
 msgstr "_Patvirtinti tapatybę"
@@ -1652,6 +1668,31 @@ msgstr "Įsiminti slaptažodį iki _atsijungimo"
 msgid "Remember _forever"
 msgstr "Įsiminti _visam laikui"
 
+#: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:1
+#| msgid "Parents:"
+msgid "Parents"
+msgstr "Tėvai"
+
+#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:1
+msgid "Ignore whitespace changes"
+msgstr "Nepaisyti nespausdinamų simbolių pakeitimų"
+
+#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:2
+msgid "Show changes inline"
+msgstr "Rodyti pakeitimus tiesiogiai"
+
+#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:3
+msgid "Wrap lines"
+msgstr "Laužyti eilutes"
+
+#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:4
+msgid "Tab width"
+msgstr "Tab plotis"
+
+#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:5
+msgid "Context"
+msgstr "Kontekstas"
+
 #: ../libgitg/resources/ui/gitg-repository-list-box-row.ui.h:1
 msgid ""
 "Remove the repository from the list (does not delete the repository from "
@@ -1662,6 +1703,28 @@ msgstr "Pašalinti saugyklą iš sąrašo (neištrina saugyklos iš disko)"
 msgid "column"
 msgstr "stulpelis"
 
+#~| msgid "Failed to stage the file `%s'"
+#~ msgid "Failed to obtain HEAD tree: %s"
+#~ msgstr "Nepavyko gauti HEAD medžio: %s"
+
+#~ msgid "stage"
+#~ msgstr "paruošti"
+
+#~ msgid "unstage"
+#~ msgstr "atšaukti paruošimą"
+
+#~ msgid "Loading diff…"
+#~ msgstr "Įkeliami skirtumai…"
+
+#~ msgid "Notes:"
+#~ msgstr "Pastabos:"
+
+#~ msgid "Diff against:"
+#~ msgstr "Skirtumai su:"
+
+#~ msgid "Developer tools"
+#~ msgstr "Kūrėjo įrankiai"
+
 #~ msgid "Unable to open the .gitconfig file."
 #~ msgstr "Nepavyko atverti .gitconfig failo."
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]