[gitg] Update British English translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Update British English translation
- Date: Thu, 20 Aug 2020 20:19:32 +0000 (UTC)
commit 6ee978043d4ffa5d183739182139db43809eba4f
Author: Zander Brown <zbrown gnome org>
Date: Thu Aug 20 20:19:24 2020 +0000
Update British English translation
po/en_GB.po | 370 +++++++++++++++++++++++++++++++++++-------------------------
1 file changed, 218 insertions(+), 152 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 2e9a2806..f81dac4c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,31 +1,31 @@
# British English translation for gitg.
# Copyright (C) 2009 gitg's COPYRIGHT HOLDER
# This file is distributed under the same licence as the gitg package.
-# Zander Brown <zbrown gnome org>, 2019.
# Bruce Cowan <bruce bcowan me uk>, 2009-2020.
+# Zander Brown <zbrown gnome org>, 2019-2020.
#
msgid ""
msgstr ""
"Project-Id-Version: gitg\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gitg/issues\n"
-"POT-Creation-Date: 2019-12-24 14:28+0000\n"
-"PO-Revision-Date: 2020-02-08 13:25+0000\n"
-"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
-"Language-Team: English - United Kingdom <en li org>\n"
+"POT-Creation-Date: 2020-07-12 12:36+0000\n"
+"PO-Revision-Date: 2020-08-20 02:05+0100\n"
+"Last-Translator: Zander Brown <zbrown gnome org>\n"
+"Language-Team: English - United Kingdom <en_GB li org>\n"
"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 3.34.0\n"
+"X-Generator: Gtranslator 3.36.0\n"
#: contrib/xml/xml-reader.c:327
#, c-format
msgid "Could not parse XML from stream"
msgstr "Could not parse XML from stream"
-#: data/org.gnome.gitg.appdata.xml.in.in:5 data/org.gnome.gitg.desktop.in.in:3
-#: gitg/gitg.vala:39 gitg/resources/ui/gitg-window.ui:8
+#: data/org.gnome.gitg.appdata.xml.in.in:5 gitg/gitg.vala:39
+#: gitg/resources/ui/gitg-window.ui:8
msgid "gitg"
msgstr "gitg"
@@ -85,15 +85,19 @@ msgstr "Overview of recently used repositories"
msgid "The GNOME Project"
msgstr "The GNOME Project"
+#: data/org.gnome.gitg.desktop.in.in:3
+msgid "@binary@"
+msgstr "@binary@"
+
#: data/org.gnome.gitg.desktop.in.in:4
msgid "Git repository browser"
msgstr "Git repository browser"
-#: data/org.gnome.gitg.gschema.xml.in:27
+#: data/org.gnome.gitg.gschema.xml.in:28
msgid "Default Clone Directory"
msgstr "Default Clone Directory"
-#: data/org.gnome.gitg.gschema.xml.in:28
+#: data/org.gnome.gitg.gschema.xml.in:29
msgid ""
"The default directory in which new repositories should be suggested to be "
"cloned."
@@ -101,28 +105,27 @@ msgstr ""
"The default directory in which new repositories should be suggested to be "
"cloned."
-#: data/org.gnome.gitg.gschema.xml.in:37
+#: 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:38
+#: 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:44
+#: data/org.gnome.gitg.gschema.xml.in:45
msgid "Default Activity"
msgstr "Default Activity"
-#: data/org.gnome.gitg.gschema.xml.in:45
+#: 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:51
-#| msgid "Default selection"
+#: data/org.gnome.gitg.gschema.xml.in:52
msgid "Use Default Font"
msgstr "Use Default Font"
-#: data/org.gnome.gitg.gschema.xml.in:52
+#: 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 "
@@ -133,15 +136,15 @@ msgstr ""
"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:56
+#: data/org.gnome.gitg.gschema.xml.in:57
msgid "'Monospace 12'"
msgstr "'Monospace 12'"
-#: data/org.gnome.gitg.gschema.xml.in:57
+#: data/org.gnome.gitg.gschema.xml.in:58
msgid "Editor Font"
msgstr "Editor Font"
-#: data/org.gnome.gitg.gschema.xml.in:58
+#: 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."
@@ -149,46 +152,46 @@ 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:62
+#: data/org.gnome.gitg.gschema.xml.in:63
msgid "Use Gravatar"
msgstr "Use Gravatar"
-#: data/org.gnome.gitg.gschema.xml.in:63
+#: 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:69
+#: data/org.gnome.gitg.gschema.xml.in:70
msgid "Enable Monitoring"
msgstr "Enable Monitoring"
-#: data/org.gnome.gitg.gschema.xml.in:70
+#: 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:76
+#: data/org.gnome.gitg.gschema.xml.in:77
msgid "Enable Diff Highlighting"
msgstr "Enable Diff Highlighting"
-#: data/org.gnome.gitg.gschema.xml.in:77
+#: data/org.gnome.gitg.gschema.xml.in:78
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:84
+#: data/org.gnome.gitg.gschema.xml.in:85
msgid "Color scheme to use for syntax highlighting"
msgstr "Colour scheme to use for syntax highlighting"
-#: data/org.gnome.gitg.gschema.xml.in:85
+#: data/org.gnome.gitg.gschema.xml.in:86
msgid "Used by GtkSourceView to determine colors for syntax highlighting"
msgstr "Used by GtkSourceView to determine colours for syntax highlighting"
-#: data/org.gnome.gitg.gschema.xml.in:91
+#: 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:92
+#: 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”."
@@ -196,7 +199,7 @@ msgstr ""
"Setting that indicates when an inactive lane should be collapsed. Valid "
"values are 0 — 4, where 0 indicates “early” and 4 indicates “late”."
-#: data/org.gnome.gitg.gschema.xml.in:99
+#: 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 "
@@ -208,31 +211,31 @@ msgstr ""
"lot of parallel development. See collapse-inactive-lanes to control when "
"lanes should be collapsed."
-#: data/org.gnome.gitg.gschema.xml.in:108
+#: 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:109
+#: 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:115
+#: data/org.gnome.gitg.gschema.xml.in:116
msgid "Show Stashed Changes"
msgstr "Show Stashed Changes"
-#: data/org.gnome.gitg.gschema.xml.in:116
+#: 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:123
+#: data/org.gnome.gitg.gschema.xml.in:124
msgid "Show Staged Changes"
msgstr "Show Staged Changes"
-#: data/org.gnome.gitg.gschema.xml.in:124
+#: 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."
@@ -240,11 +243,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:131
+#: data/org.gnome.gitg.gschema.xml.in:132
msgid "Show Unstaged Changes"
msgstr "Show Unstaged Changes"
-#: data/org.gnome.gitg.gschema.xml.in:132
+#: 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."
@@ -252,11 +255,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:139
+#: data/org.gnome.gitg.gschema.xml.in:140
msgid "Mainline Head"
msgstr "Mainline Head"
-#: data/org.gnome.gitg.gschema.xml.in:140
+#: 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."
@@ -264,11 +267,11 @@ msgstr ""
"Setting that indicates whether to always preserve a mainline in the history "
"for the current HEAD."
-#: data/org.gnome.gitg.gschema.xml.in:147
+#: 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:148
+#: data/org.gnome.gitg.gschema.xml.in:149
msgid ""
"Setting that determines the default selection on startup of the history "
"activity."
@@ -276,19 +279,19 @@ msgstr ""
"Setting that determines the default selection on startup of the history "
"activity."
-#: data/org.gnome.gitg.gschema.xml.in:154
+#: data/org.gnome.gitg.gschema.xml.in:155
msgid "Reference Sort Order"
msgstr "Reference Sort Order"
-#: data/org.gnome.gitg.gschema.xml.in:155
+#: 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:161
+#: 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:162
+#: 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."
@@ -296,11 +299,23 @@ 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:178
+#: 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:179
+#: 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."
@@ -308,11 +323,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:187
+#: 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:188
+#: 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."
@@ -320,11 +335,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:195
+#: 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:196
+#: 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."
@@ -332,11 +347,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:203
+#: 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:204
+#: 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."
@@ -344,11 +359,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:211
+#: data/org.gnome.gitg.gschema.xml.in:221
msgid "Enable Spell Checking"
msgstr "Enable Spell Checking"
-#: data/org.gnome.gitg.gschema.xml.in:212
+#: data/org.gnome.gitg.gschema.xml.in:222
msgid ""
"Setting which determines whether or not spell checking is enabled when "
"writing a commit message."
@@ -356,11 +371,11 @@ msgstr ""
"Setting which determines whether or not spell checking is enabled when "
"writing a commit message."
-#: data/org.gnome.gitg.gschema.xml.in:219
+#: data/org.gnome.gitg.gschema.xml.in:229
msgid "Spell Checking Language"
msgstr "Spell Checking Language"
-#: data/org.gnome.gitg.gschema.xml.in:220
+#: data/org.gnome.gitg.gschema.xml.in:230
msgid ""
"The language to use when spell checking is enabled for writing a commit "
"message."
@@ -368,11 +383,11 @@ msgstr ""
"The language to use when spell checking is enabled for writing a commit "
"message."
-#: data/org.gnome.gitg.gschema.xml.in:227
+#: 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:228
+#: data/org.gnome.gitg.gschema.xml.in:238
msgid ""
"Maximum number of previous commit messages to store for commit message "
"history."
@@ -380,11 +395,11 @@ msgstr ""
"Maximum number of previous commit messages to store for commit message "
"history."
-#: data/org.gnome.gitg.gschema.xml.in:232
+#: 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:233
+#: data/org.gnome.gitg.gschema.xml.in:243
msgid ""
"Maximum number of days to store previous commit messages for commit message "
"history."
@@ -392,19 +407,19 @@ msgstr ""
"Maximum number of days to store previous commit messages for commit message "
"history."
-#: data/org.gnome.gitg.gschema.xml.in:239
+#: 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:240
+#: 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:246
+#: data/org.gnome.gitg.gschema.xml.in:256
msgid "Ignore Whitespace Changes"
msgstr "Ignore Whitespace Changes"
-#: data/org.gnome.gitg.gschema.xml.in:247
+#: data/org.gnome.gitg.gschema.xml.in:257
msgid ""
"Setting that indicates whether to ignore whitespace changes when showing the "
"diff of a commit."
@@ -412,30 +427,30 @@ msgstr ""
"Setting that indicates whether to ignore whitespace changes when showing the "
"diff of a commit."
-#: data/org.gnome.gitg.gschema.xml.in:254
+#: data/org.gnome.gitg.gschema.xml.in:264
msgid "Show Changes Inline"
msgstr "Show Changes Inline"
-#: data/org.gnome.gitg.gschema.xml.in:255
+#: 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:262
+#: data/org.gnome.gitg.gschema.xml.in:272
msgid "Wrap"
msgstr "Wrap"
-#: data/org.gnome.gitg.gschema.xml.in:263
+#: data/org.gnome.gitg.gschema.xml.in:273
msgid "Wrap lines."
msgstr "Wrap lines."
-#: data/org.gnome.gitg.gschema.xml.in:269
-#: data/org.gnome.gitg.gschema.xml.in:287
+#: 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:270
+#: 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."
@@ -443,13 +458,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:277
-#: data/org.gnome.gitg.gschema.xml.in:296
+#: 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:278
-#: data/org.gnome.gitg.gschema.xml.in:297
+#: 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."
@@ -457,7 +472,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:288
+#: 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."
@@ -465,11 +480,11 @@ 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:555 gitg/commit/gitg-commit.vala:1091
+#: gitg/commit/gitg-commit-dialog.vala:556 gitg/commit/gitg-commit.vala:1091
msgid "There are no changes to be committed"
msgstr "There are no changes to be committed"
-#: gitg/commit/gitg-commit-dialog.vala:556 gitg/commit/gitg-commit.vala:1092
+#: 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 "Use amend to change the commit message of the previous commit"
@@ -598,12 +613,16 @@ msgstr "Are you sure you want to permanently discard the selected changes?"
#: 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:204 gitg/resources/ui/gitg-author-details-dialog.ui:20
+#: 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-window.ui:152
+#: 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 "_Cancel"
@@ -709,8 +728,6 @@ msgstr ""
#: 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
-#: gitg/resources/ui/gitg-remote-notification.ui:30
-#: gitg/resources/ui/gitg-simple-notification.ui:61
msgid "Cancel"
msgstr "Cancel"
@@ -785,7 +802,7 @@ msgstr ""
msgid "gitg homepage"
msgstr "gitg homepage"
-#: gitg/gitg-application.vala:368
+#: gitg/gitg-application.vala:393
msgid ""
"We are terribly sorry, but gitg requires libgit2 (a library on which gitg "
"depends) to be compiled with threading support.\n"
@@ -908,6 +925,7 @@ msgid "Create a new branch at the selected commit"
msgstr "Create a new branch at the selected commit"
#: gitg/gitg-commit-action-create-branch.vala:75
+#: gitg/gitg-ref-action-checkout.vala:180
msgid "Failed to create branch"
msgstr "Failed to create branch"
@@ -1029,6 +1047,12 @@ msgstr "Failed to update HEAD: %s"
msgid "Successfully checked out branch to working directory"
msgstr "Successfully checked out branch to working directory"
+#: gitg/gitg-ref-action-checkout.vala:195
+#, c-format
+#| msgid "Failed to delete branch %s"
+msgid "Failed to set the upstream branch %s for %s"
+msgstr "Failed to set the upstream branch %s for %s"
+
#: gitg/gitg-ref-action-copy-name.vala:48
msgid "Copy name"
msgstr "Copy name"
@@ -1254,7 +1278,7 @@ msgid "Merge %s into branch %s"
msgstr "Merge %s into branch %s"
#: gitg/gitg-ref-action-merge.vala:482
-#: gitg/history/gitg-history-refs-list.vala:1179
+#: gitg/history/gitg-history-refs-list.vala:1181
msgid "Tags"
msgstr "Tags"
@@ -1280,36 +1304,46 @@ msgid "Failed to rename"
msgstr "Failed to rename"
#: gitg/gitg-remote-notification.vala:90 gitg/gitg-simple-notification.vala:99
-#: gitg/resources/ui/gitg-window.ui:227
msgid "Close"
msgstr "Close"
-#: gitg/gitg-window.vala:201
+#: gitg/gitg-window.vala:202
msgid "Add Repository"
msgstr "Add repository"
-#: gitg/gitg-window.vala:205
+#: gitg/gitg-window.vala:206 gitg/resources/ui/gitg-window.ui:64
msgid "_Add"
msgstr "_Add"
-#: gitg/gitg-window.vala:207
+#: gitg/gitg-window.vala:208
msgid "_Scan for all git repositories from this directory"
msgstr "_Scan for all git repositories from this directory"
-#: gitg/gitg-window.vala:516
+#: gitg/gitg-window.vala:517
msgid "Projects"
msgstr "Projects"
-#: gitg/gitg-window.vala:815
+#: gitg/gitg-window.vala:701
+#| msgctxt "shortcut window"
+#| msgid "Open a repository"
+msgid "Open Repository"
+msgstr "Open Repository"
+
+#: gitg/gitg-window.vala:704 gitg/resources/ui/gitg-commit-submodule-info.ui:70
+#| msgid "Open"
+msgid "_Open"
+msgstr "_Open"
+
+#: gitg/gitg-window.vala:844
msgid "Select items"
msgstr "Select items"
-#: gitg/gitg-window.vala:1026
+#: gitg/gitg-window.vala:1062
#, c-format
msgid "“%s” is not a Git repository."
msgstr "“%s” is not a Git repository."
-#: gitg/gitg-window.vala:1175
+#: 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."
@@ -1317,7 +1351,7 @@ msgstr ""
"Your user name and e-mail are not configured yet. Please go to the user "
"configuration and provide your name and e-mail."
-#: gitg/gitg-window.vala:1179
+#: gitg/gitg-window.vala:1215
msgid ""
"Your user name is not configured yet. Please go to the user configuration "
"and provide your name."
@@ -1325,7 +1359,7 @@ msgstr ""
"Your user name is not configured yet. Please go to the user configuration "
"and provide your name."
-#: gitg/gitg-window.vala:1183
+#: gitg/gitg-window.vala:1219
msgid ""
"Your email is not configured yet. Please go to the user configuration and "
"provide your email."
@@ -1333,7 +1367,7 @@ msgstr ""
"Your e-mail is not configured yet. Please go to the user configuration and "
"provide your e-mail."
-#: gitg/gitg-window.vala:1186
+#: gitg/gitg-window.vala:1222
msgid "Missing author details"
msgstr "Missing author details"
@@ -1381,25 +1415,25 @@ msgstr "%zu behind"
msgid "All commits"
msgstr "All commits"
-#: gitg/history/gitg-history-refs-list.vala:1177
+#: gitg/history/gitg-history-refs-list.vala:1179
msgid "Branches"
msgstr "Branches"
-#: gitg/history/gitg-history-refs-list.vala:1178
+#: gitg/history/gitg-history-refs-list.vala:1180
msgid "Remotes"
msgstr "Remotes"
-#: gitg/history/gitg-history.vala:342
+#: gitg/history/gitg-history.vala:347
#: gitg/preferences/gitg-preferences-history.vala:218
#: gitg/resources/ui/gitg-preferences-interface.ui:60
msgid "History"
msgstr "History"
-#: gitg/history/gitg-history.vala:347
+#: gitg/history/gitg-history.vala:352
msgid "Examine the history of the repository"
msgstr "Examine the history of the repository"
-#: gitg/history/gitg-history.vala:918
+#: gitg/history/gitg-history.vala:942
msgid "Mainline"
msgstr "Mainline"
@@ -1433,11 +1467,37 @@ msgstr "E-mail:"
msgid "Name:"
msgstr "Name:"
+#: gitg/resources/ui/gitg-checkout-remote-branch-dialog.ui:7
+#| msgid "Create Branch"
+msgid "Checkout Remote Branch"
+msgstr "Checkout Remote Branch"
+
+#: gitg/resources/ui/gitg-checkout-remote-branch-dialog.ui:34
+#| msgid "Checkout"
+msgid "C_heckout"
+msgstr "C_heckout"
+
+#: gitg/resources/ui/gitg-checkout-remote-branch-dialog.ui:69
+#| msgid "Branch _name:"
+msgid "Local branch _name:"
+msgstr "Local branch _name:"
+
+#: gitg/resources/ui/gitg-checkout-remote-branch-dialog.ui:99
+#| msgid "Create branch"
+msgid "_Remote branch:"
+msgstr "_Remote branch:"
+
+#: gitg/resources/ui/gitg-checkout-remote-branch-dialog.ui:125
+#| msgid "Create branch"
+msgid "_Track remote branch"
+msgstr "_Track remote branch"
+
#: gitg/resources/ui/gitg-clone-dialog.ui:7
msgid "Clone Repository"
msgstr "Clone Repository"
#: gitg/resources/ui/gitg-clone-dialog.ui:33
+#: gitg/resources/ui/gitg-window.ui:47
msgid "Cl_one"
msgstr "Cl_one"
@@ -1518,10 +1578,6 @@ msgstr "Author"
msgid "Date"
msgstr "Date"
-#: gitg/resources/ui/gitg-commit-submodule-info.ui:70
-msgid "Open"
-msgstr "Open"
-
#: gitg/resources/ui/gitg-create-branch-dialog.ui:7
msgid "Create Branch"
msgstr "Create branch"
@@ -1535,6 +1591,11 @@ msgstr "C_reate"
msgid "Branch _name:"
msgstr "Branch _name:"
+#: gitg/resources/ui/gitg-create-branch-dialog.ui:96
+#| msgid "Checkout the selected reference"
+msgid "_Checkout the created branch"
+msgstr "_Checkout the created branch"
+
#: gitg/resources/ui/gitg-create-tag-dialog.ui:7
msgid "Create Tag"
msgstr "Create Tag"
@@ -1708,7 +1769,7 @@ msgid "Pick the editor font"
msgstr "Pick the editor font"
#: gitg/resources/ui/gitg-preferences-interface.ui:292
-#: plugins/diff/gitg-diff.vala:115
+#: plugins/diff/gitg-diff.vala:120
msgid "Diff"
msgstr "Diff"
@@ -1755,139 +1816,138 @@ msgid "Open the help"
msgstr "Open the help"
#: gitg/resources/ui/gitg-shortcuts.ui:54
+#| msgid "Preferences"
+msgctxt "shortcut window"
+msgid "Open preferences"
+msgstr "Open preferences"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:61
msgctxt "shortcut window"
msgid "Find"
msgstr "Find"
-#: gitg/resources/ui/gitg-shortcuts.ui:61
+#: gitg/resources/ui/gitg-shortcuts.ui:68
msgctxt "shortcut window"
msgid "Close the active window"
msgstr "Close the active window"
-#: gitg/resources/ui/gitg-shortcuts.ui:68
+#: gitg/resources/ui/gitg-shortcuts.ui:75
msgctxt "shortcut window"
msgid "Quit the application"
msgstr "Quit the application"
-#: gitg/resources/ui/gitg-shortcuts.ui:75
+#: gitg/resources/ui/gitg-shortcuts.ui:82
msgctxt "shortcut window"
msgid "Change to Dash"
msgstr "Change to Dash"
-#: gitg/resources/ui/gitg-shortcuts.ui:82
+#: gitg/resources/ui/gitg-shortcuts.ui:89
msgctxt "shortcut window"
msgid "Change to History View"
msgstr "Change to History View"
-#: gitg/resources/ui/gitg-shortcuts.ui:89
+#: gitg/resources/ui/gitg-shortcuts.ui:96
msgctxt "shortcut window"
msgid "Change to Commit View"
msgstr "Change to Commit View"
-#: gitg/resources/ui/gitg-shortcuts.ui:96
-#| msgid "Start with activity:"
+#: gitg/resources/ui/gitg-shortcuts.ui:103
msgctxt "shortcut window"
msgid "Change to activity"
msgstr "Change to activity"
-#: gitg/resources/ui/gitg-shortcuts.ui:104
-#| msgid "Default Activity"
+#: gitg/resources/ui/gitg-shortcuts.ui:111
msgctxt "shortcut window"
msgid "Commit Activity"
msgstr "Commit Activity"
-#: gitg/resources/ui/gitg-shortcuts.ui:109
+#: gitg/resources/ui/gitg-shortcuts.ui:116
msgctxt "shortcut window"
msgid "Select/Unselect"
msgstr "Select/Unselect"
-#: gitg/resources/ui/gitg-shortcuts.ui:116
+#: gitg/resources/ui/gitg-shortcuts.ui:123
msgctxt "shortcut window"
msgid "Open commit dialog"
msgstr "Open commit dialogue"
-#: gitg/resources/ui/gitg-shortcuts.ui:123
-#| msgid "_Stage selection"
+#: gitg/resources/ui/gitg-shortcuts.ui:130
msgctxt "shortcut window"
msgid "Stage selection"
msgstr "Stage selection"
-#: gitg/resources/ui/gitg-shortcuts.ui:130
-#| msgid "_Unstage selection"
+#: gitg/resources/ui/gitg-shortcuts.ui:137
msgctxt "shortcut window"
msgid "Unstage selection"
msgstr "Unstage selection"
-#: gitg/resources/ui/gitg-shortcuts.ui:137
-#| msgid "D_iscard selection"
+#: gitg/resources/ui/gitg-shortcuts.ui:144
msgctxt "shortcut window"
msgid "Discard selection"
msgstr "Discard selection"
-#: gitg/resources/ui/gitg-shortcuts.ui:144
-#| msgid "_Stage selection"
+#: gitg/resources/ui/gitg-shortcuts.ui:151
msgctxt "shortcut window"
msgid "Edit selection"
msgstr "Edit selection"
-#: gitg/resources/ui/gitg-shortcuts.ui:152
-#| msgid "Commit files"
+#: gitg/resources/ui/gitg-shortcuts.ui:159
msgctxt "shortcut window"
msgid "Commit Dialog"
msgstr "Commit Dialogue"
-#: gitg/resources/ui/gitg-shortcuts.ui:157
-#| msgid "Commit"
+#: gitg/resources/ui/gitg-shortcuts.ui:164
msgctxt "shortcut window"
msgid "Commit"
msgstr "Commit"
-#: gitg/resources/ui/gitg-shortcuts.ui:164
-#| msgid "Cancel"
+#: gitg/resources/ui/gitg-shortcuts.ui:171
msgctxt "shortcut window"
msgid "Cancel Commit"
msgstr "Cancel Commit"
-#: gitg/resources/ui/gitg-shortcuts.ui:171
-#| msgid "Commit Message"
+#: gitg/resources/ui/gitg-shortcuts.ui:178
msgctxt "shortcut window"
msgid "Previous commit message"
msgstr "Previous commit message"
-#: gitg/resources/ui/gitg-shortcuts.ui:178
-#| msgid "Commit Message"
+#: gitg/resources/ui/gitg-shortcuts.ui:185
msgctxt "shortcut window"
msgid "Next commit message"
msgstr "Next commit message"
+#: gitg/resources/ui/gitg-shortcuts.ui:193
+#| msgctxt "shortcut window"
+#| msgid "Commit Activity"
+msgctxt "shortcut window"
+msgid "History Activity"
+msgstr "History Activity"
+
#: gitg/resources/ui/gitg-window.ui:24
msgid "Show the list of recently used repositories"
msgstr "Show the list of recently used repositories"
-#: gitg/resources/ui/gitg-window.ui:46
-msgid "Clone"
-msgstr "Clone"
-
-#: gitg/resources/ui/gitg-window.ui:47
+#: gitg/resources/ui/gitg-window.ui:48
msgid "Clone repository"
msgstr "Clone repository"
-#: gitg/resources/ui/gitg-window.ui:62
-msgid "Add"
-msgstr "Add"
-
-#: gitg/resources/ui/gitg-window.ui:63
+#: gitg/resources/ui/gitg-window.ui:65
msgid "Add repository"
msgstr "Add repository"
-#: gitg/resources/ui/gitg-window.ui:87
+#: gitg/resources/ui/gitg-window.ui:89
msgid "Find a word or phrase"
msgstr "Find a word or phrase"
-#: gitg/resources/ui/gitg-window.ui:132
+#: gitg/resources/ui/gitg-window.ui:134
msgid "General settings and options"
msgstr "General settings and options"
+#: gitg/resources/ui/gitg-window.ui:229
+#| msgid "Close"
+msgid "_Close"
+msgstr "_Close"
+
#. Translators: %s will be replaced with a URL indicating the resource
#. for which the authentication is required.
#: libgitg/gitg-authentication-dialog.vala:69
@@ -2111,18 +2171,24 @@ msgstr ""
"Remove the repository from the list (does not delete the repository from "
"disk)"
-#: plugins/diff/gitg-diff.vala:120
+#: plugins/diff/gitg-diff.vala:125
msgid "Show the changes introduced by the selected commit"
msgstr "Show the changes introduced by the selected commit"
-#: plugins/files/gitg-files.vala:63
+#: plugins/files/gitg-files.vala:68
msgid "Files"
msgstr "Files"
-#: plugins/files/gitg-files.vala:68
+#: plugins/files/gitg-files.vala:73
msgid "Show the files in the tree of the selected commit"
msgstr "Show the files in the tree of the selected commit"
+#~ msgid "Clone"
+#~ msgstr "Clone"
+
+#~ msgid "Add"
+#~ msgstr "Add"
+
#~ msgid "@icon@"
#~ msgstr "@icon@"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]