[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: Sat, 16 Mar 2019 10:49:07 +0000 (UTC)
commit 40fa9e50668620c76e62532d681709a1dde698bc
Author: Bruce Cowan <bruce bcowan me uk>
Date: Sat Mar 16 10:48:52 2019 +0000
Update British English translation
po/en_GB.po | 1323 ++++++++++++++++++++++++++++++++---------------------------
1 file changed, 724 insertions(+), 599 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 56f21fe0..321396f8 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,43 +1,106 @@
# British English translation for gitg.
# Copyright (C) 2009 gitg's COPYRIGHT HOLDER
# This file is distributed under the same licence as the gitg package.
-# Bruce Cowan <bruce bcowan eu>, 2009, 2018.
+# Bruce Cowan <bruce bcowan me uk>, 2009-2019.
#
msgid ""
msgstr ""
"Project-Id-Version: gitg\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gitg&keywords=I18N+L10N&component=gitg\n"
-"POT-Creation-Date: 2017-07-27 14:16+0000\n"
-"PO-Revision-Date: 2018-01-08 12:00+0000\n"
-"Last-Translator: Bruce Cowan <bruce bcowan eu>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gitg/issues\n";
+"POT-Creation-Date: 2019-01-16 18:54+0000\n"
+"PO-Revision-Date: 2019-03-16 10:47+0000\n"
+"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
"Language-Team: British English <en 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 2.91.7\n"
+"X-Generator: Gtranslator 3.30.1\n"
-#: ../contrib/xml/xml-reader.c:327
+#: contrib/xml/xml-reader.c:327
#, c-format
msgid "Could not parse XML from stream"
msgstr "Could not parse XML from stream"
-#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:39
-#: ../gitg/resources/ui/gitg-window.ui.h:1
+#: data/org.gnome.gitg.appdata.xml.in.in:8
+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 ""
+"gitg is a graphical user interface for git. It aims at being a small, fast "
+"and convenient tool to visualise the history of git repositories. Besides "
+"visualisation, gitg also provides several utilities to manage your "
+"repository and commit your work."
+
+#: data/org.gnome.gitg.appdata.xml.in.in:14
+msgid "Goals"
+msgstr "Goals"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:16
+#| msgid "Show the list of recently used repositories"
+msgid "Browse local git repositories"
+msgstr "Browse local git repositories"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:17
+msgid "Clone local and remote git repositories"
+msgstr "Clone local and remote git repositories"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:18
+#| msgid "Commits"
+msgid "Commit files"
+msgstr "Commit files"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:19
+#| msgid "Create a patch from the selected commit"
+msgid "Retrieve patch from a commit"
+msgstr "Retrieve patch from a commit"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:30
+#| msgid "Bare repository"
+msgid "Browse repository history"
+msgstr "Browse repository history"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:34
+#| msgid "Failed to lookup our commit: %s"
+msgid "Staging area to compose your commit"
+msgstr "Staging area to compose your commit"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:38
+#| msgid "Unstaged changes"
+msgid "Commit staged changes"
+msgstr "Commit staged changes"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:42
+#| msgid "Show the list of recently used repositories"
+msgid "Overview of recently used repositories"
+msgstr "Overview of recently used repositories"
+
+#: data/org.gnome.gitg.appdata.xml.in.in:52
+msgid "The GNOME Project"
+msgstr "The GNOME Project"
+
+#: data/org.gnome.gitg.desktop.in.in:3 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.desktop.in.in:4
msgid "Git repository browser"
msgstr "Git repository browser"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:1
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/org.gnome.gitg.desktop.in.in:10
+msgid "@icon@"
+msgstr "@icon@"
+
+#: data/org.gnome.gitg.gschema.xml.in:27
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:28
msgid ""
"The default directory in which new repositories should be suggested to be "
"cloned."
@@ -45,62 +108,73 @@ 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:37
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:38
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:44
msgid "Default Activity"
msgstr "Default Activity"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:6
+#: data/org.gnome.gitg.gschema.xml.in:45
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:51
msgid "Use Gravatar"
msgstr "Use Gravatar"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
+#: data/org.gnome.gitg.gschema.xml.in:52
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.in.h:9
+#: data/org.gnome.gitg.gschema.xml.in:58
msgid "Enable Monitoring"
msgstr "Enable Monitoring"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:10
+#: data/org.gnome.gitg.gschema.xml.in:59
+#: 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.in.h:11
+#: data/org.gnome.gitg.gschema.xml.in:65
msgid "Enable Diff Highlighting"
msgstr "Enable Diff Highlighting"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+#: data/org.gnome.gitg.gschema.xml.in:66
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.in.h:13
+#: data/org.gnome.gitg.gschema.xml.in:73
+msgid "Color scheme to use for syntax highlighting"
+msgstr "Colour scheme to use for syntax highlighting"
+
+#: data/org.gnome.gitg.gschema.xml.in:74
+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:80
msgid "When to Collapse Inactive Lanes"
msgstr "When to Collapse Inactive Lanes"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
+#: data/org.gnome.gitg.gschema.xml.in:81
+#| 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:15
+#: data/org.gnome.gitg.gschema.xml.in:88
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 "
@@ -112,31 +186,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:16
+#: data/org.gnome.gitg.gschema.xml.in:97
msgid "Show History in Topological Order"
msgstr "Show History in Topological Order"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
+#: data/org.gnome.gitg.gschema.xml.in:98
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:18
+#: data/org.gnome.gitg.gschema.xml.in:104
msgid "Show Stashed Changes"
msgstr "Show Stashed Changes"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
+#: data/org.gnome.gitg.gschema.xml.in:105
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:20
+#: data/org.gnome.gitg.gschema.xml.in:112
msgid "Show Staged Changes"
msgstr "Show Staged Changes"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
+#: data/org.gnome.gitg.gschema.xml.in:113
msgid ""
"Setting that indicates whether to show a virtual item for the currently "
"staged changes in the history."
@@ -144,11 +218,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:22
+#: data/org.gnome.gitg.gschema.xml.in:120
msgid "Show Unstaged Changes"
msgstr "Show Unstaged Changes"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
+#: data/org.gnome.gitg.gschema.xml.in:121
msgid ""
"Setting that indicates whether to show a virtual item for the currently "
"unstaged changes in the history."
@@ -156,11 +230,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:24
+#: data/org.gnome.gitg.gschema.xml.in:128
msgid "Mainline Head"
msgstr "Mainline Head"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
+#: data/org.gnome.gitg.gschema.xml.in:129
msgid ""
"Setting that indicates whether to always preserve a mainline in the history "
"for the current HEAD."
@@ -168,11 +242,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.in.h:26
+#: data/org.gnome.gitg.gschema.xml.in:136
msgid "Default selection of the history activity"
msgstr "Default selection of the history activity"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+#: data/org.gnome.gitg.gschema.xml.in:137
msgid ""
"Setting that determines the default selection on startup of the history "
"activity."
@@ -180,19 +254,19 @@ msgstr ""
"Setting that determines the default selection on startup of the history "
"activity."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
+#: data/org.gnome.gitg.gschema.xml.in:143
msgid "Reference Sort Order"
msgstr "Reference Sort Order"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+#: data/org.gnome.gitg.gschema.xml.in:144
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.in.h:30
+#: data/org.gnome.gitg.gschema.xml.in:150
msgid "Show Upstream With Branch"
msgstr "Show Upstream With Branch"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
+#: data/org.gnome.gitg.gschema.xml.in:151
msgid ""
"Determines whether to also show the upstream (remote) tracking branch when "
"selecting a local branch in the history view."
@@ -200,11 +274,11 @@ 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.in.h:32
+#: data/org.gnome.gitg.gschema.xml.in:167
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:33
+#: data/org.gnome.gitg.gschema.xml.in:168
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."
@@ -212,11 +286,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:34
+#: data/org.gnome.gitg.gschema.xml.in:176
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:35
+#: data/org.gnome.gitg.gschema.xml.in:177
msgid ""
"The column at which the right margin is shown if the show-right-margin "
"preference is set to TRUE."
@@ -224,11 +298,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:36
+#: data/org.gnome.gitg.gschema.xml.in:184
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:37
+#: data/org.gnome.gitg.gschema.xml.in:185
msgid ""
"Highlight the subject text of the commit message when it passes the margin "
"specified by subject-margin-position."
@@ -236,11 +310,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:38
+#: data/org.gnome.gitg.gschema.xml.in:192
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:39
+#: data/org.gnome.gitg.gschema.xml.in:193
msgid ""
"The column at which the subject margin is shown if the show-subject-margin "
"preference is set to TRUE."
@@ -248,11 +322,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:40
+#: data/org.gnome.gitg.gschema.xml.in:200
msgid "Enable Spell Checking"
msgstr "Enable Spell Checking"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:41
+#: data/org.gnome.gitg.gschema.xml.in:201
msgid ""
"Setting which determines whether or not spell checking is enabled when "
"writing a commit message."
@@ -260,11 +334,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:42
+#: data/org.gnome.gitg.gschema.xml.in:208
msgid "Spell Checking Language"
msgstr "Spell Checking Language"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:43
+#: data/org.gnome.gitg.gschema.xml.in:209
msgid ""
"The language to use when spell checking is enabled for writing a commit "
"message."
@@ -272,11 +346,19 @@ msgstr ""
"The language to use when spell checking is enabled for writing a commit "
"message."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:44
+#: data/org.gnome.gitg.gschema.xml.in:218
+msgid "Use patience algorithm to show diffs"
+msgstr "Use patience algorithm to show diffs"
+
+#: data/org.gnome.gitg.gschema.xml.in:219
+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:225
msgid "Ignore Whitespace Changes"
msgstr "Ignore Whitespace Changes"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:45
+#: data/org.gnome.gitg.gschema.xml.in:226
msgid ""
"Setting that indicates whether to ignore whitespace changes when showing the "
"diff of a commit."
@@ -284,29 +366,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:46
+#: data/org.gnome.gitg.gschema.xml.in:233
msgid "Show Changes Inline"
msgstr "Show Changes Inline"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:47
+#: data/org.gnome.gitg.gschema.xml.in:234
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:48
+#: data/org.gnome.gitg.gschema.xml.in:241
msgid "Wrap"
msgstr "Wrap"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:49
+#: data/org.gnome.gitg.gschema.xml.in:242
msgid "Wrap lines."
msgstr "Wrap lines."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:50
+#: data/org.gnome.gitg.gschema.xml.in:248
+#: data/org.gnome.gitg.gschema.xml.in:266
msgid "Number of Before/After Context Lines"
msgstr "Number of Before/After Context Lines"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:51
+#: data/org.gnome.gitg.gschema.xml.in:249
msgid ""
"Setting that determines how many lines of context (before and after) should "
"be shown when showing the diff of a commit."
@@ -314,11 +397,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:52
+#: data/org.gnome.gitg.gschema.xml.in:256
+#: data/org.gnome.gitg.gschema.xml.in:275
msgid "Rendered Width of a Tab Character"
msgstr "Rendered Width of a Tab Character"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:53
+#: data/org.gnome.gitg.gschema.xml.in:257
+#: data/org.gnome.gitg.gschema.xml.in:276
msgid ""
"Setting that determines how much space a tab character should occupy when "
"showing the diff of a commit."
@@ -326,7 +411,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:54
+#: data/org.gnome.gitg.gschema.xml.in:267
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."
@@ -334,247 +419,265 @@ 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:308
+#: gitg/commit/gitg-commit-dialog.vala:298
#, c-format
msgid "Cannot set spell checking language: %s"
msgstr "Cannot set spell checking language: %s"
-#: ../gitg/commit/gitg-commit-dialog.vala:508
-#: ../gitg/commit/gitg-commit.vala:1077
+#: gitg/commit/gitg-commit-dialog.vala:504 gitg/commit/gitg-commit.vala:1077
msgid "There are no changes to be committed"
msgstr "There are no changes to be committed"
-#: ../gitg/commit/gitg-commit-dialog.vala:509
-#: ../gitg/commit/gitg-commit.vala:1078
+#: gitg/commit/gitg-commit-dialog.vala:505 gitg/commit/gitg-commit.vala:1078
msgid "Use amend to change the commit message of the previous commit"
msgstr "Use amend to change the commit message of the previous commit"
-#: ../gitg/commit/gitg-commit.vala:113
+#: gitg/commit/gitg-commit.vala:113
msgctxt "Activity"
msgid "Commit"
msgstr "Commit"
-#: ../gitg/commit/gitg-commit.vala:118
+#: gitg/commit/gitg-commit.vala:118
msgid "Create new commits and manage the staging area"
msgstr "Create new commits and manage the staging area"
-#: ../gitg/commit/gitg-commit.vala:193
+#: gitg/commit/gitg-commit.vala:193
msgid "_Stage selection"
msgstr "_Stage selection"
-#: ../gitg/commit/gitg-commit.vala:232
+#: gitg/commit/gitg-commit.vala:232
#, c-format
-msgid "Failed to stage the removal of submodule `%s'"
-msgstr "Failed to stage the removal of submodule `%s'"
+#| msgid "Failed to stage the removal of submodule `%s'"
+msgid "Failed to stage the removal of submodule “%s”"
+msgstr "Failed to stage the removal of submodule “%s”"
-#: ../gitg/commit/gitg-commit.vala:248
+#: gitg/commit/gitg-commit.vala:248
#, c-format
-msgid "Failed to open the repository of submodule `%s' while trying to stage"
-msgstr "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"
+msgid "Failed to open the repository of submodule “%s” while trying to stage"
+msgstr "Failed to open the repository of submodule “%s” while trying to stage"
-#: ../gitg/commit/gitg-commit.vala:263
+#: gitg/commit/gitg-commit.vala:263
#, 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 ""
-"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"
-#: ../gitg/commit/gitg-commit.vala:276
+#: gitg/commit/gitg-commit.vala:276
#, c-format
-msgid "Failed to stage the submodule `%s'"
-msgstr "Failed to stage the submodule `%s'"
+#| msgid "Failed to stage the submodule `%s'"
+msgid "Failed to stage the submodule “%s”"
+msgstr "Failed to stage the submodule “%s”"
-#: ../gitg/commit/gitg-commit.vala:298
+#: gitg/commit/gitg-commit.vala:298
#, c-format
-msgid "Failed to stage the removal of file `%s'"
-msgstr "Failed to stage the removal of file `%s'"
+#| msgid "Failed to stage the removal of file `%s'"
+msgid "Failed to stage the removal of file “%s”"
+msgstr "Failed to stage the removal of file “%s”"
-#: ../gitg/commit/gitg-commit.vala:312
+#: gitg/commit/gitg-commit.vala:312
#, c-format
-msgid "Failed to stage the file `%s'"
-msgstr "Failed to stage the file `%s'"
+#| msgid "Failed to stage the file `%s'"
+msgid "Failed to stage the file “%s”"
+msgstr "Failed to stage the file “%s”"
-#: ../gitg/commit/gitg-commit.vala:584
+#: gitg/commit/gitg-commit.vala:584
msgid "_Unstage selection"
msgstr "_Unstage selection"
-#: ../gitg/commit/gitg-commit.vala:650
+#: gitg/commit/gitg-commit.vala:650
#, c-format
-msgid "Failed to unstage the removal of file `%s'"
-msgstr "Failed to unstage the removal of file `%s'"
+#| msgid "Failed to unstage the removal of file `%s'"
+msgid "Failed to unstage the removal of file “%s”"
+msgstr "Failed to unstage the removal of file “%s”"
-#: ../gitg/commit/gitg-commit.vala:651
+#: gitg/commit/gitg-commit.vala:651
#, c-format
-msgid "Failed to unstage the file `%s'"
-msgstr "Failed to unstage the file `%s'"
+#| msgid "Failed to unstage the file `%s'"
+msgid "Failed to unstage the file “%s”"
+msgstr "Failed to unstage the file “%s”"
-#: ../gitg/commit/gitg-commit.vala:658
+#: gitg/commit/gitg-commit.vala:658
#, c-format
-msgid "Failed to unstage the removal of submodule `%s'"
-msgstr "Failed to unstage the removal of submodule `%s'"
+#| msgid "Failed to unstage the removal of submodule `%s'"
+msgid "Failed to unstage the removal of submodule “%s”"
+msgstr "Failed to unstage the removal of submodule “%s”"
-#: ../gitg/commit/gitg-commit.vala:659
+#: gitg/commit/gitg-commit.vala:659
#, c-format
-msgid "Failed to unstage the submodule `%s'"
-msgstr "Failed to unstage the submodule `%s'"
+#| msgid "Failed to unstage the submodule `%s'"
+msgid "Failed to unstage the submodule “%s”"
+msgstr "Failed to unstage the submodule “%s”"
#. Populate staged items
-#: ../gitg/commit/gitg-commit.vala:863
+#: gitg/commit/gitg-commit.vala:863
msgid "Staged"
msgstr "Staged"
-#: ../gitg/commit/gitg-commit.vala:871
+#: gitg/commit/gitg-commit.vala:871
msgid "No staged files"
msgstr "No staged files"
#. Populate unstaged items
-#: ../gitg/commit/gitg-commit.vala:894
+#: gitg/commit/gitg-commit.vala:894
msgid "Unstaged"
msgstr "Unstaged"
-#: ../gitg/commit/gitg-commit.vala:902
+#: gitg/commit/gitg-commit.vala:902
msgid "No unstaged files"
msgstr "No unstaged files"
#. Populate untracked items
-#: ../gitg/commit/gitg-commit.vala:925
+#: gitg/commit/gitg-commit.vala:925
msgid "Untracked"
msgstr "Untracked"
-#: ../gitg/commit/gitg-commit.vala:929
+#: gitg/commit/gitg-commit.vala:929
msgid "No untracked files"
msgstr "No untracked files"
-#: ../gitg/commit/gitg-commit.vala:954
+#: gitg/commit/gitg-commit.vala:954
msgid "Submodule"
msgstr "Submodule"
-#: ../gitg/commit/gitg-commit.vala:958
+#: gitg/commit/gitg-commit.vala:958
msgid "No dirty submodules"
msgstr "No dirty submodules"
-#: ../gitg/commit/gitg-commit.vala:1107
+#: gitg/commit/gitg-commit.vala:1107
msgid "Failed to commit"
msgstr "Failed to commit"
-#: ../gitg/commit/gitg-commit.vala:1123
+#: gitg/commit/gitg-commit.vala:1123
msgid "Failed to pass pre-commit"
msgstr "Failed to pass pre-commit"
-#: ../gitg/commit/gitg-commit.vala:1331 ../gitg/commit/gitg-commit.vala:1481
+#: gitg/commit/gitg-commit.vala:1331 gitg/commit/gitg-commit.vala:1481
msgid "Discard changes"
msgstr "Discard changes"
-#: ../gitg/commit/gitg-commit.vala:1332
+#: gitg/commit/gitg-commit.vala:1332
msgid "Are you sure you want to permanently discard the selected changes?"
msgstr "Are you sure you want to permanently discard the selected changes?"
-#: ../gitg/commit/gitg-commit.vala:1341 ../gitg/commit/gitg-commit.vala:1507
-#: ../gitg/commit/gitg-commit.vala:1622
-#: ../gitg/gitg-commit-action-create-patch.vala:145
-#: ../gitg/gitg-dash-view.vala:444 ../gitg/gitg-window.vala:190
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:2
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:2
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:2
-#: ../gitg/resources/ui/gitg-window.ui.h:9
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:1
+#: gitg/commit/gitg-commit.vala:1341 gitg/commit/gitg-commit.vala:1507
+#: gitg/commit/gitg-commit.vala:1622
+#: 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/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:151
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:11
msgid "_Cancel"
msgstr "_Cancel"
-#: ../gitg/commit/gitg-commit.vala:1342 ../gitg/commit/gitg-commit.vala:1508
+#: gitg/commit/gitg-commit.vala:1342 gitg/commit/gitg-commit.vala:1508
msgid "Discard"
msgstr "Discard"
-#: ../gitg/commit/gitg-commit.vala:1371
+#: gitg/commit/gitg-commit.vala:1371
msgid "Failed to discard selection"
msgstr "Failed to discard selection"
-#: ../gitg/commit/gitg-commit.vala:1401
+#: gitg/commit/gitg-commit.vala:1401
msgid "Failed to stage selection"
msgstr "Failed to create tag"
-#: ../gitg/commit/gitg-commit.vala:1405
+#: gitg/commit/gitg-commit.vala:1405
msgid "Failed to unstage selection"
msgstr "Failed to unstage selection"
-#: ../gitg/commit/gitg-commit.vala:1465
+#: gitg/commit/gitg-commit.vala:1465
msgid "Failed to discard changes"
msgstr "Failed to discard changes"
-#: ../gitg/commit/gitg-commit.vala:1486
+#: gitg/commit/gitg-commit.vala:1486
#, 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 ""
-"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”?"
-#: ../gitg/commit/gitg-commit.vala:1497
+#: gitg/commit/gitg-commit.vala:1497
#, 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 ""
"Are you sure you want to permanently discard all changes made to the files "
-"%s and `%s'?"
+"%s and “%s”?"
-#: ../gitg/commit/gitg-commit.vala:1580
+#: gitg/commit/gitg-commit.vala:1580
msgid "Failed to delete files"
msgstr "Failed to delete files"
-#: ../gitg/commit/gitg-commit.vala:1596
+#: gitg/commit/gitg-commit.vala:1596
msgid "Delete file"
msgid_plural "Delete files"
msgstr[0] "Delete file"
msgstr[1] "Delete files"
-#: ../gitg/commit/gitg-commit.vala:1601
+#: gitg/commit/gitg-commit.vala:1601
#, c-format
-msgid "Are you sure you want to permanently delete the file `%s'?"
-msgstr "Are you sure you want to permanently delete the file `%s'?"
+#| msgid "Are you sure you want to permanently delete the file `%s'?"
+msgid "Are you sure you want to permanently delete the file “%s”?"
+msgstr "Are you sure you want to permanently delete the file “%s”?"
-#: ../gitg/commit/gitg-commit.vala:1612
+#: gitg/commit/gitg-commit.vala:1612
#, c-format
-msgid "Are you sure you want to permanently delete the files %s and `%s'?"
-msgstr "Are you sure you want to permanently delete the files %s and `%s'?"
+#| msgid "Are you sure you want to permanently delete the files %s and `%s'?"
+msgid "Are you sure you want to permanently delete the files %s and “%s”?"
+msgstr "Are you sure you want to permanently delete the files %s and “%s”?"
-#: ../gitg/commit/gitg-commit.vala:1658
+#: gitg/commit/gitg-commit.vala:1658
msgid "_Stage changes"
msgstr "_Stage changes"
-#: ../gitg/commit/gitg-commit.vala:1670
+#: gitg/commit/gitg-commit.vala:1670
msgid "_Unstage changes"
msgstr "_Unstage changes"
-#: ../gitg/commit/gitg-commit.vala:1682
+#: gitg/commit/gitg-commit.vala:1682
msgid "_Discard changes"
msgstr "_Discard changes"
-#: ../gitg/commit/gitg-commit.vala:1694
+#: gitg/commit/gitg-commit.vala:1694
msgid "D_elete file"
msgid_plural "D_elete files"
msgstr[0] "D_elete file"
msgstr[1] "D_elete files"
-#: ../gitg/commit/gitg-commit.vala:1724
+#: gitg/commit/gitg-commit.vala:1724
msgid "_Edit file"
msgstr "_Edit file"
-#: ../gitg/gitg-action-support.vala:95
+#: gitg/gitg-action-support.vala:95
#, c-format
msgid "Failed to stash changes: %s"
msgstr "Failed to stash changes: %s"
-#: ../gitg/gitg-action-support.vala:130
+#: gitg/gitg-action-support.vala:130
msgid "Unstaged changes"
msgstr "Unstaged changes"
-#: ../gitg/gitg-action-support.vala:131
+#: 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?"
@@ -582,83 +685,97 @@ msgstr ""
"You appear to have unstaged changes in your working directory. Would you "
"like to stash the changes before the checkout?"
-#: ../gitg/gitg-action-support.vala:133
-#: ../gitg/gitg-commit-action-cherry-pick.vala:163
-#: ../gitg/gitg-ref-action-delete.vala:88
-#: ../gitg/gitg-ref-action-merge.vala:194
-#: ../gitg/resources/ui/gitg-remote-notification.ui.h:1
-#: ../gitg/resources/ui/gitg-simple-notification.ui.h:1
+#: gitg/gitg-action-support.vala:133
+#: gitg/gitg-commit-action-cherry-pick.vala:163
+#: gitg/gitg-ref-action-delete.vala:88 gitg/gitg-ref-action-merge.vala:194
+#: gitg/resources/ui/gitg-remote-notification.ui:30
+#: gitg/resources/ui/gitg-simple-notification.ui:61
msgid "Cancel"
msgstr "Cancel"
-#: ../gitg/gitg-action-support.vala:134
+#: gitg/gitg-action-support.vala:134
msgid "Stash changes"
msgstr "Stash changes"
-#: ../gitg/gitg-action-support.vala:138 ../gitg/gitg-action-support.vala:165
+#: gitg/gitg-action-support.vala:138 gitg/gitg-action-support.vala:165
msgid "Failed with conflicts"
msgstr "Failed with conflicts"
-#: ../gitg/gitg-action-support.vala:181
+#: gitg/gitg-action-support.vala:181
#, c-format
msgid "Failed to checkout conflicts: %s"
msgstr "Failed to checkout conflicts: %s"
-#: ../gitg/gitg-action-support.vala:199
+#: gitg/gitg-action-support.vala:199
msgid "Failed to obtain author details"
msgstr "Failed to obtain author details"
-#: ../gitg/gitg-action-support.vala:223
-#: ../gitg/gitg-ref-action-checkout.vala:88
+#: gitg/gitg-action-support.vala:223 gitg/gitg-ref-action-checkout.vala:88
#, c-format
msgid "Failed to lookup commit: %s"
msgstr "Failed to lookup commit: %s"
-#: ../gitg/gitg-action-support.vala:255
+#: gitg/gitg-action-support.vala:255
#, c-format
msgid "Failed to create commit: %s"
msgstr "Failed to create commit: %s"
-#: ../gitg/gitg-action-support.vala:277
+#: gitg/gitg-action-support.vala:277
#, c-format
msgid "Failed to checkout index: %s"
msgstr "Failed to checkout index: %s"
-#: ../gitg/gitg-application.vala:56
-msgid "Show the application's version"
-msgstr "Show the version of the application"
+#: gitg/gitg-application.vala:38
+#| 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:94
-msgid "- Git repository viewer"
-msgstr "- Git repository viewer"
+#: gitg/gitg-application.vala:46
+msgid "Run gitg in standalone mode"
+msgstr "Run gitg in standalone mode"
-#: ../gitg/gitg-application.vala:222
-msgid "gitg is a Git repository viewer for gtk+/GNOME"
+#: gitg/gitg-application.vala:92
+#| msgid "- Git repository viewer"
+msgid "— Git repository viewer"
+msgstr "— Git repository viewer"
+
+#: gitg/gitg-application.vala:226
+#| msgid "gitg is a Git repository viewer for gtk+/GNOME"
+msgid "gitg is a Git repository viewer for GTK+/GNOME"
msgstr "gitg is a Git repository viewer for GTK+/GNOME"
-#: ../gitg/gitg-application.vala:231
+#: gitg/gitg-application.vala:235
msgid "translator-credits"
msgstr ""
"David King <amigadave amigadave com>\n"
"Bruce Cowan <bruce bcowan eu>"
-#: ../gitg/gitg-application.vala:234
+#: gitg/gitg-application.vala:238
msgid "gitg homepage"
msgstr "gitg homepage"
-#: ../gitg/gitg-application.vala:364
+#: gitg/gitg-application.vala:368
+#| 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"
@@ -666,7 +783,7 @@ msgid ""
"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 "
+"Otherwise, report a bug in your distributions’ bug reporting system for "
"providing libgit2 without threading support."
msgstr ""
"We are terribly sorry, but gitg requires libgit2 (a library on which gitg "
@@ -675,58 +792,58 @@ msgstr ""
"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 "
+"Otherwise, report a bug in your distributions’ bug reporting system for "
"providing libgit2 without threading support."
-#. ex: ts=4 noet
-#: ../gitg/gitg-author-details-dialog.vala:97
-#: ../gitg/gitg-author-details-dialog.vala:117
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1
+#: gitg/gitg-author-details-dialog.vala:97
+#: gitg/gitg-author-details-dialog.vala:117
+#: gitg/resources/ui/gitg-author-details-dialog.ui:9
msgid "Author Details"
msgstr "Author Details"
-#: ../gitg/gitg-author-details-dialog.vala:98
+#: gitg/gitg-author-details-dialog.vala:98
msgid "Enter default details used for all repositories:"
msgstr "Enter default details used for all repositories:"
#. Translators: %s is the repository name
-#: ../gitg/gitg-author-details-dialog.vala:120
+#: gitg/gitg-author-details-dialog.vala:120
#, c-format
-msgid "Override global details for repository '%s':"
-msgstr "Override global details for repository '%s':"
+#| msgid "Override global details for repository '%s':"
+msgid "Override global details for repository “%s”:"
+msgstr "Override global details for repository “%s”:"
-#: ../gitg/gitg-author-details-dialog.vala:232
+#: gitg/gitg-author-details-dialog.vala:232
msgid "Failed to set Git user config."
msgstr "Failed to set Git user config."
-#: ../gitg/gitg-clone-dialog.vala:89
+#: gitg/gitg-clone-dialog.vala:89
msgid "The URL introduced is not supported"
msgstr "The URL introduced is not supported"
-#: ../gitg/gitg-commit-action-cherry-pick.vala:53
+#: gitg/gitg-commit-action-cherry-pick.vala:53
msgid "Cherry pick onto"
msgstr "Cherry pick onto"
-#: ../gitg/gitg-commit-action-cherry-pick.vala:58
+#: gitg/gitg-commit-action-cherry-pick.vala:58
msgid "Cherry pick this commit onto a branch"
msgstr "Cherry pick this commit onto a branch"
-#: ../gitg/gitg-commit-action-cherry-pick.vala:117
+#: gitg/gitg-commit-action-cherry-pick.vala:117
#, c-format
msgid "Failed to lookup the commit for branch %s: %s"
msgstr "Failed to lookup the commit for branch %s: %s"
-#: ../gitg/gitg-commit-action-cherry-pick.vala:132
+#: gitg/gitg-commit-action-cherry-pick.vala:132
#, c-format
msgid "Failed to cherry-pick the commit: %s"
msgstr "Failed to cherry-pick the commit: %s"
-#: ../gitg/gitg-commit-action-cherry-pick.vala:144
-#: ../gitg/gitg-commit-action-cherry-pick.vala:160
+#: gitg/gitg-commit-action-cherry-pick.vala:144
+#: gitg/gitg-commit-action-cherry-pick.vala:160
msgid "Cherry pick has conflicts"
msgstr "Cherry pick has conflicts"
-#: ../gitg/gitg-commit-action-cherry-pick.vala:153
+#: 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 "
@@ -737,7 +854,7 @@ msgstr ""
"checkout branch %s with the cherry pick to your working directory to resolve "
"the conflicts?"
-#: ../gitg/gitg-commit-action-cherry-pick.vala:157
+#: 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 "
@@ -746,120 +863,119 @@ msgstr ""
"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?"
-#: ../gitg/gitg-commit-action-cherry-pick.vala:164
-#: ../gitg/gitg-ref-action-checkout.vala:48
-#: ../gitg/gitg-ref-action-merge.vala:195
+#: 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 "Checkout"
-#: ../gitg/gitg-commit-action-cherry-pick.vala:168
+#: gitg/gitg-commit-action-cherry-pick.vala:168
msgid "Cherry pick failed with conflicts"
msgstr "Cherry pick failed with conflicts"
-#: ../gitg/gitg-commit-action-cherry-pick.vala:179
+#: gitg/gitg-commit-action-cherry-pick.vala:179
msgid "Cherry pick finished with conflicts in working directory"
msgstr "Cherry pick finished with conflicts in working directory"
-#: ../gitg/gitg-commit-action-cherry-pick.vala:199
+#: gitg/gitg-commit-action-cherry-pick.vala:199
#, c-format
msgid "Cherry pick %s onto %s"
msgstr "Cherry pick %s onto %s"
-#: ../gitg/gitg-commit-action-cherry-pick.vala:224
+#: gitg/gitg-commit-action-cherry-pick.vala:224
msgid "Successfully cherry picked"
msgstr "Successfully cherry picked"
-#: ../gitg/gitg-commit-action-cherry-pick.vala:261
+#: gitg/gitg-commit-action-cherry-pick.vala:261
#, c-format
msgid "Cherry pick onto %s"
msgstr "Cherry pick onto %s"
-#: ../gitg/gitg-commit-action-create-branch.vala:48
+#: gitg/gitg-commit-action-create-branch.vala:48
msgid "Create branch"
msgstr "Create branch"
-#: ../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 "Create a new branch at the selected commit"
-#: ../gitg/gitg-commit-action-create-branch.vala:75
+#: gitg/gitg-commit-action-create-branch.vala:75
msgid "Failed to create branch"
msgstr "Failed to create branch"
-#: ../gitg/gitg-commit-action-create-patch.vala:63
+#: gitg/gitg-commit-action-create-patch.vala:63
msgid "Create patch"
msgstr "Create patch"
-#: ../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 "Create a patch from the selected commit"
-#: ../gitg/gitg-commit-action-create-patch.vala:143
+#: gitg/gitg-commit-action-create-patch.vala:152
msgid "Save Patch File"
msgstr "Save Patch File"
-#: ../gitg/gitg-commit-action-create-patch.vala:147
+#: gitg/gitg-commit-action-create-patch.vala:156
msgid "_Save Patch"
msgstr "_Save Patch"
-#: ../gitg/gitg-commit-action-create-patch.vala:172
+#: gitg/gitg-commit-action-create-patch.vala:181
msgid "Failed to create patch"
msgstr "Failed to create patch"
-#: ../gitg/gitg-commit-action-create-tag.vala:48
+#: gitg/gitg-commit-action-create-tag.vala:48
msgid "Create tag"
msgstr "Create tag"
-#: ../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 "Create a new tag at the selected commit"
-#: ../gitg/gitg-commit-action-create-tag.vala:92
+#: gitg/gitg-commit-action-create-tag.vala:92
msgid "Failed to create tag"
msgstr "Failed to create tag"
-#: ../gitg/gitg-commit-action-create-tag.vala:109
+#: gitg/gitg-commit-action-create-tag.vala:109
msgid "Failed to lookup tag"
msgstr "Failed to lookup tag"
-#: ../gitg/gitg-create-tag-dialog.vala:110
+#: gitg/gitg-create-tag-dialog.vala:110
msgid "Provide a message to create an annotated tag"
msgstr "Provide a message to create an annotated tag"
-#: ../gitg/gitg-dash-view.vala:87
+#: gitg/gitg-dash-view.vala:87
msgid "Select and manage projects"
msgstr "Select and manage projects"
-#: ../gitg/gitg-dash-view.vala:176
+#: gitg/gitg-dash-view.vala:174
msgid "_Remove"
msgstr "_Remove"
#. Translators: the two %s will be replaced to create a link to perform the scanning action.
-#: ../gitg/gitg-dash-view.vala:232
+#: gitg/gitg-dash-view.vala:230
#, c-format
msgid "We can also %sscan your home directory%s for git repositories."
msgstr "We can also %sscan your home directory%s for git repositories."
#. Translators: the two %s will be used to create a link to the author dialog.
-#: ../gitg/gitg-dash-view.vala:235
+#: gitg/gitg-dash-view.vala:233
#, c-format
msgid "In the mean time, you may want to %sset up your git profile%s."
msgstr "In the mean time, you may want to %sset up your git profile%s."
-#: ../gitg/gitg-dash-view.vala:389
+#: gitg/gitg-dash-view.vala:398
msgid "Failed to clone repository"
msgstr "Failed to clone repository"
-#: ../gitg/gitg-dash-view.vala:420
+#: gitg/gitg-dash-view.vala:429
msgid "Failed to add repository"
msgstr "Failed to add repository"
-#: ../gitg/gitg-dash-view.vala:436
+#: gitg/gitg-dash-view.vala:445
msgid "Create new repository"
msgstr "Create new repository"
#. Translators: %s is a file name
-#: ../gitg/gitg-dash-view.vala:439
+#: gitg/gitg-dash-view.vala:448
#, c-format
msgid ""
"The location <i>%s</i> does not appear to be a valid git repository. Would "
@@ -868,178 +984,176 @@ msgstr ""
"The location <i>%s</i> does not appear to be a valid git repository. Would "
"you like to initialise a new git repository at this location?"
-#: ../gitg/gitg-dash-view.vala:445
+#: gitg/gitg-dash-view.vala:454
msgid "Create repository"
msgstr "Create repository"
-#: ../gitg/gitg-dash-view.vala:461
+#: gitg/gitg-dash-view.vala:470
msgid "Failed to create repository"
msgstr "Failed to create repository"
-#: ../gitg/gitg-dash-view.vala:531
+#: gitg/gitg-dash-view.vala:540
#, c-format
msgid "Scanning for repositories in %s"
msgstr "Scanning for repositories in %s"
-#: ../gitg/gitg-ref-action-checkout.vala:53
+#: gitg/gitg-ref-action-checkout.vala:53
msgid "Checkout the selected reference"
msgstr "Checkout the selected reference"
-#: ../gitg/gitg-ref-action-checkout.vala:72
+#: gitg/gitg-ref-action-checkout.vala:72
#, c-format
msgid "Checkout %s"
msgstr "Checkout %s"
-#: ../gitg/gitg-ref-action-checkout.vala:101
+#: gitg/gitg-ref-action-checkout.vala:101
#, c-format
msgid "Failed to checkout branch: %s"
msgstr "Failed to checkout branch: %s"
-#: ../gitg/gitg-ref-action-checkout.vala:111
+#: gitg/gitg-ref-action-checkout.vala:111
#, c-format
msgid "Failed to update HEAD: %s"
msgstr "Failed to update HEAD: %s"
-#: ../gitg/gitg-ref-action-checkout.vala:121
+#: gitg/gitg-ref-action-checkout.vala:121
msgid "Successfully checked out branch to working directory"
msgstr "Successfully checked out branch to working directory"
-#: ../gitg/gitg-ref-action-copy-name.vala:48
+#: gitg/gitg-ref-action-copy-name.vala:48
msgid "Copy name"
msgstr "Copy name"
-#: ../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 "Copy the name of the reference to the clipboard"
-#: ../gitg/gitg-ref-action-delete.vala:48
-#: ../gitg/gitg-ref-action-delete.vala:89
+#: gitg/gitg-ref-action-delete.vala:48 gitg/gitg-ref-action-delete.vala:89
msgid "Delete"
msgstr "Delete"
-#: ../gitg/gitg-ref-action-delete.vala:53
+#: gitg/gitg-ref-action-delete.vala:53
msgid "Delete the selected reference"
msgstr "Delete the selected reference"
-#: ../gitg/gitg-ref-action-delete.vala:73
+#: gitg/gitg-ref-action-delete.vala:73
#, c-format
msgid "Delete branch %s"
msgstr "Delete branch %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 "Are you sure that you want to permanently delete the branch %s?"
-#: ../gitg/gitg-ref-action-delete.vala:78
+#: gitg/gitg-ref-action-delete.vala:78
#, c-format
msgid "Delete tag %s"
msgstr "Delete tag %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 "Are you sure that you want to permanently delete the tag %s?"
-#: ../gitg/gitg-ref-action-delete.vala:83
+#: gitg/gitg-ref-action-delete.vala:83
#, c-format
msgid "Delete remote branch %s"
msgstr "Delete remote branch %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 "Are you sure that you want to permanently delete the remote branch %s?"
#. 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 "Failed to delete tag %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 "The tag %s could not be deleted: %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 "Failed to delete branch %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 "The branch %s could not be deleted: %s"
-#: ../gitg/gitg-ref-action-fetch.vala:74
+#: gitg/gitg-ref-action-fetch.vala:74
#, c-format
msgid "Fetch from %s"
msgstr "Fetch from %s"
-#: ../gitg/gitg-ref-action-fetch.vala:85
+#: gitg/gitg-ref-action-fetch.vala:85
#, c-format
msgid "Fetch remote objects from %s"
msgstr "Fetch remote objects from %s"
-#: ../gitg/gitg-ref-action-fetch.vala:98
+#: gitg/gitg-ref-action-fetch.vala:98
#, c-format
msgid "Fetching from %s"
msgstr "Fetching from %s"
#. Translators: new refers to a new remote reference having been fetched,
-#: ../gitg/gitg-ref-action-fetch.vala:106
+#: gitg/gitg-ref-action-fetch.vala:106
msgid "new"
msgstr "new"
#. Translators: updated refers to a remote reference having been updated,
-#: ../gitg/gitg-ref-action-fetch.vala:111
+#: gitg/gitg-ref-action-fetch.vala:111
msgid "updated"
msgstr "updated"
-#: ../gitg/gitg-ref-action-fetch.vala:121
+#: gitg/gitg-ref-action-fetch.vala:121
#, c-format
msgid "Failed to fetch from %s: %s"
msgstr "Failed to fetch from %s: %s"
#. Translators: the %s will get replaced with the remote url,
-#: ../gitg/gitg-ref-action-fetch.vala:134
+#: gitg/gitg-ref-action-fetch.vala:134
#, c-format
msgid "Fetched from %s: everything is up to date"
msgstr "Fetched from %s: everything is up to date"
#. 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:140
+#: gitg/gitg-ref-action-fetch.vala:140
#, c-format
msgid "Fetched from %s: %s"
msgstr "Fetched from %s: %s"
-#: ../gitg/gitg-ref-action-merge.vala:63
+#: gitg/gitg-ref-action-merge.vala:63
#, c-format
msgid "Merge into %s"
msgstr "Merge into %s"
#. TODO
-#: ../gitg/gitg-ref-action-merge.vala:69
+#: gitg/gitg-ref-action-merge.vala:69
#, c-format
msgid "Merge another branch into branch %s"
msgstr "Merge another branch into branch %s"
-#: ../gitg/gitg-ref-action-merge.vala:106
+#: gitg/gitg-ref-action-merge.vala:106
#, c-format
msgid "Failed to merge commits: %s"
msgstr "Failed to merge commits: %s"
-#: ../gitg/gitg-ref-action-merge.vala:175
-#: ../gitg/gitg-ref-action-merge.vala:191
+#: gitg/gitg-ref-action-merge.vala:175 gitg/gitg-ref-action-merge.vala:191
msgid "Merge has conflicts"
msgstr "Merge has conflicts"
-#: ../gitg/gitg-ref-action-merge.vala:184
+#: gitg/gitg-ref-action-merge.vala:184
#, c-format
msgid ""
"The merge of %s into %s has caused conflicts, would you like to checkout "
@@ -1048,7 +1162,7 @@ msgstr ""
"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?"
-#: ../gitg/gitg-ref-action-merge.vala:188
+#: 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 "
@@ -1057,97 +1171,98 @@ msgstr ""
"The merge of %s into %s has caused conflicts, would you like to checkout the "
"merge to your working directory to resolve the conflicts?"
-#: ../gitg/gitg-ref-action-merge.vala:199
+#: gitg/gitg-ref-action-merge.vala:199
msgid "Merge failed with conflicts"
msgstr "Merge failed with conflicts"
-#: ../gitg/gitg-ref-action-merge.vala:210
+#: gitg/gitg-ref-action-merge.vala:210
msgid "Finished merge with conflicts in working directory"
msgstr "Finished merge with conflicts in working directory"
-#: ../gitg/gitg-ref-action-merge.vala:222
+#: gitg/gitg-ref-action-merge.vala:222
#, c-format
msgid "Merge %s into %s"
msgstr "Merge %s into %s"
-#: ../gitg/gitg-ref-action-merge.vala:231
+#: gitg/gitg-ref-action-merge.vala:231
#, c-format
msgid "Failed to lookup our commit: %s"
msgstr "Failed to lookup our commit: %s"
-#: ../gitg/gitg-ref-action-merge.vala:241
+#: gitg/gitg-ref-action-merge.vala:241
#, c-format
msgid "Failed to lookup their commit: %s"
msgstr "Failed to lookup their commit: %s"
-#: ../gitg/gitg-ref-action-merge.vala:278
+#: gitg/gitg-ref-action-merge.vala:278
#, c-format
msgid "Successfully merged %s into %s"
msgstr "Successfully merged %s into %s"
-#: ../gitg/gitg-ref-action-merge.vala:320
+#: gitg/gitg-ref-action-merge.vala:320
#, c-format
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:1176
+#: gitg/gitg-ref-action-merge.vala:482
+#: gitg/history/gitg-history-refs-list.vala:1176
msgid "Tags"
msgstr "Tags"
-#: ../gitg/gitg-ref-action-rename.vala:48
+#: gitg/gitg-ref-action-rename.vala:48
msgid "Rename"
msgstr "Rename"
-#: ../gitg/gitg-ref-action-rename.vala:53
+#: gitg/gitg-ref-action-rename.vala:53
msgid "Rename the selected reference"
msgstr "Rename the selected reference"
-#: ../gitg/gitg-ref-action-rename.vala:100
+#: gitg/gitg-ref-action-rename.vala:100
#, c-format
-msgid "The specified name ‘%s’ contains invalid characters"
-msgstr "The specified name ‘%s’ contains invalid characters"
+#| msgid "The specified name ‘%s’ contains invalid characters"
+msgid "The specified name “%s” contains invalid characters"
+msgstr "The specified name “%s” contains invalid characters"
-#: ../gitg/gitg-ref-action-rename.vala:102
+#: gitg/gitg-ref-action-rename.vala:102
msgid "Invalid name"
msgstr "Invalid name"
-#: ../gitg/gitg-ref-action-rename.vala:131
+#: gitg/gitg-ref-action-rename.vala:131
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.h:10
+#: gitg/gitg-remote-notification.vala:90 gitg/gitg-simple-notification.vala:99
+#: gitg/resources/ui/gitg-window.ui:226
msgid "Close"
msgstr "Close"
-#: ../gitg/gitg-window.vala:187
+#: gitg/gitg-window.vala:201
msgid "Add Repository"
msgstr "Add repository"
-#: ../gitg/gitg-window.vala:191
+#: gitg/gitg-window.vala:205
msgid "_Add"
msgstr "_Add"
-#: ../gitg/gitg-window.vala:193
+#: gitg/gitg-window.vala:207
msgid "_Scan for all git repositories from this directory"
msgstr "_Scan for all git repositories from this directory"
-#: ../gitg/gitg-window.vala:501
+#: gitg/gitg-window.vala:505
msgid "Projects"
msgstr "Projects"
-#: ../gitg/gitg-window.vala:751
+#: gitg/gitg-window.vala:804
msgid "Select items"
msgstr "Select items"
-#: ../gitg/gitg-window.vala:958
+#: gitg/gitg-window.vala:1015
#, c-format
-msgid "'%s' is not a Git repository."
-msgstr "'%s' is not a Git repository."
+#| msgid "'%s' is not a Git repository."
+msgid "“%s” is not a Git repository."
+msgstr "“%s” is not a Git repository."
-#: ../gitg/gitg-window.vala:1107
+#: gitg/gitg-window.vala:1164
msgid ""
"Your user name and email are not configured yet. Please go to the user "
"configuration and provide your name and email."
@@ -1155,7 +1270,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:1111
+#: gitg/gitg-window.vala:1168
msgid ""
"Your user name is not configured yet. Please go to the user configuration "
"and provide your name."
@@ -1163,7 +1278,7 @@ msgstr ""
"Your user name is not configured yet. Please go to the user configuration "
"and provide your name."
-#: ../gitg/gitg-window.vala:1115
+#: gitg/gitg-window.vala:1172
msgid ""
"Your email is not configured yet. Please go to the user configuration and "
"provide your email."
@@ -1171,315 +1286,156 @@ msgstr ""
"Your e-mail is not configured yet. Please go to the user configuration and "
"provide your e-mail."
-#: ../gitg/gitg-window.vala:1118
+#: gitg/gitg-window.vala:1175
msgid "Missing author details"
msgstr "Missing author details"
-#: ../gitg/history/gitg-history-command-line.vala:42
+#: gitg/history/gitg-history-command-line.vala:42
msgid "Select all commits by default in the history activity"
msgstr "Select all commits by default in the history activity"
-#: ../gitg/history/gitg-history-command-line.vala:44
+#: gitg/history/gitg-history-command-line.vala:44
msgid "Select all branches by default in the history activity"
msgstr "Select all branches by default in the history activity"
-#: ../gitg/history/gitg-history-command-line.vala:46
+#: gitg/history/gitg-history-command-line.vala:46
msgid "Select all remotes by default in the history activity"
msgstr "Select all remotes by default in the history activity"
-#: ../gitg/history/gitg-history-command-line.vala:48
+#: gitg/history/gitg-history-command-line.vala:48
msgid "Select all tags by default in the history activity"
msgstr "Select all tags by default in the history activity"
-#: ../gitg/history/gitg-history-command-line.vala:50
+#: gitg/history/gitg-history-command-line.vala:50
msgid "Select the specified reference by default in the history activity"
msgstr "Select the specified reference by default in the history activity"
-#: ../gitg/history/gitg-history-command-line.vala:50
+#: gitg/history/gitg-history-command-line.vala:50
msgid "REFERENCE"
msgstr "REFERENCE"
-#: ../gitg/history/gitg-history-refs-list.vala:165
+#: gitg/history/gitg-history-refs-list.vala:165
#, c-format
-#| msgid "%d ahead, %d behind"
msgid "%zu ahead, %zu behind"
msgstr "%zu ahead, %zu behind"
-#: ../gitg/history/gitg-history-refs-list.vala:169
+#: gitg/history/gitg-history-refs-list.vala:169
#, c-format
-#| msgid "%d ahead"
msgid "%zu ahead"
msgstr "%zu ahead"
-#: ../gitg/history/gitg-history-refs-list.vala:173
+#: gitg/history/gitg-history-refs-list.vala:173
#, c-format
-#| msgid "%d behind"
msgid "%zu behind"
msgstr "%zu behind"
-#: ../gitg/history/gitg-history-refs-list.vala:207
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
+#: gitg/history/gitg-history-refs-list.vala:207
+#: gitg/resources/ui/gitg-preferences-history.ui:81
msgid "All commits"
msgstr "All commits"
-#: ../gitg/history/gitg-history-refs-list.vala:1174
+#: gitg/history/gitg-history-refs-list.vala:1174
msgid "Branches"
msgstr "Branches"
-#: ../gitg/history/gitg-history-refs-list.vala:1175
+#: gitg/history/gitg-history-refs-list.vala:1175
msgid "Remotes"
msgstr "Remotes"
-#: ../gitg/history/gitg-history.vala:342
-#: ../gitg/preferences/gitg-preferences-history.vala:218
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:3
+#: gitg/history/gitg-history.vala:342
+#: 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:347
msgid "Examine the history of the repository"
msgstr "Examine the history of the repository"
-#: ../gitg/history/gitg-history.vala:909
+#: gitg/history/gitg-history.vala:909
msgid "Mainline"
msgstr "Mainline"
-#: ../gitg/preferences/gitg-preferences-commit.vala:119
+#: gitg/preferences/gitg-preferences-commit.vala:119
msgctxt "Preferences"
msgid "Commit"
msgstr "Commit"
-#: ../gitg/preferences/gitg-preferences-interface.vala:120
+#: gitg/preferences/gitg-preferences-interface.vala:140
msgid "Interface"
msgstr "Interface"
-#. 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 "Password required for %s"
-
-#: ../libgitg/gitg-date.vala:346
-msgid "Now"
-msgstr "Now"
-
-#: ../libgitg/gitg-date.vala:350
-#, c-format
-msgid "A minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "A minute ago"
-msgstr[1] "%d minutes ago"
-
-#: ../libgitg/gitg-date.vala:355
-msgid "Half an hour ago"
-msgstr "Half an hour ago"
-
-#: ../libgitg/gitg-date.vala:360
-#, c-format
-msgid "An hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "An hour ago"
-msgstr[1] "%d hours ago"
-
-#: ../libgitg/gitg-date.vala:365
-#, c-format
-msgid "A day ago"
-msgid_plural "%d days ago"
-msgstr[0] "A day ago"
-msgstr[1] "%d days ago"
-
-#. 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"
-
-#. 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"
-
-#. 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"
-
-#. 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"
-
-#. 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 "before (%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 "removed (%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:67
-#, c-format
-msgid "after (%s)"
-msgstr "after (%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:73
-#, c-format
-msgid "added (%s)"
-msgstr "added (%s)"
-
-#: ../libgitg/gitg-diff-view-commit-details.vala:145
-msgid "Collapse all"
-msgstr "Collapse all"
-
-#: ../libgitg/gitg-diff-view-commit-details.vala:149
-#: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:2
-msgid "Expand all"
-msgstr "Expand all"
-
-#: ../libgitg/gitg-diff-view-commit-details.vala:202
-#, c-format
-msgid "Committed by %s"
-msgstr "Committed by %s"
-
-#: ../libgitg/gitg-diff-view-file.vala:177
-msgid "_Open file"
-msgstr "_Open file"
-
-#: ../libgitg/gitg-diff-view-file.vala:209
-msgid "Open containing _folder"
-msgstr "Open containing _folder"
-
-#: ../libgitg/gitg-diff-view-file.vala:229
-msgid "_Copy file path"
-msgstr "_Copy file path"
-
-#. Translators: this is used to construct: "at <directory>", to indicate where the repository is at.
-#: ../libgitg/gitg-repository-list-box.vala:154
-#, c-format
-msgid "at %s"
-msgstr "at %s"
-
-#. Translators: this is used to construct: "<branch-name> at <directory>"
-#: ../libgitg/gitg-repository-list-box.vala:163
-#, c-format
-msgid "%s at %s"
-msgstr "%s at %s"
-
-#: ../libgitg/gitg-repository-list-box.vala:541
-msgid "Cloning…"
-msgstr "Cloning…"
-
-#: ../libgitg/gitg-stage.vala:334
-#, c-format
-msgid "Could not read commit message after running commit-msg hook: %s"
-msgstr "Could not read commit message after running commit-msg hook: %s"
-
-#: ../plugins/diff/gitg-diff.vala:115
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:11
-msgid "Diff"
-msgstr "Diff"
-
-#: ../plugins/diff/gitg-diff.vala:120
-msgid "Show the changes introduced by the selected commit"
-msgstr "Show the changes introduced by the selected commit"
-
-#: ../plugins/files/gitg-files.vala:63
-msgid "Files"
-msgstr "Files"
-
-#: ../plugins/files/gitg-files.vala:68
-msgid "Show the files in the tree of the selected commit"
-msgstr "Show the files in the tree of the selected commit"
-
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:3
+#: gitg/resources/ui/gitg-author-details-dialog.ui:35
msgid "_Save"
msgstr "_Save"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:4
+#: gitg/resources/ui/gitg-author-details-dialog.ui:65
msgid "Default details used for all repositories"
msgstr "Default details used for all repositories"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:5
+#: gitg/resources/ui/gitg-author-details-dialog.ui:114
msgid "E-mail:"
msgstr "E-mail:"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
+#: gitg/resources/ui/gitg-author-details-dialog.ui:125
msgid "Name:"
msgstr "Name:"
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:1
+#: gitg/resources/ui/gitg-clone-dialog.ui:7
msgid "Clone Repository"
msgstr "Clone Repository"
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:3
+#: gitg/resources/ui/gitg-clone-dialog.ui:33
msgid "Cl_one"
msgstr "Cl_one"
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:4
+#: gitg/resources/ui/gitg-clone-dialog.ui:68
msgid "Remote _URL:"
msgstr "Remote _URL:"
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:5
+#: gitg/resources/ui/gitg-clone-dialog.ui:99
msgid "_Local Folder:"
msgstr "_Local Folder:"
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:6
+#: gitg/resources/ui/gitg-clone-dialog.ui:116
msgid "Select location…"
msgstr "Select location…"
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:7
+#: gitg/resources/ui/gitg-clone-dialog.ui:127
msgid "Bare repository"
msgstr "Bare repository"
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:1
+#: gitg/resources/ui/gitg-commit-dialog.ui:8
msgctxt "Create Dialog"
msgid "Commit"
msgstr "Commit"
-#: ../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:36
+#: gitg/resources/ui/gitg-commit-paned.ui:86
msgid "C_ommit"
msgstr "C_ommit"
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:4
+#: gitg/resources/ui/gitg-commit-dialog.ui:109
msgid "Add _signed-off-by signature"
msgstr "Add _signed-off-by signature"
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:5
+#: gitg/resources/ui/gitg-commit-dialog.ui:126
msgid "_Amend previous commit"
msgstr "_Amend previous commit"
-#: ../gitg/resources/ui/gitg-commit-paned.ui.h:1
+#: gitg/resources/ui/gitg-commit-paned.ui:76
msgid "Skip commit _hooks"
msgstr "Skip commit _hooks"
-#: ../gitg/resources/ui/gitg-commit-paned.ui.h:3
+#: gitg/resources/ui/gitg-commit-paned.ui:96
msgid "S_tage selection"
msgstr "S_tage selection"
-#: ../gitg/resources/ui/gitg-commit-paned.ui.h:4
+#: gitg/resources/ui/gitg-commit-paned.ui:107
msgid "D_iscard selection"
msgstr "D_iscard selection"
-#: ../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."
@@ -1487,55 +1443,55 @@ msgstr ""
"The submodule is in a dirty state and has staged and/or unstaged changes "
"that are not yet committed as shown below."
-#: ../gitg/resources/ui/gitg-commit-submodule-diff-view.ui.h:2
+#: gitg/resources/ui/gitg-commit-submodule-diff-view.ui:50
msgid "Staged:"
msgstr "Staged:"
-#: ../gitg/resources/ui/gitg-commit-submodule-diff-view.ui.h:3
+#: gitg/resources/ui/gitg-commit-submodule-diff-view.ui:86
msgid "Unstaged:"
msgstr "Unstaged:"
-#: ../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:24
+#: gitg/resources/ui/gitg-history-paned.ui:93
msgid "Subject"
msgstr "Subject"
-#: ../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:41
+#: gitg/resources/ui/gitg-history-paned.ui:110
msgid "Author"
msgstr "Author"
-#: ../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:57
+#: gitg/resources/ui/gitg-history-paned.ui:126
msgid "Date"
msgstr "Date"
-#: ../gitg/resources/ui/gitg-commit-submodule-info.ui.h:1
+#: gitg/resources/ui/gitg-commit-submodule-info.ui:70
msgid "Open"
msgstr "Open"
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
+#: gitg/resources/ui/gitg-create-branch-dialog.ui:7
msgid "Create Branch"
msgstr "Create branch"
-#: ../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 "C_reate"
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:4
+#: gitg/resources/ui/gitg-create-branch-dialog.ui:69
msgid "Branch _name:"
msgstr "Branch _name:"
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:1
+#: gitg/resources/ui/gitg-create-tag-dialog.ui:7
msgid "Create Tag"
msgstr "Create Tag"
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:4
+#: gitg/resources/ui/gitg-create-tag-dialog.ui:71
msgid "Tag _name:"
msgstr "Tag _name:"
-#: ../gitg/resources/ui/gitg-dash-view.ui.h:1
+#: 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."
@@ -1543,215 +1499,370 @@ msgstr ""
"No repositories have been added yet. To get started, you can add an existing "
"repository or clone a new one."
-#: ../gitg/resources/ui/gitg-menus.ui.h:1
-msgid "_New Window"
-msgstr "_New Window"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:2
-msgid "_Author Details"
-msgstr "_Author Details"
+#: gitg/resources/ui/gitg-menus.ui:7
+msgid "_Reload"
+msgstr "_Reload"
-#: ../gitg/resources/ui/gitg-menus.ui.h:3
+#: gitg/resources/ui/gitg-menus.ui:13 gitg/resources/ui/gitg-menus.ui:45
msgid "_Preferences"
msgstr "_Preferences"
-#: ../gitg/resources/ui/gitg-menus.ui.h:4
+#: gitg/resources/ui/gitg-menus.ui:19 gitg/resources/ui/gitg-menus.ui:39
+msgid "_Author Details"
+msgstr "_Author Details"
+
+#: gitg/resources/ui/gitg-menus.ui:25 gitg/resources/ui/gitg-menus.ui:51
msgid "_Keyboard Shortcuts"
msgstr "_Keyboard Shortcuts"
-#: ../gitg/resources/ui/gitg-menus.ui.h:5
+#: gitg/resources/ui/gitg-menus.ui:33
+msgid "_New Window"
+msgstr "_New Window"
+
+#: gitg/resources/ui/gitg-menus.ui:55
msgid "_About"
msgstr "_About"
-#: ../gitg/resources/ui/gitg-menus.ui.h:6
-msgid "_Quit"
-msgstr "_Quit"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:7
-msgid "_Reload"
-msgstr "_Reload"
-
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:1
+#: gitg/resources/ui/gitg-preferences-commit.ui:44
msgid "Show markup"
msgstr "Show markup"
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:2
+#: gitg/resources/ui/gitg-preferences-commit.ui:71
msgid "Display _subject margin at column:"
msgstr "Display _subject margin at column:"
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:3
+#: gitg/resources/ui/gitg-preferences-commit.ui:126
msgid "Display right _margin at column:"
msgstr "Display right _margin at column:"
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:4
+#: gitg/resources/ui/gitg-preferences-commit.ui:189
msgid "Enable spell checking"
msgstr "Enable spell checking"
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:5
+#: gitg/resources/ui/gitg-preferences-commit.ui:220
msgid "Commit Message"
msgstr "Commit Message"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:1
+#: gitg/resources/ui/gitg-preferences-history.ui:31
msgid "Default selection"
msgstr "Default selection"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
+#: gitg/resources/ui/gitg-preferences-history.ui:50
msgid "Current branch"
msgstr "Current branch"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+#: gitg/resources/ui/gitg-preferences-history.ui:65
msgid "All branches"
msgstr "All branches"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
+#: gitg/resources/ui/gitg-preferences-history.ui:106
msgid "References"
msgstr "References"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:6
+#: gitg/resources/ui/gitg-preferences-history.ui:119
msgid "Sort references in the sidebar by latest activity"
msgstr "Sort references in the sidebar by latest activity"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:7
+#: gitg/resources/ui/gitg-preferences-history.ui:135
msgid "Show upstream (remote) branch when selecting a local branch"
msgstr "Show upstream (remote) branch when selecting a local branch"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:8
+#: gitg/resources/ui/gitg-preferences-history.ui:154
msgid "Commits"
msgstr "Commit"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:9
+#: gitg/resources/ui/gitg-preferences-history.ui:174
msgid "Collapse inactive lanes"
msgstr "Collapse inactive lanes"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:10
+#: gitg/resources/ui/gitg-preferences-history.ui:215
msgid "Early"
msgstr "Early"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:11
+#: gitg/resources/ui/gitg-preferences-history.ui:227
msgid "Late"
msgstr "Late"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:12
+#: gitg/resources/ui/gitg-preferences-history.ui:242
msgid "Show history in topological order"
msgstr "Show history in topological order"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:13
+#: gitg/resources/ui/gitg-preferences-history.ui:257
msgid "Preserve mainline for currently checked out branch"
msgstr "Preserve mainline for currently checked out branch"
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:1
+#: gitg/resources/ui/gitg-preferences-interface.ui:24
msgid "Startup"
msgstr "Startup"
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:2
+#: gitg/resources/ui/gitg-preferences-interface.ui:47
msgid "Start with activity:"
msgstr "Start with activity:"
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:4
+#: gitg/resources/ui/gitg-preferences-interface.ui:61
msgid "Commit"
msgstr "Commit"
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:5
+#: gitg/resources/ui/gitg-preferences-interface.ui:80
msgid "Layout"
msgstr "Layout"
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:6
+#: gitg/resources/ui/gitg-preferences-interface.ui:100
msgid "Use horizontal layout"
msgstr "Use horizontal layout"
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:7
+#: gitg/resources/ui/gitg-preferences-interface.ui:124
msgid "Avatars"
msgstr "Avatars"
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:8
+#: gitg/resources/ui/gitg-preferences-interface.ui:144
msgid "Use gravatar service to provide user avatars"
msgstr "Use gravatar service to provide user avatars"
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:9
+#: gitg/resources/ui/gitg-preferences-interface.ui:168
msgid "Monitoring"
msgstr "Monitoring"
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:12
+#: gitg/resources/ui/gitg-preferences-interface.ui:212
+#: plugins/diff/gitg-diff.vala:115
+msgid "Diff"
+msgstr "Diff"
+
+#: gitg/resources/ui/gitg-preferences-interface.ui:232
msgid "Enable syntax highlighting of source code in diff views"
msgstr "Enable syntax highlighting of source code in diff views"
-#: ../gitg/resources/ui/gitg-preferences.ui.h:1
+#: gitg/resources/ui/gitg-preferences-interface.ui:258
+msgid "Syntax highlighting color scheme:"
+msgstr "Syntax highlighting colour scheme:"
+
+#: gitg/resources/ui/gitg-preferences.ui:11
msgid "Preferences"
msgstr "Preferences"
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:1
+#: gitg/resources/ui/gitg-shortcuts.ui:14
msgctxt "shortcut window"
msgid "Windows"
msgstr "Windows"
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:2
+#: gitg/resources/ui/gitg-shortcuts.ui:19
+#| msgctxt "shortcut window"
+#| msgid "Open the window menu"
+msgctxt "shortcut window"
+msgid "Open shortcut window"
+msgstr "Open shortcut window"
+
+#: gitg/resources/ui/gitg-shortcuts.ui:26
msgctxt "shortcut window"
msgid "Open a new window"
msgstr "Open a new window"
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:3
+#: gitg/resources/ui/gitg-shortcuts.ui:33
msgctxt "shortcut window"
msgid "Open the window menu"
msgstr "Open the window menu"
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:4
+#: gitg/resources/ui/gitg-shortcuts.ui:40
msgctxt "shortcut window"
msgid "Open a repository"
msgstr "Open a repository"
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:5
+#: gitg/resources/ui/gitg-shortcuts.ui:47
msgctxt "shortcut window"
msgid "Open the help"
msgstr "Open the help"
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:6
+#: gitg/resources/ui/gitg-shortcuts.ui:54
msgctxt "shortcut window"
msgid "Find"
msgstr "Find"
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:7
+#: gitg/resources/ui/gitg-shortcuts.ui:61
msgctxt "shortcut window"
msgid "Close the active window"
msgstr "Close the active window"
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:8
+#: gitg/resources/ui/gitg-shortcuts.ui:68
msgctxt "shortcut window"
msgid "Quit the application"
msgstr "Quit the application"
-#: ../gitg/resources/ui/gitg-window.ui.h:2
+#: gitg/resources/ui/gitg-window.ui:23
msgid "Show the list of recently used repositories"
msgstr "Show the list of recently used repositories"
-#: ../gitg/resources/ui/gitg-window.ui.h:3
+#: gitg/resources/ui/gitg-window.ui:45
msgid "Clone"
msgstr "Clone"
-#: ../gitg/resources/ui/gitg-window.ui.h:4
+#: gitg/resources/ui/gitg-window.ui:46
msgid "Clone repository"
msgstr "Clone repository"
-#: ../gitg/resources/ui/gitg-window.ui.h:5
+#: gitg/resources/ui/gitg-window.ui:61
msgid "Add"
msgstr "Add"
-#: ../gitg/resources/ui/gitg-window.ui.h:6
+#: gitg/resources/ui/gitg-window.ui:62
msgid "Add repository"
msgstr "Add repository"
-#: ../gitg/resources/ui/gitg-window.ui.h:7
+#: gitg/resources/ui/gitg-window.ui:86
msgid "Find a word or phrase"
msgstr "Find a word or phrase"
-#: ../gitg/resources/ui/gitg-window.ui.h:8
+#: gitg/resources/ui/gitg-window.ui:131
msgid "General settings and options"
msgstr "General settings and options"
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:2
+#. 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 "Password required for %s"
+
+#: libgitg/gitg-date.vala:346
+msgid "Now"
+msgstr "Now"
+
+#: libgitg/gitg-date.vala:350
+#, c-format
+msgid "A minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "A minute ago"
+msgstr[1] "%d minutes ago"
+
+#: libgitg/gitg-date.vala:355
+msgid "Half an hour ago"
+msgstr "Half an hour ago"
+
+#: libgitg/gitg-date.vala:360
+#, c-format
+msgid "An hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "An hour ago"
+msgstr[1] "%d hours ago"
+
+#: libgitg/gitg-date.vala:365
+#, c-format
+msgid "A day ago"
+msgid_plural "%d days ago"
+msgstr[0] "A day ago"
+msgstr[1] "%d days ago"
+
+#. 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 "%b %e, %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 "%b %e, %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 "%b %e %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 "%b %e %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 "before (%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 "removed (%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 "after (%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 "added (%s)"
+
+#: libgitg/gitg-diff-view-commit-details.vala:144
+msgid "Collapse all"
+msgstr "Collapse all"
+
+#: libgitg/gitg-diff-view-commit-details.vala:148
+#: libgitg/resources/ui/gitg-diff-view-commit-details.ui:211
+msgid "Expand all"
+msgstr "Expand all"
+
+#: libgitg/gitg-diff-view-commit-details.vala:203
+#, c-format
+msgid "Committed by %s"
+msgstr "Committed by %s"
+
+#: libgitg/gitg-diff-view-file.vala:177
+msgid "_Open file"
+msgstr "_Open file"
+
+#: libgitg/gitg-diff-view-file.vala:209
+msgid "Open containing _folder"
+msgstr "Open containing _folder"
+
+#: libgitg/gitg-diff-view-file.vala:229
+msgid "_Copy file path"
+msgstr "_Copy file path"
+
+#. 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 "at %s"
+
+#. Translators: this is used to construct: "<branch-name> at <directory>"
+#: libgitg/gitg-repository-list-box.vala:162
+#, c-format
+msgid "%s at %s"
+msgstr "%s at %s"
+
+#: libgitg/gitg-repository-list-box.vala:545
+msgid "Cloning…"
+msgstr "Cloning…"
+
+#: libgitg/gitg-stage.vala:334
+#, c-format
+msgid "Could not read commit message after running commit-msg hook: %s"
+msgstr "Could not read commit message after running commit-msg hook: %s"
+
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:18
msgid "_Authenticate"
msgstr "_Authenticate"
-#: ../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."
@@ -1759,75 +1870,89 @@ msgstr ""
"The previous attempt to authenticate has failed, please provide your user "
"name and password and try again."
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:4
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:95
msgid "_Username:"
msgstr "_Username:"
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:5
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:109
msgid "_Password:"
msgstr "_Password:"
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:6
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:154
msgid "Forget password _immediately"
msgstr "Forget password _immediately"
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:7
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:171
msgid "Remember password until you _logout"
msgstr "Remember password until you _logout"
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:8
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:189
msgid "Remember _forever"
msgstr "Remember _forever"
-#: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:1
+#: libgitg/resources/ui/gitg-diff-view-commit-details.ui:151
msgid "Parents"
msgstr "Parents"
-#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-binary.ui.h:1
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-binary.ui:10
msgid "Unable to display changes for binary file"
msgstr "Unable to display changes for binary file"
-#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:1
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui:35
msgid "Side by side"
msgstr "Side by side"
-#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:2
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui:62
msgid "Slider"
msgstr "Slider"
-#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:3
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui:89
msgid "Overlay"
msgstr "Overlay"
-#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:4
-#| msgid "References"
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui:107
msgid "Difference"
msgstr "Difference"
-#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1
+#: libgitg/resources/ui/gitg-diff-view-options-spacing.ui:20
msgid "Tab width:"
msgstr "Tab width:"
-#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:2
+#: libgitg/resources/ui/gitg-diff-view-options-spacing.ui:44
msgid "Wrap lines:"
msgstr "Wrap lines:"
-#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:3
+#: libgitg/resources/ui/gitg-diff-view-options-spacing.ui:67
msgid "Ignore whitespace:"
msgstr "Ignore whitespace:"
-#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:1
+#: libgitg/resources/ui/gitg-diff-view-options.ui:31
msgid "Context:"
msgstr "Context:"
-#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:2
+#: libgitg/resources/ui/gitg-diff-view-options.ui:63
msgid "Spacing"
msgstr "Spacing"
-#: ../libgitg/resources/ui/gitg-repository-list-box-row.ui.h:1
+#: 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 ""
"Remove the repository from the list (does not delete the repository from "
"disk)"
+
+#: plugins/diff/gitg-diff.vala:120
+msgid "Show the changes introduced by the selected commit"
+msgstr "Show the changes introduced by the selected commit"
+
+#: plugins/files/gitg-files.vala:63
+msgid "Files"
+msgstr "Files"
+
+#: plugins/files/gitg-files.vala:68
+msgid "Show the files in the tree of the selected commit"
+msgstr "Show the files in the tree of the selected commit"
+
+#~ msgid "_Quit"
+#~ msgstr "_Quit"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
