[gitg] Update Hebrew translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Update Hebrew translation
- Date: Wed, 30 Sep 2020 12:18:13 +0000 (UTC)
commit 6e12068f5ab9d9e76c27b1207d4133ac82472a24
Author: Yosef Or Boczko <yoseforb gnome org>
Date: Wed Sep 30 12:18:06 2020 +0000
Update Hebrew translation
po/he.po | 2201 +++++++++++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 1686 insertions(+), 515 deletions(-)
---
diff --git a/po/he.po b/po/he.po
index e3698756..f0ba9d26 100644
--- a/po/he.po
+++ b/po/he.po
@@ -2,37 +2,110 @@
# Copyright (C) 2014 THE gitg'S COPYRIGHT HOLDER
# This file is distributed under the same license as the gitg package.
# יוסף אור בוצ׳קו <yoseforb gmail com>, 2014.
-# Yosef Or Boczko <yoseforb gnome org>, 2014, 2015.
+# Yosef Or Boczko <yoseforb gmail com>, 2014-2020.
#
msgid ""
msgstr ""
"Project-Id-Version: gitg 0.2.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-17 11:22+0200\n"
-"PO-Revision-Date: 2015-03-17 11:22+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gitg/issues\n";
+"POT-Creation-Date: 2020-07-12 12:36+0000\n"
+"PO-Revision-Date: 2020-09-30 15:17+0300\n"
"Last-Translator: Yosef Or Boczko <yoseforb gmail com>\n"
-"Language-Team: עברית <>\n"
+"Language-Team: Hebrew <yoseforb gmail com>\n"
"Language: he\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n>2||n==0) ? 1 : 2;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n>2||n==0) ? 1 : 2\n"
+"X-Generator: Gtranslator 3.36.0\n"
-#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:54
-#: ../gitg/resources/ui/gitg-window.ui.h:1
+#: contrib/xml/xml-reader.c:327
+#, c-format
+msgid "Could not parse XML from stream"
+msgstr ""
+
+#: data/org.gnome.gitg.appdata.xml.in.in:5 gitg/gitg.vala:39
+#: gitg/resources/ui/gitg-window.ui:8
msgid "gitg"
msgstr "gitg"
-#: ../data/gitg.desktop.in.in.h:2
+#: data/org.gnome.gitg.appdata.xml.in.in:9
+msgid "Graphical user interface for git"
+msgstr ""
+
+#: data/org.gnome.gitg.appdata.xml.in.in:11
+msgid ""
+"gitg is a graphical user interface for git. It aims at being a small, fast "
+"and convenient tool to visualize the history of git repositories. Besides "
+"visualization, gitg also provides several utilities to manage your "
+"repository and commit your work."
+msgstr ""
+
+#: data/org.gnome.gitg.appdata.xml.in.in:17
+msgid "Goals:"
+msgstr ""
+
+#: data/org.gnome.gitg.appdata.xml.in.in:19
+#, fuzzy
+#| msgid "Show the list of recently used repositories"
+msgid "Browse local git repositories"
+msgstr "הצגת רשימת המאגרים האחרונים בשימוש"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:20
+msgid "Clone local and remote git repositories"
+msgstr ""
+
+#: data/org.gnome.gitg.appdata.xml.in.in:21
+#, fuzzy
+#| msgid "Commits"
+msgid "Commit files"
+msgstr "הגשות"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:22
+#, fuzzy
+#| msgid "Create a patch from the selected commit"
+msgid "Retrieve patch from a commit"
+msgstr "יצירת טלאי מההגשה הנבחרת"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:32
+#, fuzzy
+#| msgid "Bare repository"
+msgid "Browse repository history"
+msgstr "חשיפת מאגר"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:36
+msgid "Staging area to compose your commit"
+msgstr ""
+
+#: data/org.gnome.gitg.appdata.xml.in.in:40
+#, fuzzy
+#| msgid "Show Unstaged Changes"
+msgid "Commit staged changes"
+msgstr "Show Unstaged Changes"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:44
+#, fuzzy
+#| msgid "Show the list of recently used repositories"
+msgid "Overview of recently used repositories"
+msgstr "הצגת רשימת המאגרים האחרונים בשימוש"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:105
+msgid "The GNOME Project"
+msgstr ""
+
+#: data/org.gnome.gitg.desktop.in.in:3
+msgid "@binary@"
+msgstr ""
+
+#: data/org.gnome.gitg.desktop.in.in:4
msgid "Git repository browser"
msgstr "דפדפן מאגרי Git"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:1
+#: data/org.gnome.gitg.gschema.xml.in:28
msgid "Default Clone Directory"
msgstr "Default Clone Directory"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:2
+#: data/org.gnome.gitg.gschema.xml.in:29
msgid ""
"The default directory in which new repositories should be suggested to be "
"cloned."
@@ -40,35 +113,107 @@ msgstr ""
"The default directory in which new repositories should be suggested to be "
"cloned."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:3
+#: data/org.gnome.gitg.gschema.xml.in:38
msgid "Orientation of the main interface (vertical or horizontal)"
msgstr "Orientation of the main interface (vertical or horizontal)"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:4
+#: data/org.gnome.gitg.gschema.xml.in:39
msgid "Setting that sets the orientation of the main interface."
msgstr "Setting that sets the orientation of the main interface."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:5
+#: data/org.gnome.gitg.gschema.xml.in:45
msgid "Default Activity"
msgstr "Default Activity"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:6
+#: data/org.gnome.gitg.gschema.xml.in:46
msgid "The activity which gitg activates by default when first launched."
msgstr "The activity which gitg activates by default when first launched."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
+#: data/org.gnome.gitg.gschema.xml.in:52
+msgid "Use Default Font"
+msgstr "Use Default Font"
+
+#: data/org.gnome.gitg.gschema.xml.in:53
+msgid ""
+"Whether to use the system’s default fixed width font for widget's text "
+"instead of a font specific. If this option is turned off, then the font "
+"named in the “Editor Font” option will be used instead of the system font."
+msgstr ""
+"Whether to use the system’s default fixed width font for widget's text "
+"instead of a font specific. If this option is turned off, then the font "
+"named in the “Editor Font” option will be used instead of the system font."
+
+#. Translators: This is a GSettings default value. Do NOT change or localize the quotation marks!
+#: data/org.gnome.gitg.gschema.xml.in:57
+msgid "'Monospace 12'"
+msgstr "'Monospace 12'"
+
+#: data/org.gnome.gitg.gschema.xml.in:58
+msgid "Editor Font"
+msgstr "Editor Font"
+
+#: data/org.gnome.gitg.gschema.xml.in:59
+msgid ""
+"A custom font that will be used for the text widgets. This will only take "
+"effect if the “Use Default Font” option is turned off."
+msgstr ""
+"A custom font that will be used for the text widgets. This will only take "
+"effect if the “Use Default Font” option is turned off."
+
+#: data/org.gnome.gitg.gschema.xml.in:63
+msgid "Use Gravatar"
+msgstr "Use Gravatar"
+
+#: data/org.gnome.gitg.gschema.xml.in:64
+msgid "Enable the use of gravatar to display user avatars."
+msgstr "Enable the use of gravatar to display user avatars."
+
+#: data/org.gnome.gitg.gschema.xml.in:70
+msgid "Enable Monitoring"
+msgstr "Enable Monitoring"
+
+#: data/org.gnome.gitg.gschema.xml.in:71
+#: gitg/resources/ui/gitg-preferences-interface.ui:188
+msgid "Automatically update when external changes to .git are detected"
+msgstr "Automatically update when external changes to .git are detected"
+
+#: data/org.gnome.gitg.gschema.xml.in:77
+msgid "Enable Diff Highlighting"
+msgstr "Enable Diff Highlighting"
+
+#: data/org.gnome.gitg.gschema.xml.in:78
+#| msgid ""
+#| "Setting which determines whether or not spell checking is enabled when "
+#| "writing a commit message."
+msgid ""
+"Setting that determines whether to enable syntax highlighting in diff views."
+msgstr ""
+"Setting that determines whether to enable syntax highlighting in diff views."
+
+#: data/org.gnome.gitg.gschema.xml.in:85
+msgid "Color scheme to use for syntax highlighting"
+msgstr "Color scheme to use for syntax highlighting"
+
+#: data/org.gnome.gitg.gschema.xml.in:86
+msgid "Used by GtkSourceView to determine colors for syntax highlighting"
+msgstr "Used by GtkSourceView to determine colors for syntax highlighting"
+
+#: data/org.gnome.gitg.gschema.xml.in:92
msgid "When to Collapse Inactive Lanes"
msgstr "When to Collapse Inactive Lanes"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
+#: data/org.gnome.gitg.gschema.xml.in:93
+#| msgid ""
+#| "Setting that indicates when an inactive lane should be collapsed. Valid "
+#| "values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
msgid ""
"Setting that indicates when an inactive lane should be collapsed. Valid "
-"values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
+"values are 0 — 4, where 0 indicates “early” and 4 indicates “late”."
msgstr ""
"Setting that indicates when an inactive lane should be collapsed. Valid "
-"values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
+"values are 0 — 4, where 0 indicates “early” and 4 indicates “late”."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+#: data/org.gnome.gitg.gschema.xml.in:100
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 "
@@ -80,31 +225,31 @@ msgstr ""
"lot of parallel development. See collapse-inactive-lanes to control when "
"lanes should be collapsed."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
+#: data/org.gnome.gitg.gschema.xml.in:109
msgid "Show History in Topological Order"
msgstr "Show History in Topological Order"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
+#: data/org.gnome.gitg.gschema.xml.in:110
msgid ""
"Setting that indicates whether to show the history in topological order."
msgstr ""
"Setting that indicates whether to show the history in topological order."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+#: data/org.gnome.gitg.gschema.xml.in:116
msgid "Show Stashed Changes"
msgstr "Show Stashed Changes"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
+#: data/org.gnome.gitg.gschema.xml.in:117
msgid ""
"Setting that indicates whether to show items for the stash in the history."
msgstr ""
"Setting that indicates whether to show items for the stash in the history."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
+#: data/org.gnome.gitg.gschema.xml.in:124
msgid "Show Staged Changes"
msgstr "Show Staged Changes"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
+#: data/org.gnome.gitg.gschema.xml.in:125
msgid ""
"Setting that indicates whether to show a virtual item for the currently "
"staged changes in the history."
@@ -112,11 +257,11 @@ msgstr ""
"Setting that indicates whether to show a virtual item for the currently "
"staged changes in the history."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
+#: data/org.gnome.gitg.gschema.xml.in:132
msgid "Show Unstaged Changes"
msgstr "Show Unstaged Changes"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
+#: data/org.gnome.gitg.gschema.xml.in:133
msgid ""
"Setting that indicates whether to show a virtual item for the currently "
"unstaged changes in the history."
@@ -124,11 +269,11 @@ msgstr ""
"Setting that indicates whether to show a virtual item for the currently "
"unstaged changes in the history."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
+#: data/org.gnome.gitg.gschema.xml.in:140
msgid "Mainline Head"
msgstr "Mainline Head"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
+#: data/org.gnome.gitg.gschema.xml.in:141
msgid ""
"Setting that indicates whether to always preserve a mainline in the history "
"for the current HEAD."
@@ -136,11 +281,55 @@ msgstr ""
"Setting that indicates whether to always preserve a mainline in the history "
"for the current HEAD."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
+#: data/org.gnome.gitg.gschema.xml.in:148
+msgid "Default selection of the history activity"
+msgstr "Default selection of the history activity"
+
+#: data/org.gnome.gitg.gschema.xml.in:149
+msgid ""
+"Setting that determines the default selection on startup of the history "
+"activity."
+msgstr ""
+"Setting that determines the default selection on startup of the history "
+"activity."
+
+#: data/org.gnome.gitg.gschema.xml.in:155
+msgid "Reference Sort Order"
+msgstr "Reference Sort Order"
+
+#: data/org.gnome.gitg.gschema.xml.in:156
+msgid "The order by which references in the history sidebar should be sorted."
+msgstr "The order by which references in the history sidebar should be sorted."
+
+#: data/org.gnome.gitg.gschema.xml.in:162
+msgid "Show Upstream With Branch"
+msgstr "Show Upstream With Branch"
+
+#: data/org.gnome.gitg.gschema.xml.in:163
+msgid ""
+"Determines whether to also show the upstream (remote) tracking branch when "
+"selecting a local branch in the history view."
+msgstr ""
+"Determines whether to also show the upstream (remote) tracking branch when "
+"selecting a local branch in the history view."
+
+#: data/org.gnome.gitg.gschema.xml.in:172
+msgid "Switch to the new branch on creation"
+msgstr "Switch to the new branch on creation"
+
+#: data/org.gnome.gitg.gschema.xml.in:173
+msgid ""
+"Setting that controls whether the newly created branch is checked out "
+"automatically."
+msgstr ""
+"Setting that controls whether the newly created branch is checked out "
+"automatically."
+
+#: data/org.gnome.gitg.gschema.xml.in:188
msgid "Show Right Margin in Commit Message View"
msgstr "Show Right Margin in Commit Message View"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
+#: data/org.gnome.gitg.gschema.xml.in:189
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."
@@ -148,11 +337,11 @@ msgstr ""
"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."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
+#: data/org.gnome.gitg.gschema.xml.in:197
msgid "Column at Which Right Margin is Shown"
msgstr "Column at Which Right Margin is Shown"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
+#: data/org.gnome.gitg.gschema.xml.in:198
msgid ""
"The column at which the right margin is shown if the show-right-margin "
"preference is set to TRUE."
@@ -160,11 +349,11 @@ msgstr ""
"The column at which the right margin is shown if the show-right-margin "
"preference is set to TRUE."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:24
+#: data/org.gnome.gitg.gschema.xml.in:205
msgid "Show Subject Margin in Commit Message View"
msgstr "Show Subject Margin in Commit Message View"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
+#: data/org.gnome.gitg.gschema.xml.in:206
msgid ""
"Highlight the subject text of the commit message when it passes the margin "
"specified by subject-margin-position."
@@ -172,11 +361,11 @@ msgstr ""
"Highlight the subject text of the commit message when it passes the margin "
"specified by subject-margin-position."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:26
+#: data/org.gnome.gitg.gschema.xml.in:213
msgid "Column at Which Subject Margin is Shown"
msgstr "Column at Which Subject Margin is Shown"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+#: data/org.gnome.gitg.gschema.xml.in:214
msgid ""
"The column at which the subject margin is shown if the show-subject-margin "
"preference is set to TRUE."
@@ -184,11 +373,11 @@ msgstr ""
"The column at which the subject margin is shown if the show-subject-margin "
"preference is set to TRUE."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
+#: data/org.gnome.gitg.gschema.xml.in:221
msgid "Enable Spell Checking"
msgstr "Enable Spell Checking"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+#: data/org.gnome.gitg.gschema.xml.in:222
msgid ""
"Setting which determines whether or not spell checking is enabled when "
"writing a commit message."
@@ -196,11 +385,11 @@ msgstr ""
"Setting which determines whether or not spell checking is enabled when "
"writing a commit message."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
+#: data/org.gnome.gitg.gschema.xml.in:229
msgid "Spell Checking Language"
msgstr "Spell Checking Language"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
+#: data/org.gnome.gitg.gschema.xml.in:230
msgid ""
"The language to use when spell checking is enabled for writing a commit "
"message."
@@ -208,11 +397,43 @@ msgstr ""
"The language to use when spell checking is enabled for writing a commit "
"message."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:32
+#: data/org.gnome.gitg.gschema.xml.in:237
+msgid "Maximum number of previous commit messages"
+msgstr "Maximum number of previous commit messages"
+
+#: data/org.gnome.gitg.gschema.xml.in:238
+msgid ""
+"Maximum number of previous commit messages to store for commit message "
+"history."
+msgstr ""
+"Maximum number of previous commit messages to store for commit message "
+"history."
+
+#: data/org.gnome.gitg.gschema.xml.in:242
+msgid "Maximum number of days to store previous commit messages"
+msgstr "Maximum number of days to store previous commit messages"
+
+#: data/org.gnome.gitg.gschema.xml.in:243
+msgid ""
+"Maximum number of days to store previous commit messages for commit message "
+"history."
+msgstr ""
+"Maximum number of days to store previous commit messages for commit message "
+"history."
+
+#: data/org.gnome.gitg.gschema.xml.in:249
+msgid "Use patience algorithm to show diffs"
+msgstr "Use patience algorithm to show diffs"
+
+#: data/org.gnome.gitg.gschema.xml.in:250
+msgid "Setting to use patience algorithm to show diffs of a commit."
+msgstr "Setting to use patience algorithm to show diffs of a commit."
+
+#: data/org.gnome.gitg.gschema.xml.in:256
msgid "Ignore Whitespace Changes"
msgstr "Ignore Whitespace Changes"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
+#: data/org.gnome.gitg.gschema.xml.in:257
msgid ""
"Setting that indicates whether to ignore whitespace changes when showing the "
"diff of a commit."
@@ -220,21 +441,30 @@ msgstr ""
"Setting that indicates whether to ignore whitespace changes when showing the "
"diff of a commit."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
+#: data/org.gnome.gitg.gschema.xml.in:264
msgid "Show Changes Inline"
msgstr "Show Changes Inline"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
+#: data/org.gnome.gitg.gschema.xml.in:265
msgid ""
"Setting that indicates whether changes within lines should be shown inline."
msgstr ""
"Setting that indicates whether changes within lines should be shown inline."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
+#: data/org.gnome.gitg.gschema.xml.in:272
+msgid "Wrap"
+msgstr "Wrap"
+
+#: data/org.gnome.gitg.gschema.xml.in:273
+msgid "Wrap lines."
+msgstr "Wrap lines."
+
+#: data/org.gnome.gitg.gschema.xml.in:279
+#: data/org.gnome.gitg.gschema.xml.in:297
msgid "Number of Before/After Context Lines"
msgstr "Number of Before/After Context Lines"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:37
+#: data/org.gnome.gitg.gschema.xml.in:280
msgid ""
"Setting that determines how many lines of context (before and after) should "
"be shown when showing the diff of a commit."
@@ -242,11 +472,13 @@ msgstr ""
"Setting that determines how many lines of context (before and after) should "
"be shown when showing the diff of a commit."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:38
+#: data/org.gnome.gitg.gschema.xml.in:287
+#: data/org.gnome.gitg.gschema.xml.in:306
msgid "Rendered Width of a Tab Character"
msgstr "Rendered Width of a Tab Character"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:39
+#: data/org.gnome.gitg.gschema.xml.in:288
+#: data/org.gnome.gitg.gschema.xml.in:307
msgid ""
"Setting that determines how much space a tab character should occupy when "
"showing the diff of a commit."
@@ -254,7 +486,7 @@ msgstr ""
"Setting that determines how much space a tab character should occupy when "
"showing the diff of a commit."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:40
+#: data/org.gnome.gitg.gschema.xml.in:298
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."
@@ -262,735 +494,1163 @@ msgstr ""
"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."
-#: ../gitg/commit/gitg-commit-dialog.vala:283
-#, c-format
-msgid "Cannot set spell checking language: %s"
-msgstr "לא ניתן להגדיר שפה לבדיקת איות: %s"
+#: gitg/commit/gitg-commit-dialog.vala:556 gitg/commit/gitg-commit.vala:1091
+msgid "There are no changes to be committed"
+msgstr "אין שינויים להגשה"
-#: ../gitg/commit/gitg-commit.vala:72
-#: ../gitg/preferences/gitg-preferences-commit.vala:119
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:1
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:4
+#: gitg/commit/gitg-commit-dialog.vala:557 gitg/commit/gitg-commit.vala:1092
+msgid "Use amend to change the commit message of the previous commit"
+msgstr "ניתן להשתמש בתיקון לשינוי הודעת ההגשה הקודמת"
+
+#: gitg/commit/gitg-commit.vala:113
+#, fuzzy
+#| msgid "Commit"
+msgctxt "Activity"
msgid "Commit"
msgstr "הגשה"
-#: ../gitg/commit/gitg-commit.vala:77
+#: gitg/commit/gitg-commit.vala:118
msgid "Create new commits and manage the staging area"
msgstr "יצירת הגשה חדשה וניהול האזור הזמני"
-#: ../gitg/commit/gitg-commit.vala:152
+#: gitg/commit/gitg-commit.vala:207
msgid "_Stage selection"
msgstr "_שילוב הבחירה"
-#: ../gitg/commit/gitg-commit.vala:188
-#, c-format
-msgid "Failed to stage the removal of submodule `%s'"
+#: gitg/commit/gitg-commit.vala:246
+#, fuzzy, c-format
+#| msgid "Failed to stage the removal of submodule `%s'"
+msgid "Failed to stage the removal of submodule “%s”"
msgstr "ארע כשל בשילוב מחיקת תת הפִּרְקָן `%s`"
-#: ../gitg/commit/gitg-commit.vala:204
-#, c-format
-msgid "Failed to open the repository of submodule `%s' while trying to stage"
+#: gitg/commit/gitg-commit.vala:262
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to open the repository of submodule `%s' while trying to stage"
+msgid "Failed to open the repository of submodule “%s” while trying to stage"
msgstr "ארע כשל בפתיחת המאגר של תת הפִּרְקָן '%s' בעת ניסיון לשילוב"
-#: ../gitg/commit/gitg-commit.vala:218
-#, c-format
+#: gitg/commit/gitg-commit.vala:277
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to lookup the working directory commit of submodule `%s' while "
+#| "trying to stage"
msgid ""
-"Failed to lookup the working directory commit of submodule `%s' while trying "
+"Failed to lookup the working directory commit of submodule “%s” while trying "
"to stage"
msgstr "ארע כשל במציאת תיקית הגשת העבודה של תת הפִּרְקָן '%s' בעת ניסיון לשילוב"
-#: ../gitg/commit/gitg-commit.vala:231
-#, c-format
-msgid "Failed to stage the submodule `%s'"
+#: gitg/commit/gitg-commit.vala:290
+#, fuzzy, c-format
+#| msgid "Failed to stage the submodule `%s'"
+msgid "Failed to stage the submodule “%s”"
msgstr "ארע כשל בשילוב תת הפִּרְקָן '%s'"
-#: ../gitg/commit/gitg-commit.vala:253
-#, c-format
-msgid "Failed to stage the removal of file `%s'"
+#: gitg/commit/gitg-commit.vala:312
+#, fuzzy, c-format
+#| msgid "Failed to stage the removal of file `%s'"
+msgid "Failed to stage the removal of file “%s”"
msgstr "ארע כשל בשילוב מחיקת הקובץ '%s'"
-#: ../gitg/commit/gitg-commit.vala:267
-#, c-format
-msgid "Failed to stage the file `%s'"
+#: gitg/commit/gitg-commit.vala:326
+#, fuzzy, c-format
+#| msgid "Failed to stage the file `%s'"
+msgid "Failed to stage the file “%s”"
msgstr "ארכ כשל בשילוב הקובץ '%s'"
-#: ../gitg/commit/gitg-commit.vala:536
+#: gitg/commit/gitg-commit.vala:598
msgid "_Unstage selection"
msgstr "_ביטול שילוב הבחירה"
-#: ../gitg/commit/gitg-commit.vala:601
-#, c-format
-msgid "Failed to unstage the removal of file `%s'"
+#: gitg/commit/gitg-commit.vala:664
+#, fuzzy, c-format
+#| msgid "Failed to unstage the removal of file `%s'"
+msgid "Failed to unstage the removal of file “%s”"
msgstr "ארע כשל בשילוב מחיקת הקובץ `%s`"
-#: ../gitg/commit/gitg-commit.vala:602
-#, c-format
-msgid "Failed to unstage the file `%s'"
+#: gitg/commit/gitg-commit.vala:665
+#, fuzzy, c-format
+#| msgid "Failed to unstage the file `%s'"
+msgid "Failed to unstage the file “%s”"
msgstr "ארע כשל בביטול שילוב הקובץ `%s`"
-#: ../gitg/commit/gitg-commit.vala:609
-#, c-format
-msgid "Failed to unstage the removal of submodule `%s'"
+#: gitg/commit/gitg-commit.vala:672
+#, fuzzy, c-format
+#| msgid "Failed to unstage the removal of submodule `%s'"
+msgid "Failed to unstage the removal of submodule “%s”"
msgstr "ארע כשל בביטול שילוב מחיקת תת הפִּרְקָן `%s`"
-#: ../gitg/commit/gitg-commit.vala:610
-#, c-format
-msgid "Failed to unstage the submodule `%s'"
+#: gitg/commit/gitg-commit.vala:673
+#, fuzzy, c-format
+#| msgid "Failed to unstage the submodule `%s'"
+msgid "Failed to unstage the submodule “%s”"
msgstr "ארע כשל בביטול שילוב תת הפִּרְקָן '%s'"
#. Populate staged items
-#: ../gitg/commit/gitg-commit.vala:805
+#: gitg/commit/gitg-commit.vala:877
msgid "Staged"
msgstr "משולב"
-#: ../gitg/commit/gitg-commit.vala:813
+#: gitg/commit/gitg-commit.vala:885
msgid "No staged files"
msgstr "אין קבצים משולבים"
#. Populate unstaged items
-#: ../gitg/commit/gitg-commit.vala:829
+#: gitg/commit/gitg-commit.vala:908
msgid "Unstaged"
msgstr "לא משולב"
-#: ../gitg/commit/gitg-commit.vala:837
+#: gitg/commit/gitg-commit.vala:916
msgid "No unstaged files"
msgstr "אין קבצים שאינם משולבים"
#. Populate untracked items
-#: ../gitg/commit/gitg-commit.vala:853
+#: gitg/commit/gitg-commit.vala:939
msgid "Untracked"
msgstr "לא במעקב"
-#: ../gitg/commit/gitg-commit.vala:857
+#: gitg/commit/gitg-commit.vala:943
msgid "No untracked files"
msgstr "אין קבצים שאינם במעקב"
-#: ../gitg/commit/gitg-commit.vala:875
+#: gitg/commit/gitg-commit.vala:968
msgid "Submodule"
msgstr "תת פִּרְקָן"
-#: ../gitg/commit/gitg-commit.vala:879
+#: gitg/commit/gitg-commit.vala:972
msgid "No dirty submodules"
msgstr "אין תת פִּרְקָן גס"
-#: ../gitg/commit/gitg-commit.vala:991
-msgid "There are no changes to be committed"
-msgstr "אין שינויים להגשה"
-
-#: ../gitg/commit/gitg-commit.vala:992
-msgid "Use amend to change the commit message of the previous commit"
-msgstr "ניתן להשתמש בתיקון לשינוי הודעת ההגשה הקודמת"
-
-#: ../gitg/commit/gitg-commit.vala:1018
+#: gitg/commit/gitg-commit.vala:1121
msgid "Failed to commit"
msgstr "נכשלה ההגשה"
-#. 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:1137
msgid "Failed to pass pre-commit"
msgstr "נכשלה העברת קדם הגשה"
-#: ../gitg/commit/gitg-commit.vala:1201
-msgid ""
-"Your user name and email are not configured yet. Please go to the user "
-"configuration and provide your name and email."
-msgstr ""
-"שם המשתמש וכתובת הדוא״ל שלך טרם הוגדרו. יש לגשת לתצורת משתמש ולספק פרטים אלה."
-
-#: ../gitg/commit/gitg-commit.vala:1205
-msgid ""
-"Your user name is not configured yet. Please go to the user configuration "
-"and provide your name."
-msgstr "שם המשתמש שלך טרם הוגדר. יש לגשת לתצורת משתמש ולספק את השם שלך."
-
-#: ../gitg/commit/gitg-commit.vala:1209
-msgid ""
-"Your email is not configured yet. Please go to the user configuration and "
-"provide your email."
-msgstr ""
-"כתובת הדוא״ל שלך טרם הוגדרה. יש לגשת לתצורת המשתמש ולספק את כתובת הדוא״ל שלך."
-
-#: ../gitg/commit/gitg-commit.vala:1268 ../gitg/commit/gitg-commit.vala:1415
+#: gitg/commit/gitg-commit.vala:1302 gitg/commit/gitg-commit.vala:1452
msgid "Discard changes"
msgstr "השלכת שינויים"
-#: ../gitg/commit/gitg-commit.vala:1269
+#: gitg/commit/gitg-commit.vala:1303
msgid "Are you sure you want to permanently discard the selected changes?"
msgstr "האם ברצונך להשליך לצמיתות את השינויים הנבחרים?"
-#: ../gitg/commit/gitg-commit.vala:1278 ../gitg/commit/gitg-commit.vala:1441
-#: ../gitg/gitg-commit-action-create-patch.vala:143
-#: ../gitg/gitg-window.vala:468 ../gitg/resources/ui/gitg-clone-dialog.ui.h:2
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:2
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:2
-#: ../gitg/resources/ui/gitg-window.ui.h:5
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:1
+#: gitg/commit/gitg-commit.vala:1312 gitg/commit/gitg-commit.vala:1478
+#: gitg/commit/gitg-commit.vala:1593
+#: gitg/gitg-commit-action-create-patch.vala:154 gitg/gitg-dash-view.vala:453
+#: gitg/gitg-window.vala:205 gitg/gitg-window.vala:703
+#: gitg/resources/ui/gitg-author-details-dialog.ui:20
+#: gitg/resources/ui/gitg-checkout-remote-branch-dialog.ui:18
+#: gitg/resources/ui/gitg-clone-dialog.ui:18
+#: gitg/resources/ui/gitg-commit-dialog.ui:20
+#: gitg/resources/ui/gitg-create-branch-dialog.ui:18
+#: gitg/resources/ui/gitg-create-tag-dialog.ui:20
+#: gitg/resources/ui/gitg-remote-notification.ui:30
+#: gitg/resources/ui/gitg-simple-notification.ui:61
+#: gitg/resources/ui/gitg-window.ui:154
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:11
msgid "_Cancel"
msgstr "_ביטול"
-#: ../gitg/commit/gitg-commit.vala:1279 ../gitg/commit/gitg-commit.vala:1442
+#: gitg/commit/gitg-commit.vala:1313 gitg/commit/gitg-commit.vala:1479
msgid "Discard"
msgstr "השלכה"
-#: ../gitg/commit/gitg-commit.vala:1307
+#: gitg/commit/gitg-commit.vala:1342
msgid "Failed to discard selection"
msgstr "ארע כשל בהשלכת הבחירה"
-#: ../gitg/commit/gitg-commit.vala:1336
+#: gitg/commit/gitg-commit.vala:1372
msgid "Failed to stage selection"
msgstr "ארע כשל בשילוב הבחירה"
-#: ../gitg/commit/gitg-commit.vala:1340
+#: gitg/commit/gitg-commit.vala:1376
msgid "Failed to unstage selection"
msgstr "ארע כשל בביטול שילוב הבחירה"
-#: ../gitg/commit/gitg-commit.vala:1399
+#: gitg/commit/gitg-commit.vala:1436
msgid "Failed to discard changes"
msgstr "ארע כשל בהשלכת השינויים"
-#: ../gitg/commit/gitg-commit.vala:1420
-#, c-format
+#: gitg/commit/gitg-commit.vala:1457
+#, fuzzy, c-format
+#| msgid ""
+#| "Are you sure you want to permanently discard all changes made to the file "
+#| "`%s'?"
msgid ""
-"Are you sure you want to permanently discard all changes made to the file `"
-"%s'?"
+"Are you sure you want to permanently discard all changes made to the file "
+"“%s”?"
msgstr "האם ברצונך להשליך לצמיתות את כל השינויים שבוצעו בקובץ '%s'?"
-#: ../gitg/commit/gitg-commit.vala:1431
-#, c-format
+#: gitg/commit/gitg-commit.vala:1468
+#, fuzzy, c-format
+#| msgid ""
+#| "Are you sure you want to permanently discard all changes made to the "
+#| "files %s and `%s'?"
msgid ""
"Are you sure you want to permanently discard all changes made to the files "
-"%s and `%s'?"
+"%s and “%s”?"
msgstr "האם ברצונך להשליך לצמיתות את כל השינויים שבוצעו בקבצים '%s' ו־'%s'?"
-#: ../gitg/commit/gitg-commit.vala:1475
+#: gitg/commit/gitg-commit.vala:1551
+#, fuzzy
+#| msgid "Failed to delete tag %s"
+msgid "Failed to delete files"
+msgstr "ארע כשל במחיקת תג %s"
+
+#: gitg/commit/gitg-commit.vala:1567
+#, fuzzy
+#| msgid "Delete"
+msgid "Delete file"
+msgid_plural "Delete files"
+msgstr[0] "מחיקה"
+msgstr[1] "מחיקה"
+msgstr[2] "מחיקה"
+
+#: gitg/commit/gitg-commit.vala:1572
+#, fuzzy, 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 "האם ברצונך למחוק לצמיתות את התג %s?"
+
+#: gitg/commit/gitg-commit.vala:1583
+#, fuzzy, 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 "האם ברצונך למחוק לצמיתות את התג %s?"
+
+#: gitg/commit/gitg-commit.vala:1629
msgid "_Stage changes"
msgstr "_שילוב שינויים"
-#: ../gitg/commit/gitg-commit.vala:1485
+#: gitg/commit/gitg-commit.vala:1641
msgid "_Unstage changes"
msgstr "_ביטול שילוב שינויים"
-#: ../gitg/commit/gitg-commit.vala:1495
+#: gitg/commit/gitg-commit.vala:1653
msgid "_Discard changes"
msgstr "ה_שלכת שינויים"
-#: ../gitg/commit/gitg-commit.vala:1518
+#: gitg/commit/gitg-commit.vala:1665
+#| msgid "Delete"
+msgid "D_elete file"
+msgid_plural "D_elete files"
+msgstr[0] "_מחיקת קובץ"
+msgstr[1] "_מחיקת קבצים"
+msgstr[2] "מחיקה"
+
+#: gitg/commit/gitg-commit.vala:1695
msgid "_Edit file"
msgstr "_עריכת קובץ"
-#: ../gitg/gitg-application.vala:56
-msgid "Show the application's version"
+#: gitg/gitg-action-support.vala:95
+#, fuzzy, c-format
+#| msgid "Failed to discard changes"
+msgid "Failed to stash changes: %s"
+msgstr "ארע כשל בהשלכת השינויים"
+
+#: gitg/gitg-action-support.vala:130
+#, fuzzy
+#| msgid "_Unstage changes"
+msgid "Unstaged changes"
+msgstr "_ביטול שילוב שינויים"
+
+#: gitg/gitg-action-support.vala:131
+msgid ""
+"You appear to have unstaged changes in your working directory. Would you "
+"like to stash the changes before the checkout?"
+msgstr ""
+
+#: gitg/gitg-action-support.vala:133
+#: gitg/gitg-commit-action-cherry-pick.vala:163
+#: gitg/gitg-ref-action-delete.vala:88 gitg/gitg-ref-action-push.vala:138
+#: gitg/gitg-ref-action-merge.vala:194
+msgid "Cancel"
+msgstr "ביטול"
+
+#: gitg/gitg-action-support.vala:134
+#, fuzzy
+#| msgid "_Stage changes"
+msgid "Stash changes"
+msgstr "_שילוב שינויים"
+
+#: gitg/gitg-action-support.vala:138 gitg/gitg-action-support.vala:165
+#, fuzzy
+#| msgid "Failed to commit"
+msgid "Failed with conflicts"
+msgstr "נכשלה ההגשה"
+
+#: gitg/gitg-action-support.vala:181
+#, fuzzy, c-format
+#| msgid "Failed to fetch from %s: %s"
+msgid "Failed to checkout conflicts: %s"
+msgstr "ארע כשל בהבאה מ־%s: %s"
+
+#: gitg/gitg-action-support.vala:199
+#, fuzzy
+#| msgid "Failed to stage the file `%s'"
+msgid "Failed to obtain author details"
+msgstr "ארכ כשל בשילוב הקובץ '%s'"
+
+#: gitg/gitg-action-support.vala:223 gitg/gitg-ref-action-checkout.vala:88
+#, fuzzy, c-format
+#| msgid "Failed to lookup tag"
+msgid "Failed to lookup commit: %s"
+msgstr "ארע כשל במציאת התגית"
+
+#: gitg/gitg-action-support.vala:255
+#, fuzzy, c-format
+#| msgid "Failed to create tag"
+msgid "Failed to create commit: %s"
+msgstr "ארע כשל ביצירת התגית"
+
+#: gitg/gitg-action-support.vala:277
+#, fuzzy, c-format
+#| msgid "Failed to fetch from %s: %s"
+msgid "Failed to checkout index: %s"
+msgstr "ארע כשל בהבאה מ־%s: %s"
+
+#: gitg/gitg-application.vala:38
+#, fuzzy
+#| msgid "Show the application's version"
+msgid "Show the application’s version"
msgstr "Show the application's version"
-#: ../gitg/gitg-application.vala:59
+#: gitg/gitg-application.vala:40
msgid "Start gitg with a particular activity"
msgstr "Start gitg with a particular activity"
-#: ../gitg/gitg-application.vala:62
+#: gitg/gitg-application.vala:42
msgid "Start gitg with the commit activity (shorthand for --activity commit)"
msgstr "Start gitg with the commit activity (shorthand for --activity commit)"
-#: ../gitg/gitg-application.vala:65
+#: gitg/gitg-application.vala:44
msgid "Do not try to load a repository from the current working directory"
msgstr "Do not try to load a repository from the current working directory"
-#: ../gitg/gitg-application.vala:90
-msgid "- Git repository viewer"
+#: gitg/gitg-application.vala:46
+msgid "Run gitg in standalone mode"
+msgstr ""
+
+#: gitg/gitg-application.vala:92
+#, fuzzy
+#| msgid "- Git repository viewer"
+msgid "— Git repository viewer"
msgstr "- מציג מאגרי Git"
-#: ../gitg/gitg-application.vala:209
-msgid "gitg is a Git repository viewer for gtk+/GNOME"
+#: gitg/gitg-application.vala:226
+#, fuzzy
+#| msgid "gitg is a Git repository viewer for gtk+/GNOME"
+msgid "gitg is a Git repository viewer for GTK+/GNOME"
msgstr "gitg הוא מציג מאגרי Git עבור gtk+/GNOME"
-#: ../gitg/gitg-application.vala:218
+#: gitg/gitg-application.vala:235
msgid "translator-credits"
msgstr ""
"יוסף אור בוצ׳קו <yoseforb gnome org>\n"
"ירון שהרבני <sh yaron gmail com>"
-#: ../gitg/gitg-application.vala:221
+#: gitg/gitg-application.vala:238
msgid "gitg homepage"
msgstr "אתר הבית של gitg"
-#: ../gitg/gitg-author-details-dialog.vala:67
-msgid "Unable to open the .gitconfig file."
-msgstr "לא ניתן לפתוח את הקובץ .gitconfig."
+#: gitg/gitg-application.vala:393
+#, fuzzy
+#| 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."
+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 ""
+"לצורך הפעלת gitg נדרשת הספרייה libgit2 (ספרייה עליה gitg מבוססת) לצורך הידור "
+"עם תמיכה במספר תהליכים.\n"
+"\n"
+"אם הידרת את libgit2 בעצמך, אז נא להגדיר בתהליך ההידור את המשתנים הבאים: -"
+"DTHREADSAFE:BOOL=ON.\n"
+"\n"
+"בכל מקרה אחר, עליך לדווח על תקלה מול ההפצה שלך על כך לך libgit2 ללא תמיכה "
+"בריבוי תהליכים."
+
+#: gitg/gitg-author-details-dialog.vala:79
+#: gitg/gitg-author-details-dialog.vala:99
+#: gitg/resources/ui/gitg-author-details-dialog.ui:9
+msgid "Author Details"
+msgstr "פרטי יוצר"
+
+#: gitg/gitg-author-details-dialog.vala:80
+#, fuzzy
+#| msgid "Enter details to set as default for all repositories:"
+msgid "Enter default details used for all repositories:"
+msgstr "יש להזין פרטים להגדרה כבררת מחדל עבור כל המאגרים:"
+
+#. Translators: %s is the repository name
+#: gitg/gitg-author-details-dialog.vala:102
+#, fuzzy, c-format
+#| msgid "Enter details for repository '%s':"
+msgid "Override global details for repository “%s”:"
+msgstr "הזנת פרטים למאגר „%s”:"
-#: ../gitg/gitg-author-details-dialog.vala:148
+#: gitg/gitg-author-details-dialog.vala:214
msgid "Failed to set Git user config."
msgstr "הגדרת תצורת המשתמש עבור Git נכשלה."
-#: ../gitg/gitg-clone-dialog.vala:87
+#: gitg/gitg-clone-dialog.vala:89
msgid "The URL introduced is not supported"
msgstr "הכתובת שסופקה אינה נתמכת"
-#: ../gitg/gitg-commit-action-create-branch.vala:48
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
-msgid "Create Branch"
+#: gitg/gitg-commit-action-cherry-pick.vala:53
+msgid "Cherry pick onto"
+msgstr ""
+
+#: gitg/gitg-commit-action-cherry-pick.vala:58
+msgid "Cherry pick this commit onto a branch"
+msgstr ""
+
+#: gitg/gitg-commit-action-cherry-pick.vala:117
+#, fuzzy, c-format
+#| msgid "Failed to delete branch %s"
+msgid "Failed to lookup the commit for branch %s: %s"
+msgstr "ארע כשל במחיקת ענף %s"
+
+#: gitg/gitg-commit-action-cherry-pick.vala:132
+#, fuzzy, c-format
+#| msgid "Failed to fetch from %s: %s"
+msgid "Failed to cherry-pick the commit: %s"
+msgstr "ארע כשל בהבאה מ־%s: %s"
+
+#: gitg/gitg-commit-action-cherry-pick.vala:144
+#: gitg/gitg-commit-action-cherry-pick.vala:160
+msgid "Cherry pick has conflicts"
+msgstr ""
+
+#: gitg/gitg-commit-action-cherry-pick.vala:153
+#, c-format
+msgid ""
+"The cherry pick of %s onto %s has caused conflicts, would you like to "
+"checkout branch %s with the cherry pick to your working directory to resolve "
+"the conflicts?"
+msgstr ""
+
+#: gitg/gitg-commit-action-cherry-pick.vala:157
+#, c-format
+msgid ""
+"The cherry-pick of %s onto %s has caused conflicts, would you like to "
+"checkout the cherry pick to your working directory to resolve the conflicts?"
+msgstr ""
+
+#: gitg/gitg-commit-action-cherry-pick.vala:164
+#: gitg/gitg-ref-action-checkout.vala:48 gitg/gitg-ref-action-merge.vala:195
+msgid "Checkout"
+msgstr ""
+
+#: gitg/gitg-commit-action-cherry-pick.vala:168
+msgid "Cherry pick failed with conflicts"
+msgstr ""
+
+#: gitg/gitg-commit-action-cherry-pick.vala:179
+msgid "Cherry pick finished with conflicts in working directory"
+msgstr ""
+
+#: gitg/gitg-commit-action-cherry-pick.vala:199
+#, c-format
+msgid "Cherry pick %s onto %s"
+msgstr ""
+
+#: gitg/gitg-commit-action-cherry-pick.vala:224
+msgid "Successfully cherry picked"
+msgstr ""
+
+#: gitg/gitg-commit-action-cherry-pick.vala:261
+#, c-format
+msgid "Cherry pick onto %s"
+msgstr ""
+
+#: gitg/gitg-commit-action-create-branch.vala:48
+#, fuzzy
+#| msgid "Create Branch"
+msgid "Create branch"
msgstr "יצירת ענף"
-#: ../gitg/gitg-commit-action-create-branch.vala:53
+#: gitg/gitg-commit-action-create-branch.vala:53
msgid "Create a new branch at the selected commit"
msgstr "יצירת ענף חדש מההגשה הנבחרת"
-#: ../gitg/gitg-commit-action-create-branch.vala:85
+#: gitg/gitg-commit-action-create-branch.vala:75
+#: gitg/gitg-ref-action-checkout.vala:180
msgid "Failed to create branch"
msgstr "ארע כשל ביצירת ענף"
-#: ../gitg/gitg-commit-action-create-patch.vala:63
-msgid "Create Patch"
+#: gitg/gitg-commit-action-create-patch.vala:63
+#, fuzzy
+#| msgid "Create Patch"
+msgid "Create patch"
msgstr "יצירת טלאי"
-#: ../gitg/gitg-commit-action-create-patch.vala:68
+#: gitg/gitg-commit-action-create-patch.vala:68
msgid "Create a patch from the selected commit"
msgstr "יצירת טלאי מההגשה הנבחרת"
-#: ../gitg/gitg-commit-action-create-patch.vala:141
+#: gitg/gitg-commit-action-create-patch.vala:152
msgid "Save Patch File"
msgstr "שמירת טלאי לקובץ"
-#: ../gitg/gitg-commit-action-create-patch.vala:145
+#: gitg/gitg-commit-action-create-patch.vala:156
msgid "_Save Patch"
msgstr "_שמירת טלאי"
-#: ../gitg/gitg-commit-action-create-patch.vala:168
+#: gitg/gitg-commit-action-create-patch.vala:181
msgid "Failed to create patch"
msgstr "ארע כשל ביצירת הטלאי"
-#: ../gitg/gitg-commit-action-create-tag.vala:48
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:1
-msgid "Create Tag"
+#: gitg/gitg-commit-action-create-tag.vala:48
+#, fuzzy
+#| msgid "Create Tag"
+msgid "Create tag"
msgstr "יצירת תגית"
-#: ../gitg/gitg-commit-action-create-tag.vala:53
+#: gitg/gitg-commit-action-create-tag.vala:53
msgid "Create a new tag at the selected commit"
msgstr "יצירת תגית חדשה מההגשה הנבחרת"
-#: ../gitg/gitg-commit-action-create-tag.vala:92
+#: gitg/gitg-commit-action-create-tag.vala:92
msgid "Failed to create tag"
msgstr "ארע כשל ביצירת התגית"
-#: ../gitg/gitg-commit-action-create-tag.vala:109
+#: gitg/gitg-commit-action-create-tag.vala:109
msgid "Failed to lookup tag"
msgstr "ארע כשל במציאת התגית"
-#: ../gitg/gitg-create-tag-dialog.vala:110
+#: gitg/gitg-create-tag-dialog.vala:96
msgid "Provide a message to create an annotated tag"
msgstr "יש לספק הודעה ליצירת תגית עם הסבר"
-#: ../gitg/gitg-dash-view.vala:148
-msgid "_Delete"
-msgstr "_מחיקה"
+#: gitg/gitg-dash-view.vala:87
+msgid "Select and manage projects"
+msgstr ""
+
+#: gitg/gitg-dash-view.vala:174
+#, fuzzy
+#| msgid "Remotes"
+msgid "_Remove"
+msgstr "מרוחקים"
+
+#. Translators: the two %s will be replaced to create a link to perform the scanning action.
+#: gitg/gitg-dash-view.vala:230
+#, 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:233
+#, c-format
+msgid "In the mean time, you may want to %sset up your git profile%s."
+msgstr ""
+
+#: gitg/gitg-dash-view.vala:398
+#, fuzzy
+#| msgid "Failed to commit"
+msgid "Failed to clone repository"
+msgstr "נכשלה ההגשה"
+
+#: gitg/gitg-dash-view.vala:429
+#, fuzzy
+#| msgid "Failed to pass pre-commit"
+msgid "Failed to add repository"
+msgstr "נכשלה העברת קדם הגשה"
+
+#: gitg/gitg-dash-view.vala:445
+#, fuzzy
+#| msgid "Bare repository"
+msgid "Create new repository"
+msgstr "חשיפת מאגר"
+
+#. Translators: %s is a file name
+#: gitg/gitg-dash-view.vala:448
+#, 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:454
+#, fuzzy
+#| msgid "Bare repository"
+msgid "Create repository"
+msgstr "חשיפת מאגר"
+
+#: gitg/gitg-dash-view.vala:470
+#, fuzzy
+#| msgid "Failed to create patch"
+msgid "Failed to create repository"
+msgstr "ארע כשל ביצירת הטלאי"
+
+#: gitg/gitg-dash-view.vala:540
+#, c-format
+msgid "Scanning for repositories in %s"
+msgstr ""
+
+#: gitg/gitg-ref-action-checkout.vala:53
+#, fuzzy
+#| msgid "Delete the selected reference"
+msgid "Checkout the selected reference"
+msgstr "מחיקת ההפניה הנבחרת"
+
+#: gitg/gitg-ref-action-checkout.vala:72
+#, c-format
+msgid "Checkout %s"
+msgstr ""
+
+#: gitg/gitg-ref-action-checkout.vala:101
+#, fuzzy, c-format
+#| msgid "Failed to delete branch %s"
+msgid "Failed to checkout branch: %s"
+msgstr "ארע כשל במחיקת ענף %s"
+
+#: gitg/gitg-ref-action-checkout.vala:111
+#, fuzzy, c-format
+#| msgid "Failed to delete tag %s"
+msgid "Failed to update HEAD: %s"
+msgstr "ארע כשל במחיקת תג %s"
+
+#: gitg/gitg-ref-action-checkout.vala:121
+msgid "Successfully checked out branch to working directory"
+msgstr ""
+
+#: gitg/gitg-ref-action-checkout.vala:195
+#, fuzzy, c-format
+#| msgid "Failed to delete branch %s"
+msgid "Failed to set the upstream branch %s for %s"
+msgstr "ארע כשל במחיקת ענף %s"
-#: ../gitg/gitg-ref-action-copy-name.vala:48
+#: gitg/gitg-ref-action-copy-name.vala:48
msgid "Copy name"
msgstr "העתקת השם"
-#: ../gitg/gitg-ref-action-copy-name.vala:53
+#: gitg/gitg-ref-action-copy-name.vala:53
msgid "Copy the name of the reference to the clipboard"
msgstr "העתק שם ההפניה ללוח הגזירים"
-#: ../gitg/gitg-ref-action-delete.vala:48
-#: ../gitg/gitg-ref-action-delete.vala:88
+#: gitg/gitg-ref-action-delete.vala:48 gitg/gitg-ref-action-delete.vala:89
msgid "Delete"
msgstr "מחיקה"
-#: ../gitg/gitg-ref-action-delete.vala:53
+#: gitg/gitg-ref-action-delete.vala:53
msgid "Delete the selected reference"
msgstr "מחיקת ההפניה הנבחרת"
-#: ../gitg/gitg-ref-action-delete.vala:73
+#: gitg/gitg-ref-action-delete.vala:73
#, c-format
msgid "Delete branch %s"
msgstr "מחיקת ענף %s"
-#: ../gitg/gitg-ref-action-delete.vala:74
+#: gitg/gitg-ref-action-delete.vala:74
#, c-format
msgid "Are you sure that you want to permanently delete the branch %s?"
msgstr "האם ברצונך למחוק לצמיתות את הענף %s?"
-#: ../gitg/gitg-ref-action-delete.vala:78
+#: gitg/gitg-ref-action-delete.vala:78
#, c-format
msgid "Delete tag %s"
msgstr "מחיקת תג %s"
-#: ../gitg/gitg-ref-action-delete.vala:79
+#: gitg/gitg-ref-action-delete.vala:79
#, c-format
msgid "Are you sure that you want to permanently delete the tag %s?"
msgstr "האם ברצונך למחוק לצמיתות את התג %s?"
-#: ../gitg/gitg-ref-action-delete.vala:83
+#: gitg/gitg-ref-action-delete.vala:83
#, c-format
msgid "Delete remote branch %s"
msgstr "מחיקת ענך מרוחק %s"
-#: ../gitg/gitg-ref-action-delete.vala:84
+#: gitg/gitg-ref-action-delete.vala:84
#, c-format
msgid "Are you sure that you want to permanently delete the remote branch %s?"
msgstr "האם ברצונך למחוק לצמיתות את הענף המרוחק %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 "ביטול"
-
#. Translators: %s is the name of the tag
-#: ../gitg/gitg-ref-action-delete.vala:119
+#: gitg/gitg-ref-action-delete.vala:119
#, c-format
msgid "Failed to delete tag %s"
msgstr "ארע כשל במחיקת תג %s"
#. Translators: the first %s is the name of the tag, the second is an error message
-#: ../gitg/gitg-ref-action-delete.vala:122
+#: gitg/gitg-ref-action-delete.vala:122
#, c-format
msgid "The tag %s could not be deleted: %s"
msgstr "לא ניתן למחוק את התג %s: %s"
#. Translators: %s is the name of the branch
-#: ../gitg/gitg-ref-action-delete.vala:127
+#: gitg/gitg-ref-action-delete.vala:127
#, c-format
msgid "Failed to delete branch %s"
msgstr "ארע כשל במחיקת ענף %s"
#. Translators: the first %s is the name of the branch, the second is an error message
-#: ../gitg/gitg-ref-action-delete.vala:130
+#: gitg/gitg-ref-action-delete.vala:130
#, c-format
msgid "The branch %s could not be deleted: %s"
msgstr "לא ניתן למחוק את הענף %s: %s"
-#: ../gitg/gitg-ref-action-fetch.vala:74
+#: gitg/gitg-ref-action-fetch.vala:74
#, c-format
msgid "Fetch from %s"
msgstr "להביא מ־%s"
-#: ../gitg/gitg-ref-action-fetch.vala:85
+#: gitg/gitg-ref-action-fetch.vala:85
#, c-format
msgid "Fetch remote objects from %s"
msgstr "להביא עצמים מרוחקים מ־%s"
-#: ../gitg/gitg-ref-action-fetch.vala:110
+#: gitg/gitg-ref-action-fetch.vala:98
#, c-format
msgid "Fetching from %s"
msgstr "מביא מ־%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 "חדש"
#. 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 "עדכון"
-#: ../gitg/gitg-ref-action-fetch.vala:134
+#: gitg/gitg-ref-action-fetch.vala:121
#, c-format
msgid "Failed to fetch from %s: %s"
msgstr "ארע כשל בהבאה מ־%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 "הובא מ־%s: הכל מעודכן"
#. 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 "הובא מ־%s: %s"
-#: ../gitg/gitg-ref-action-rename.vala:48
-msgid "Rename"
-msgstr "שינוי שם"
+#: gitg/gitg-ref-action-push.vala:80
+#, c-format
+msgid "Push to %s"
+msgstr ""
-#: ../gitg/gitg-ref-action-rename.vala:53
-msgid "Rename the selected reference"
-msgstr "שינוי שם ההפניה הנבחרת"
+#: gitg/gitg-ref-action-push.vala:91
+#, fuzzy, c-format
+#| msgid "Delete branch %s"
+msgid "Push branch to %s"
+msgstr "מחיקת ענף %s"
-#: ../gitg/gitg-ref-action-rename.vala:100
-#, c-format
-msgid "The specified name ‘%s’ contains invalid characters"
-msgstr "השם המסוים '%s' מכיל תווים לא תקניים"
+#: gitg/gitg-ref-action-push.vala:107
+#, fuzzy, c-format
+#| msgid "Fetching from %s"
+msgid "Pushing to %s"
+msgstr "מביא מ־%s"
-#: ../gitg/gitg-ref-action-rename.vala:102
-msgid "Invalid name"
-msgstr "שם לא תקין"
+#: gitg/gitg-ref-action-push.vala:116
+#, fuzzy, c-format
+#| msgid "Failed to fetch from %s: %s"
+msgid "Failed to push to %s: %s"
+msgstr "ארע כשל בהבאה מ־%s: %s"
-#: ../gitg/gitg-ref-action-rename.vala:141
-msgid "Failed to rename"
-msgstr "ארע כשל בשינוי השם"
+#. Translators: the %s will get replaced with the remote url,
+#: gitg/gitg-ref-action-push.vala:123
+#, c-format
+msgid "Pushed to %s"
+msgstr ""
+
+#: gitg/gitg-ref-action-push.vala:134
+#, fuzzy, c-format
+#| msgid "Delete branch %s"
+msgid "Push branch %s"
+msgstr "מחיקת ענף %s"
-#: ../gitg/gitg.vala:64
+#: gitg/gitg-ref-action-push.vala:135
+#, fuzzy, c-format
+#| msgid "Are you sure that you want to permanently delete the branch %s?"
+msgid "Are you sure that you want to push the branch %s?"
+msgstr "האם ברצונך למחוק לצמיתות את הענף %s?"
+
+#: gitg/gitg-ref-action-push.vala:139
+msgid "Push"
+msgstr ""
+
+#: gitg/gitg-ref-action-merge.vala:63
+#, c-format
+msgid "Merge into %s"
+msgstr ""
+
+#. TODO
+#: gitg/gitg-ref-action-merge.vala:69
+#, c-format
+msgid "Merge another branch into branch %s"
+msgstr ""
+
+#: gitg/gitg-ref-action-merge.vala:106
+#, fuzzy, c-format
+#| msgid "Failed to commit"
+msgid "Failed to merge commits: %s"
+msgstr "נכשלה ההגשה"
+
+#: gitg/gitg-ref-action-merge.vala:175 gitg/gitg-ref-action-merge.vala:191
+msgid "Merge has conflicts"
+msgstr ""
+
+#: gitg/gitg-ref-action-merge.vala:184
+#, c-format
msgid ""
-"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."
+"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 נדרשת הספרייה libgit2 (ספרייה עליה gitg מבוססת) לצורך הידור "
-"עם תמיכה במספר תהליכים.\n"
-"\n"
-"אם הידרת את libgit2 בעצמך, אז נא להגדיר בתהליך ההידור את המשתנים הבאים: -"
-"DTHREADSAFE:BOOL=ON.\n"
-"\n"
-"בכל מקרה אחר, עליך לדווח על תקלה מול ההפצה שלך על כך לך libgit2 ללא תמיכה "
-"בריבוי תהליכים."
-#: ../gitg/gitg-window.vala:403
-msgid "Projects"
-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-window.vala:466
-msgid "Open Repository"
-msgstr "פתיחת מאגר"
+#: gitg/gitg-ref-action-merge.vala:199
+msgid "Merge failed with conflicts"
+msgstr ""
-#: ../gitg/gitg-window.vala:469
-msgid "_Open"
-msgstr "_פתיחה"
+#: gitg/gitg-ref-action-merge.vala:210
+msgid "Finished merge with conflicts in working directory"
+msgstr ""
-#: ../gitg/gitg-window.vala:764
+#: gitg/gitg-ref-action-merge.vala:222
#, c-format
-msgid "'%s' is not a Git repository."
-msgstr "`%s` אינו מאגר Git"
+msgid "Merge %s into %s"
+msgstr ""
-#: ../gitg/history/gitg-history-refs-list.vala:136
-msgid "All commits"
-msgstr "כל ההגשות"
+#: gitg/gitg-ref-action-merge.vala:231
+#, fuzzy, c-format
+#| msgid "Failed to lookup tag"
+msgid "Failed to lookup our commit: %s"
+msgstr "ארע כשל במציאת התגית"
-#: ../gitg/history/gitg-history-refs-list.vala:835
-msgid "Branches"
-msgstr "ענפים"
+#: gitg/gitg-ref-action-merge.vala:241
+#, fuzzy, c-format
+#| msgid "Failed to lookup tag"
+msgid "Failed to lookup their commit: %s"
+msgstr "ארע כשל במציאת התגית"
-#: ../gitg/history/gitg-history-refs-list.vala:836
-msgid "Remotes"
-msgstr "מרוחקים"
+#: gitg/gitg-ref-action-merge.vala:278
+#, c-format
+msgid "Successfully merged %s into %s"
+msgstr ""
-#: ../gitg/history/gitg-history-refs-list.vala:837
+#: gitg/gitg-ref-action-merge.vala:320
+#, fuzzy, c-format
+#| msgid "Delete branch %s"
+msgid "Merge %s into branch %s"
+msgstr "מחיקת ענף %s"
+
+#: gitg/gitg-ref-action-merge.vala:482
+#: gitg/history/gitg-history-refs-list.vala:1181
msgid "Tags"
msgstr "תגיות"
-#: ../gitg/history/gitg-history.vala:246
-#: ../gitg/preferences/gitg-preferences-history.vala:128
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:3
-msgid "History"
-msgstr "היסטוריה"
+#: gitg/gitg-ref-action-rename.vala:48
+msgid "Rename"
+msgstr "שינוי שם"
-#: ../gitg/history/gitg-history.vala:251
-msgid "Examine the history of the repository"
-msgstr "לבחון את ההיסטוריה של המאגר"
+#: gitg/gitg-ref-action-rename.vala:53
+msgid "Rename the selected reference"
+msgstr "שינוי שם ההפניה הנבחרת"
-#: ../gitg/history/gitg-history.vala:602
-msgid "Mainline"
-msgstr "קו ראשי"
+#: gitg/gitg-ref-action-rename.vala:100
+#, fuzzy, c-format
+#| msgid "The specified name ‘%s’ contains invalid characters"
+msgid "The specified name “%s” contains invalid characters"
+msgstr "השם המסוים '%s' מכיל תווים לא תקניים"
-#: ../gitg/preferences/gitg-preferences-interface.vala:96
-msgid "Interface"
-msgstr "מנשק"
+#: gitg/gitg-ref-action-rename.vala:102
+msgid "Invalid name"
+msgstr "שם לא תקין"
-#: ../libgitg/gitg-date.vala:346
-msgid "Now"
-msgstr "עכשיו"
+#: gitg/gitg-ref-action-rename.vala:131
+msgid "Failed to rename"
+msgstr "ארע כשל בשינוי השם"
-#: ../libgitg/gitg-date.vala:350
-#, c-format
-msgid "A minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "לפני דקה"
-msgstr[1] "לפני %d דקות"
-msgstr[2] "לפני שתי דקות"
+#: gitg/gitg-remote-notification.vala:90 gitg/gitg-simple-notification.vala:99
+msgid "Close"
+msgstr "סגירה"
-#: ../libgitg/gitg-date.vala:355
-msgid "Half an hour ago"
-msgstr "לפני חצי שעה"
+#: gitg/gitg-window.vala:202
+#, fuzzy
+#| msgid "Open Repository"
+msgid "Add Repository"
+msgstr "פתיחת מאגר"
-#: ../libgitg/gitg-date.vala:360
-#, c-format
-msgid "An hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "לפני שעה"
-msgstr[1] "לפני %d שעות"
-msgstr[2] "לפני שעתיים"
+#: gitg/gitg-window.vala:206 gitg/resources/ui/gitg-window.ui:64
+msgid "_Add"
+msgstr ""
-#: ../libgitg/gitg-date.vala:365
-#, c-format
-msgid "A day ago"
-msgid_plural "%d days ago"
-msgstr[0] "אתמול"
-msgstr[1] "לפני %d ימים"
-msgstr[2] "שלשום"
+#: gitg/gitg-window.vala:208
+#, fuzzy
+#| msgid "Do not try to load a repository from the current working directory"
+msgid "_Scan for all git repositories from this directory"
+msgstr "Do not try to load a repository from the current working directory"
-#. Translators: this is a strftime type date format which is
-#. used when the date is in the current year and uses a 24 hour
-#. clock.
-#: ../libgitg/gitg-date.vala:374
-msgid "%b %e, %H:%M"
-msgstr "%e ב%b, %H:%M"
+#: gitg/gitg-window.vala:517
+msgid "Projects"
+msgstr "מיזמים"
-#. Translators: this is a strftime type date format which is
-#. used when the date is in the current year and uses a 12 hour
-#. clock.
-#: ../libgitg/gitg-date.vala:381
-msgid "%b %e, %I:%M %p"
-msgstr "%e ב%b, %I:%M %p"
+#: gitg/gitg-window.vala:701
+msgid "Open Repository"
+msgstr "פתיחת מאגר"
-#. Translators: this is a strftime type date format which is
-#. used when the date is not in the current year and uses a 24
-#. hour clock.
-#: ../libgitg/gitg-date.vala:391
-msgid "%b %e %Y, %H:%M"
-msgstr "%e ב%b %Y, %H:%M"
+#: gitg/gitg-window.vala:704 gitg/resources/ui/gitg-commit-submodule-info.ui:70
+msgid "_Open"
+msgstr "_פתיחה"
-#. Translators: this is a strftime type date format which is
-#. used when the date is not in the current year and uses a 12
-#. hour clock.
-#: ../libgitg/gitg-date.vala:398
-msgid "%b %e %Y, %I:%M %p"
-msgstr "%e ב%b %Y, %I:%M %p"
+#: gitg/gitg-window.vala:844
+msgid "Select items"
+msgstr ""
-#: ../libgitg/gitg-diff-view.vala:249
-msgid "stage"
-msgstr "שילוב"
+#: gitg/gitg-window.vala:1062
+#, fuzzy, c-format
+#| msgid "'%s' is not a Git repository."
+msgid "“%s” is not a Git repository."
+msgstr "`%s` אינו מאגר Git"
-#: ../libgitg/gitg-diff-view.vala:250
-msgid "unstage"
-msgstr "ביטול שילוב"
+#: gitg/gitg-window.vala:1211
+msgid ""
+"Your user name and email are not configured yet. Please go to the user "
+"configuration and provide your name and email."
+msgstr ""
+"שם המשתמש וכתובת הדוא״ל שלך טרם הוגדרו. יש לגשת לתצורת משתמש ולספק פרטים אלה."
-#: ../libgitg/gitg-diff-view.vala:251
-msgid "Loading diff…"
-msgstr "הבדלים נטענים…"
+#: gitg/gitg-window.vala:1215
+msgid ""
+"Your user name is not configured yet. Please go to the user configuration "
+"and provide your name."
+msgstr "שם המשתמש שלך טרם הוגדר. יש לגשת לתצורת משתמש ולספק את השם שלך."
-#: ../libgitg/gitg-diff-view.vala:252
-msgid "Notes:"
-msgstr "הערות:"
+#: gitg/gitg-window.vala:1219
+msgid ""
+"Your email is not configured yet. Please go to the user configuration and "
+"provide your email."
+msgstr ""
+"כתובת הדוא״ל שלך טרם הוגדרה. יש לגשת לתצורת המשתמש ולספק את כתובת הדוא״ל שלך."
-#: ../libgitg/gitg-diff-view.vala:253
-msgid "Parents:"
-msgstr "הורים:"
+#: gitg/gitg-window.vala:1222
+#, fuzzy
+#| msgid "Author Details"
+msgid "Missing author details"
+msgstr "פרטי יוצר"
-#: ../libgitg/gitg-diff-view.vala:254
-msgid "Diff against:"
-msgstr "שינוי לעומת:"
+#: gitg/history/gitg-history-command-line.vala:42
+msgid "Select all commits by default in the history activity"
+msgstr ""
-#: ../libgitg/gitg-diff-view.vala:255
-msgid "Committed by:"
-msgstr "הוגש על ידי:"
+#: gitg/history/gitg-history-command-line.vala:44
+msgid "Select all branches by default in the history activity"
+msgstr ""
-#: ../libgitg/gitg-remote-notification.vala:72
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:6
-#: ../gitg/resources/ui/gitg-window.ui.h:6
-msgid "Close"
-msgstr "סגירה"
+#: 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 ""
-#: ../libgitg/gitg-stage.vala:334
+#: gitg/history/gitg-history-command-line.vala:50
+msgid "REFERENCE"
+msgstr ""
+
+#: gitg/history/gitg-history-refs-list.vala:165
#, c-format
-msgid "Could not read commit message after running commit-msg hook: %s"
-msgstr "לא ניתן לקרוא הודעת הגשה אחרי הרצת commit-msg hook: %s"
+msgid "%zu ahead, %zu behind"
+msgstr ""
-#: ../plugins/diff/gitg-diff.vala:106
-msgid "Diff"
-msgstr "הבדלים"
+#: gitg/history/gitg-history-refs-list.vala:169
+#, c-format
+msgid "%zu ahead"
+msgstr ""
-#: ../plugins/diff/gitg-diff.vala:111
-msgid "Show the changes introduced by the selected commit"
-msgstr "הצגת השינויים שבוצעו בהגשה הנבחרת"
+#: gitg/history/gitg-history-refs-list.vala:173
+#, c-format
+msgid "%zu behind"
+msgstr ""
-#: ../plugins/files/gitg-files.vala:63
-msgid "Files"
-msgstr "קבצים"
+#: gitg/history/gitg-history-refs-list.vala:207
+#: gitg/resources/ui/gitg-preferences-history.ui:81
+msgid "All commits"
+msgstr "כל ההגשות"
-#: ../plugins/files/gitg-files.vala:68
-msgid "Show the files in the tree of the selected commit"
-msgstr "הצגת הקבצים בעץ ההגשה הנבחרת"
+#: gitg/history/gitg-history-refs-list.vala:1179
+msgid "Branches"
+msgstr "ענפים"
-#. ex: ts=4 noet
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1
-msgid "Author Details"
-msgstr "פרטי יוצר"
+#: gitg/history/gitg-history-refs-list.vala:1180
+msgid "Remotes"
+msgstr "מרוחקים"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:3
-#, no-c-format
-msgid "Note: The Git config file '%s' does not exist."
-msgstr "לתשומת לבך: קובץ תצורה Git `%s` אינו קיים."
+#: gitg/history/gitg-history.vala:347
+#: gitg/preferences/gitg-preferences-history.vala:218
+#: gitg/resources/ui/gitg-preferences-interface.ui:60
+msgid "History"
+msgstr "היסטוריה"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:4
-msgid "Enter details to set as default for all repositories:"
-msgstr "יש להזין פרטים להגדרה כבררת מחדל עבור כל המאגרים:"
+#: gitg/history/gitg-history.vala:352
+msgid "Examine the history of the repository"
+msgstr "לבחון את ההיסטוריה של המאגר"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
-#, no-c-format
-msgid "Enter details for repository '%s':"
-msgstr "הזנת פרטים למאגר „%s”:"
+#: gitg/history/gitg-history.vala:942
+msgid "Mainline"
+msgstr "קו ראשי"
+
+#: gitg/preferences/gitg-preferences-commit.vala:142
+#, fuzzy
+#| msgid "Commit"
+msgctxt "Preferences"
+msgid "Commit"
+msgstr "הגשה"
+
+#: gitg/preferences/gitg-preferences-interface.vala:142
+#, c-format
+msgid "_Use the system fixed width font (%s)"
+msgstr ""
+
+#: gitg/preferences/gitg-preferences-interface.vala:179
+msgid "Interface"
+msgstr "מנשק"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:7
-msgid "E-mail: "
+#: gitg/resources/ui/gitg-author-details-dialog.ui:35
+msgid "_Save"
+msgstr "_שמירה"
+
+#: gitg/resources/ui/gitg-author-details-dialog.ui:65
+#, fuzzy
+#| msgid "Enter details to set as default for all repositories:"
+msgid "Default details used for all repositories"
+msgstr "יש להזין פרטים להגדרה כבררת מחדל עבור כל המאגרים:"
+
+#: gitg/resources/ui/gitg-author-details-dialog.ui:114
+#, fuzzy
+#| msgid "E-mail: "
+msgid "E-mail:"
msgstr "דוא״ל:"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:8
-msgid "Name: "
+#: gitg/resources/ui/gitg-author-details-dialog.ui:125
+#, fuzzy
+#| msgid "Name: "
+msgid "Name:"
msgstr "שם:"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:10
-msgid "Save"
-msgstr "שמירה"
+#: gitg/resources/ui/gitg-checkout-remote-branch-dialog.ui:7
+#, fuzzy
+#| msgid "Create Branch"
+msgid "Checkout Remote Branch"
+msgstr "יצירת ענף"
+
+#: gitg/resources/ui/gitg-checkout-remote-branch-dialog.ui:34
+msgid "C_heckout"
+msgstr ""
+
+#: gitg/resources/ui/gitg-checkout-remote-branch-dialog.ui:69
+#, fuzzy
+#| msgid "Branch _name:"
+msgid "Local branch _name:"
+msgstr "_שם ענף:"
+
+#: gitg/resources/ui/gitg-checkout-remote-branch-dialog.ui:99
+#, fuzzy
+#| msgid "Delete branch %s"
+msgid "_Remote branch:"
+msgstr "מחיקת ענף %s"
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:1
+#: gitg/resources/ui/gitg-checkout-remote-branch-dialog.ui:125
+#, fuzzy
+#| msgid "Delete remote branch %s"
+msgid "_Track remote branch"
+msgstr "מחיקת ענך מרוחק %s"
+
+#: gitg/resources/ui/gitg-clone-dialog.ui:7
msgid "Clone Repository"
msgstr "שיבוט מאגר"
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:3
+#: gitg/resources/ui/gitg-clone-dialog.ui:33
+#: gitg/resources/ui/gitg-window.ui:47
msgid "Cl_one"
msgstr "_שיבוט"
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:4
+#: gitg/resources/ui/gitg-clone-dialog.ui:68
msgid "Remote _URL:"
msgstr "_כתובת מרוחקת:"
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:5
+#: gitg/resources/ui/gitg-clone-dialog.ui:99
msgid "_Local Folder:"
msgstr "תיקייה _מקומית:"
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:6
+#: gitg/resources/ui/gitg-clone-dialog.ui:116
msgid "Select location…"
msgstr "בחירת מיקום…"
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:7
+#: gitg/resources/ui/gitg-clone-dialog.ui:127
msgid "Bare repository"
msgstr "חשיפת מאגר"
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:3
-#: ../gitg/resources/ui/gitg-commit-paned.ui.h:2
+#: gitg/resources/ui/gitg-commit-dialog.ui:8
+#, fuzzy
+#| msgid "Commit"
+msgctxt "Create Dialog"
+msgid "Commit"
+msgstr "הגשה"
+
+#: gitg/resources/ui/gitg-commit-dialog.ui:36
+#: gitg/resources/ui/gitg-commit-paned.ui:86
msgid "C_ommit"
msgstr "ה_גשה"
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:4
-msgid "Add _signed-off-by signature"
-msgstr "הוספת _חתימה"
-
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:5
+#: gitg/resources/ui/gitg-commit-dialog.ui:217
msgid "_Amend previous commit"
msgstr "לתקן הגשה _קודמת"
-#: ../gitg/resources/ui/gitg-commit-paned.ui.h:1
+#: gitg/resources/ui/gitg-commit-dialog.ui:234
+msgid "Add _signed-off-by signature"
+msgstr "הוספת _חתימה"
+
+#: gitg/resources/ui/gitg-commit-paned.ui:76
msgid "Skip commit _hooks"
msgstr "דילוג על הגשת _hooks"
-#: ../gitg/resources/ui/gitg-commit-paned.ui.h:3
+#: gitg/resources/ui/gitg-commit-paned.ui:96
msgid "S_tage selection"
msgstr "_שילוב הבחירה"
-#: ../gitg/resources/ui/gitg-commit-paned.ui.h:4
+#: gitg/resources/ui/gitg-commit-paned.ui:107
msgid "D_iscard selection"
msgstr "ה_שלכת הבחירה"
-#: ../gitg/resources/ui/gitg-commit-submodule-diff-view.ui.h:1
+#: gitg/resources/ui/gitg-commit-submodule-diff-view.ui:24
msgid ""
"The submodule is in a dirty state and has staged and/or unstaged changes "
"that are not yet committed as shown below."
@@ -998,217 +1658,731 @@ msgstr ""
"תת פִּרְקָן זה במצב גס ונושא שינויים ששולבו או שלא שולבו אשר טרם הוגשו כפי שמוצג "
"להלן."
-#: ../gitg/resources/ui/gitg-commit-submodule-diff-view.ui.h:2
+#: gitg/resources/ui/gitg-commit-submodule-diff-view.ui:50
msgid "Staged:"
msgstr "משולב:"
-#: ../gitg/resources/ui/gitg-commit-submodule-diff-view.ui.h:3
+#: gitg/resources/ui/gitg-commit-submodule-diff-view.ui:86
msgid "Unstaged:"
msgstr "לא משולב:"
-#: ../gitg/resources/ui/gitg-commit-submodule-history-view.ui.h:1
-#: ../gitg/resources/ui/gitg-history-paned.ui.h:1
+#: gitg/resources/ui/gitg-commit-submodule-history-view.ui:25
+#: gitg/resources/ui/gitg-history-paned.ui:94
msgid "Subject"
msgstr "נושא"
-#: ../gitg/resources/ui/gitg-commit-submodule-history-view.ui.h:2
-#: ../gitg/resources/ui/gitg-history-paned.ui.h:2
+#: gitg/resources/ui/gitg-commit-submodule-history-view.ui:42
+#: gitg/resources/ui/gitg-history-paned.ui:111
msgid "Author"
msgstr "יוצר"
-#: ../gitg/resources/ui/gitg-commit-submodule-history-view.ui.h:3
-#: ../gitg/resources/ui/gitg-history-paned.ui.h:3
+#: gitg/resources/ui/gitg-commit-submodule-history-view.ui:58
+#: gitg/resources/ui/gitg-history-paned.ui:127
msgid "Date"
msgstr "תאריך"
-#: ../gitg/resources/ui/gitg-commit-submodule-info.ui.h:1
-msgid "Open"
-msgstr "פתיחה"
+#: gitg/resources/ui/gitg-create-branch-dialog.ui:7
+msgid "Create Branch"
+msgstr "יצירת ענף"
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:3
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:3
+#: gitg/resources/ui/gitg-create-branch-dialog.ui:34
+#: gitg/resources/ui/gitg-create-tag-dialog.ui:36
msgid "C_reate"
msgstr "י_צירה"
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:4
+#: gitg/resources/ui/gitg-create-branch-dialog.ui:69
msgid "Branch _name:"
msgstr "_שם ענף:"
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:4
+#: gitg/resources/ui/gitg-create-branch-dialog.ui:96
+#, fuzzy
+#| msgid "Failed to create branch"
+msgid "_Checkout the created branch"
+msgstr "ארע כשל ביצירת ענף"
+
+#: gitg/resources/ui/gitg-create-tag-dialog.ui:7
+msgid "Create Tag"
+msgstr "יצירת תגית"
+
+#: gitg/resources/ui/gitg-create-tag-dialog.ui:71
msgid "Tag _name:"
msgstr "_שם תגית:"
-#: ../gitg/resources/ui/gitg-menus.ui.h:1
-msgid "_New Window"
-msgstr "_חלון חדש"
+#: gitg/resources/ui/gitg-dash-view.ui:32
+msgid ""
+"No repositories have been added yet. To get started, you can add an existing "
+"repository or clone a new one."
+msgstr ""
-#: ../gitg/resources/ui/gitg-menus.ui.h:2
+#: gitg/resources/ui/gitg-menus.ui:7
+msgid "_Reload"
+msgstr "טעינה מ_חדש"
+
+#: gitg/resources/ui/gitg-menus.ui:14 gitg/resources/ui/gitg-menus.ui:48
msgid "_Preferences"
msgstr "ה_עדפות"
-#: ../gitg/resources/ui/gitg-menus.ui.h:3
-msgid "_Help"
-msgstr "ע_זרה"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:4
-msgid "_About"
-msgstr "על _אודות"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:5
-msgid "_Quit"
-msgstr "_יציאה"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:6
-msgid "_Open Repository…"
-msgstr "_פתיחת מאגר…"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:7
-msgid "_Clone Repository…"
-msgstr "_שיבוט מאגר…"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:8
+#: gitg/resources/ui/gitg-menus.ui:21 gitg/resources/ui/gitg-menus.ui:42
msgid "_Author Details"
msgstr "פרטי יו_צר"
-#: ../gitg/resources/ui/gitg-menus.ui.h:9
-msgid "_Reload"
-msgstr "טעינה מ_חדש"
+#: gitg/resources/ui/gitg-menus.ui:27 gitg/resources/ui/gitg-menus.ui:55
+msgid "_Keyboard Shortcuts"
+msgstr ""
+
+#: gitg/resources/ui/gitg-menus.ui:36
+msgid "_New Window"
+msgstr "_חלון חדש"
+
+#: gitg/resources/ui/gitg-menus.ui:60
+msgid "_About"
+msgstr "על _אודות"
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:1
+#: gitg/resources/ui/gitg-preferences-commit.ui:58
msgid "Show markup"
msgstr "הצגת סימון"
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:2
+#: gitg/resources/ui/gitg-preferences-commit.ui:85
msgid "Display _subject margin at column:"
msgstr "הצגת שוליים בכותרת ב_עמודה:"
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:3
+#: gitg/resources/ui/gitg-preferences-commit.ui:140
msgid "Display right _margin at column:"
msgstr "הצגת שוליים י_מניים בעמודה:"
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:4
+#: gitg/resources/ui/gitg-preferences-commit.ui:196
+msgid "Maximum number of messages:"
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences-commit.ui:220
+msgid "Maximum number of messages to keep for commit message history"
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences-commit.ui:232
+msgid "Maximum number of days:"
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences-commit.ui:257
+msgid "Maximum number of days to keep for commit message history"
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences-commit.ui:284
+msgid "Language:"
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences-commit.ui:310
msgid "Enable spell checking"
msgstr "לאפשר בדיקת איות"
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:5
+#: gitg/resources/ui/gitg-preferences-commit.ui:341
msgid "Commit Message"
msgstr "הודעת הגשה"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:1
+#: gitg/resources/ui/gitg-preferences-history.ui:31
+#, fuzzy
+#| msgid "D_iscard selection"
+msgid "Default selection"
+msgstr "ה_שלכת הבחירה"
+
+#: gitg/resources/ui/gitg-preferences-history.ui:50
+#, fuzzy
+#| msgid "Create Branch"
+msgid "Current branch"
+msgstr "יצירת ענף"
+
+#: gitg/resources/ui/gitg-preferences-history.ui:65
+#, fuzzy
+#| msgid "Branches"
+msgid "All branches"
+msgstr "ענפים"
+
+#: gitg/resources/ui/gitg-preferences-history.ui:106
+#, fuzzy
+#| msgid "Preferences"
+msgid "References"
+msgstr "העדפות"
+
+#: gitg/resources/ui/gitg-preferences-history.ui:119
+msgid "Sort references in the sidebar by latest activity"
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences-history.ui:135
+msgid "Show upstream (remote) branch when selecting a local branch"
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences-history.ui:154
msgid "Commits"
msgstr "הגשות"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
+#: gitg/resources/ui/gitg-preferences-history.ui:174
msgid "Collapse inactive lanes"
msgstr "צמצום נתיבים בלתי פעילים"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+#: gitg/resources/ui/gitg-preferences-history.ui:215
msgid "Early"
msgstr "מוקדם"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
+#: gitg/resources/ui/gitg-preferences-history.ui:227
msgid "Late"
msgstr "מאוחר"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
+#: gitg/resources/ui/gitg-preferences-history.ui:242
msgid "Show history in topological order"
msgstr "הצגת היסטוריה בסדר טופולוגי"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:6
+#: gitg/resources/ui/gitg-preferences-history.ui:257
msgid "Preserve mainline for currently checked out branch"
msgstr "שמירה כקו ראשי עבור הענף המתוכן הנוכחי"
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:1
+#: gitg/resources/ui/gitg-preferences-interface.ui:24
msgid "Startup"
msgstr "אתחול"
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:2
+#: gitg/resources/ui/gitg-preferences-interface.ui:47
msgid "Start with activity:"
msgstr "מתחיל בפעילות:"
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:5
+#: gitg/resources/ui/gitg-preferences-interface.ui:61
+msgid "Commit"
+msgstr "הגשה"
+
+#: gitg/resources/ui/gitg-preferences-interface.ui:80
msgid "Layout"
msgstr "פריסה"
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:6
+#: gitg/resources/ui/gitg-preferences-interface.ui:100
msgid "Use horizontal layout"
msgstr "שימוש בפריסה אופקית"
-#: ../gitg/resources/ui/gitg-preferences.ui.h:1
+#: gitg/resources/ui/gitg-preferences-interface.ui:124
+msgid "Avatars"
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences-interface.ui:144
+msgid "Use gravatar service to provide user avatars"
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences-interface.ui:168
+msgid "Monitoring"
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences-interface.ui:212
+msgid "Font"
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences-interface.ui:253
+msgid "Editor _font: "
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences-interface.ui:270
+msgid "Pick the editor font"
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences-interface.ui:292
+#: plugins/diff/gitg-diff.vala:120
+msgid "Diff"
+msgstr "הבדלים"
+
+#: gitg/resources/ui/gitg-preferences-interface.ui:312
+msgid "Enable syntax highlighting of source code in diff views"
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences-interface.ui:338
+msgid "Syntax highlighting color scheme:"
+msgstr ""
+
+#: gitg/resources/ui/gitg-preferences.ui:11
msgid "Preferences"
msgstr "העדפות"
-#: ../gitg/resources/ui/gitg-window.ui.h:2
+#: gitg/resources/ui/gitg-shortcuts.ui:14
+#, fuzzy
+#| msgid "_New Window"
+msgctxt "shortcut window"
+msgid "Windows"
+msgstr "_חלון חדש"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:19
+msgctxt "shortcut window"
+msgid "Open shortcut window"
+msgstr ""
+
+#: gitg/resources/ui/gitg-shortcuts.ui:26
+msgctxt "shortcut window"
+msgid "Open a new window"
+msgstr "פתיחת חלון חדש"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:33
+msgctxt "shortcut window"
+msgid "Open the window menu"
+msgstr "פתיחת תפריט החלון"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:40
+#| msgid "Open Repository"
+msgctxt "shortcut window"
+msgid "Open a repository"
+msgstr "פתיחת מאגר"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:47
+msgctxt "shortcut window"
+msgid "Open the help"
+msgstr "פתיחת העזרה"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:54
+#| msgid "Preferences"
+msgctxt "shortcut window"
+msgid "Open preferences"
+msgstr "פתיחת העדפות"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:61
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "חיפוש"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:68
+msgctxt "shortcut window"
+msgid "Close the active window"
+msgstr "סגירת החלון הפעיל"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:75
+#| msgid "Show the application's version"
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr "יציאה מהיישום"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:82
+msgctxt "shortcut window"
+msgid "Change to Dash"
+msgstr ""
+
+#: gitg/resources/ui/gitg-shortcuts.ui:89
+msgctxt "shortcut window"
+msgid "Change to History View"
+msgstr "מעבר לתצוגה ההיסטוריה"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:96
+msgctxt "shortcut window"
+msgid "Change to Commit View"
+msgstr "מעבר לתצוגה ההגשה"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:103
+#| msgid "Start with activity:"
+msgctxt "shortcut window"
+msgid "Change to activity"
+msgstr ""
+
+#: gitg/resources/ui/gitg-shortcuts.ui:111
+#, fuzzy
+#| msgid "Default Activity"
+msgctxt "shortcut window"
+msgid "Commit Activity"
+msgstr "Default Activity"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:116
+msgctxt "shortcut window"
+msgid "Select/Unselect"
+msgstr ""
+
+#: gitg/resources/ui/gitg-shortcuts.ui:123
+msgctxt "shortcut window"
+msgid "Open commit dialog"
+msgstr ""
+
+#: gitg/resources/ui/gitg-shortcuts.ui:130
+#, fuzzy
+#| msgid "_Stage selection"
+msgctxt "shortcut window"
+msgid "Stage selection"
+msgstr "_שילוב הבחירה"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:137
+#, fuzzy
+#| msgid "_Unstage selection"
+msgctxt "shortcut window"
+msgid "Unstage selection"
+msgstr "_ביטול שילוב הבחירה"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:144
+#, fuzzy
+#| msgid "D_iscard selection"
+msgctxt "shortcut window"
+msgid "Discard selection"
+msgstr "ה_שלכת הבחירה"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:151
+#, fuzzy
+#| msgid "_Stage selection"
+msgctxt "shortcut window"
+msgid "Edit selection"
+msgstr "_שילוב הבחירה"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:159
+#, fuzzy
+#| msgid "Commit Message"
+msgctxt "shortcut window"
+msgid "Commit Dialog"
+msgstr "הודעת הגשה"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:164
+#| msgid "Commit"
+msgctxt "shortcut window"
+msgid "Commit"
+msgstr "הגשה"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:171
+#| msgid "Commit"
+msgctxt "shortcut window"
+msgid "Cancel Commit"
+msgstr "ביטול הגשה"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:178
+#| msgid "Commit Message"
+msgctxt "shortcut window"
+msgid "Previous commit message"
+msgstr "הודעת הגשה קודמת"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:185
+#| msgid "Commit Message"
+msgctxt "shortcut window"
+msgid "Next commit message"
+msgstr "הודעת הגשה הבאה"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:193
+#| msgid "Default Activity"
+msgctxt "shortcut window"
+msgid "History Activity"
+msgstr "היסטוריית פעילויות"
+
+#: gitg/resources/ui/gitg-window.ui:24
msgid "Show the list of recently used repositories"
msgstr "הצגת רשימת המאגרים האחרונים בשימוש"
-#: ../gitg/resources/ui/gitg-window.ui.h:3
+#: gitg/resources/ui/gitg-window.ui:48
+#| msgid "Clone Repository"
+msgid "Clone repository"
+msgstr "שיבוט מאגר"
+
+#: gitg/resources/ui/gitg-window.ui:65
+#| msgid "Bare repository"
+msgid "Add repository"
+msgstr "הוספת מאגר"
+
+#: gitg/resources/ui/gitg-window.ui:89
msgid "Find a word or phrase"
msgstr "חיפוש מילה או ביטוי"
-#: ../gitg/resources/ui/gitg-window.ui.h:4
+#: gitg/resources/ui/gitg-window.ui:134
msgid "General settings and options"
msgstr "הגדרות כלליות ואפשרויות"
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:1
-msgid "Ignore whitespace changes"
-msgstr "התעלמות משינויי רווחים לבנים"
+#: gitg/resources/ui/gitg-window.ui:229
+#| msgid "Close"
+msgid "_Close"
+msgstr "_סגירה"
+
+#. Translators: %s will be replaced with a URL indicating the resource
+#. for which the authentication is required.
+#: libgitg/gitg-authentication-dialog.vala:69
+#, c-format
+msgid "Password required for %s"
+msgstr "דרושה ססמה עבור %s"
+
+#: libgitg/gitg-date.vala:346
+msgid "Now"
+msgstr "עכשיו"
+
+#: libgitg/gitg-date.vala:350
+#, c-format
+msgid "A minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "לפני דקה"
+msgstr[1] "לפני %d דקות"
+msgstr[2] "לפני שתי דקות"
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:2
-msgid "Show changes inline"
-msgstr "הצגת שינויים בשורה"
+#: libgitg/gitg-date.vala:355
+msgid "Half an hour ago"
+msgstr "לפני חצי שעה"
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:3
-msgid "Developer tools"
-msgstr "כלי פיתוח"
+#: libgitg/gitg-date.vala:360
+#, c-format
+msgid "An hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "לפני שעה"
+msgstr[1] "לפני %d שעות"
+msgstr[2] "לפני שעתיים"
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:4
-msgid "Tab width"
-msgstr "רוחב טאב"
+#: libgitg/gitg-date.vala:365
+#, c-format
+msgid "A day ago"
+msgid_plural "%d days ago"
+msgstr[0] "אתמול"
+msgstr[1] "לפני %d ימים"
+msgstr[2] "שלשום"
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:5
-msgid "Context"
-msgstr "הקשר"
+#. Translators: this is a strftime type date format which is
+#. used when the date is in the current year and uses a 24 hour
+#. clock.
+#: libgitg/gitg-date.vala:374
+#| msgid "%b %e, %H:%M"
+msgid "%b %e, %H∶%M"
+msgstr "%e ב%b, %H:%M"
+
+#. Translators: this is a strftime type date format which is
+#. used when the date is in the current year and uses a 12 hour
+#. clock.
+#: libgitg/gitg-date.vala:381
+#| msgid "%b %e, %I:%M %p"
+msgid "%b %e, %I∶%M %p"
+msgstr "%e ב%b, %I:%M %p"
+
+#. Translators: this is a strftime type date format which is
+#. used when the date is not in the current year and uses a 24
+#. hour clock.
+#: libgitg/gitg-date.vala:391
+#| msgid "%b %e %Y, %H:%M"
+msgid "%b %e %Y, %H∶%M"
+msgstr "%e ב%b %Y, %H:%M"
+
+#. Translators: this is a strftime type date format which is
+#. used when the date is not in the current year and uses a 12
+#. hour clock.
+#: libgitg/gitg-date.vala:398
+#| msgid "%b %e %Y, %I:%M %p"
+msgid "%b %e %Y, %I∶%M %p"
+msgstr "%e ב%b %Y, %I:%M %p"
+
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: libgitg/gitg-diff-image-side-by-side.vala:39
+#, c-format
+msgid "before (%s)"
+msgstr "לפני (%s)"
+
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: libgitg/gitg-diff-image-side-by-side.vala:45
+#, c-format
+msgid "removed (%s)"
+msgstr "נמחק (%s)"
+
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: libgitg/gitg-diff-image-side-by-side.vala:65
+#, c-format
+msgid "after (%s)"
+msgstr "אחרי (%s)"
+
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: libgitg/gitg-diff-image-side-by-side.vala:71
+#, c-format
+msgid "added (%s)"
+msgstr "נוסף (%s)"
+
+#: libgitg/gitg-diff-view-commit-details.vala:143
+#, fuzzy
+#| msgid "Collapse inactive lanes"
+msgid "Collapse all"
+msgstr "צמצום נתיבים בלתי פעילים"
+
+#: libgitg/gitg-diff-view-commit-details.vala:147
+#: libgitg/resources/ui/gitg-diff-view-commit-details.ui:211
+msgid "Expand all"
+msgstr ""
+
+#: libgitg/gitg-diff-view-commit-details.vala:202
+#, fuzzy, c-format
+#| msgid "Committed by:"
+msgid "Committed by %s"
+msgstr "הוגש על ידי:"
+
+#: libgitg/gitg-diff-view-file.vala:177
+#| msgid "_Open"
+msgid "_Open file"
+msgstr "פתיחת _קובץ"
+
+#: libgitg/gitg-diff-view-file.vala:209
+msgid "Open containing _folder"
+msgstr "פתיחת תיקיית _מכילה"
+
+#: libgitg/gitg-diff-view-file.vala:229
+msgid "_Copy file path"
+msgstr "_העתקת הנתיב הקובץ"
+
+#. Translators: this is used to construct: "at <directory>", to indicate where the repository is at.
+#: libgitg/gitg-repository-list-box.vala:153
+#, c-format
+msgid "at %s"
+msgstr ""
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:2
+#. Translators: this is used to construct: "<branch-name> at <directory>"
+#: libgitg/gitg-repository-list-box.vala:162
+#, c-format
+msgid "%s at %s"
+msgstr ""
+
+#: libgitg/gitg-repository-list-box.vala:545
+msgid "Cloning…"
+msgstr ""
+
+#: libgitg/gitg-stage.vala:337
+#, c-format
+msgid "Could not read commit message after running commit-msg hook: %s"
+msgstr "לא ניתן לקרוא הודעת הגשה אחרי הרצת commit-msg hook: %s"
+
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:18
msgid "_Authenticate"
msgstr "_אימות"
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:3
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:76
msgid ""
"The previous attempt to authenticate has failed, please provide your user "
"name and password and try again."
msgstr "ניסיון האימות הקודם נכשל, יש לספק את שם המשתמש והססמה שלך ולנסות שוב."
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:4
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:95
msgid "_Username:"
msgstr "_שם משתמש:"
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:5
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:109
msgid "_Password:"
msgstr "_ססמה:"
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:6
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:154
msgid "Forget password _immediately"
msgstr "לשכוח את הססמה באופן _מיידי"
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:7
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:171
msgid "Remember password until you _logout"
msgstr "לזכור את הססמה עד לי_ציאה"
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:8
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:189
msgid "Remember _forever"
msgstr "לזכור ל_תמיד"
-#: ../libgitg/resources/ui/gitg-repository-list-box-row.ui.h:1
+#: libgitg/resources/ui/gitg-diff-view-commit-details.ui:151
+#, fuzzy
+#| msgid "Parents:"
+msgid "Parents"
+msgstr "הורים:"
+
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-binary.ui:10
+msgid "Unable to display changes for binary file"
+msgstr ""
+
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui:35
+msgid "Side by side"
+msgstr ""
+
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui:62
+msgid "Slider"
+msgstr ""
+
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui:89
+msgid "Overlay"
+msgstr ""
+
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui:107
+#| msgid "Preferences"
+msgid "Difference"
+msgstr "שינוי"
+
+#: libgitg/resources/ui/gitg-diff-view-options-spacing.ui:20
+#| msgid "Tab width"
+msgid "Tab width:"
+msgstr "רוחב טאב:"
+
+#: libgitg/resources/ui/gitg-diff-view-options-spacing.ui:44
+msgid "Wrap lines:"
+msgstr ""
+
+#: libgitg/resources/ui/gitg-diff-view-options-spacing.ui:67
+#, fuzzy
+#| msgid "Ignore whitespace changes"
+msgid "Ignore whitespace:"
+msgstr "התעלמות משינויי רווחים לבנים"
+
+#: libgitg/resources/ui/gitg-diff-view-options.ui:31
+#, fuzzy
+#| msgid "Context"
+msgid "Context:"
+msgstr "הקשר"
+
+#: libgitg/resources/ui/gitg-diff-view-options.ui:63
+msgid "Spacing"
+msgstr ""
+
+#: libgitg/resources/ui/gitg-repository-list-box-row.ui:37
msgid ""
"Remove the repository from the list (does not delete the repository from "
"disk)"
msgstr "מחיקת המאגר מהרשימה (לא מוחק את המאגר מהכונן)"
-#: ../plugins/files/resources/view-files.ui.h:1
-msgid "column"
-msgstr "עמודה"
+#: plugins/diff/gitg-diff.vala:125
+msgid "Show the changes introduced by the selected commit"
+msgstr "הצגת השינויים שבוצעו בהגשה הנבחרת"
+
+#: plugins/files/gitg-files.vala:68
+msgid "Files"
+msgstr "קבצים"
+
+#: plugins/files/gitg-files.vala:73
+msgid "Show the files in the tree of the selected commit"
+msgstr "הצגת הקבצים בעץ ההגשה הנבחרת"
+
+#~ msgid "Cannot set spell checking language: %s"
+#~ msgstr "לא ניתן להגדיר שפה לבדיקת איות: %s"
+
+#~ msgid "Unable to open the .gitconfig file."
+#~ msgstr "לא ניתן לפתוח את הקובץ .gitconfig."
+
+#~ msgid "_Delete"
+#~ msgstr "_מחיקה"
+
+#~ msgid "stage"
+#~ msgstr "שילוב"
+
+#~ msgid "unstage"
+#~ msgstr "ביטול שילוב"
+
+#~ msgid "Loading diff…"
+#~ msgstr "הבדלים נטענים…"
+
+#~ msgid "Notes:"
+#~ msgstr "הערות:"
+
+#~ msgid "Diff against:"
+#~ msgstr "שינוי לעומת:"
+
+#~ msgid "Note: The Git config file '%s' does not exist."
+#~ msgstr "לתשומת לבך: קובץ תצורה Git `%s` אינו קיים."
+
+#~ msgid "Save"
+#~ msgstr "שמירה"
+
+#~ msgid "Open"
+#~ msgstr "פתיחה"
+
+#~ msgid "_Help"
+#~ msgstr "ע_זרה"
+
+#~ msgid "_Quit"
+#~ msgstr "_יציאה"
+
+#~ msgid "_Open Repository…"
+#~ msgstr "_פתיחת מאגר…"
+
+#~ msgid "_Clone Repository…"
+#~ msgstr "_שיבוט מאגר…"
+
+#~ msgid "Show changes inline"
+#~ msgstr "הצגת שינויים בשורה"
+
+#~ msgid "Developer tools"
+#~ msgstr "כלי פיתוח"
+
+#~ msgid "column"
+#~ msgstr "עמודה"
#~ msgid "Show stash in history"
#~ msgstr "הצגת היסטוריית stash"
@@ -1219,9 +2393,6 @@ msgstr "עמודה"
#~ msgid "Show unstaged changes in history"
#~ msgstr "הצגת שינויי ביטול שילוב בהיסטוריה"
-#~ msgid "_Save"
-#~ msgstr "_שמירה"
-
#~ msgid "gitg Preferences"
#~ msgstr "העדפות gitg"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
