mirror of
https://gitlab.gnome.org/GNOME/gitg
synced 2024-07-02 16:09:26 +00:00
Update British English translation
This commit is contained in:
Bruce Cowan
GNOME Translation Robot
parent
89fe6a70a4
commit
c9459eff16
437
po/en_GB.po
437
po/en_GB.po
|
|
@ -1,23 +1,28 @@
|
|||
# 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.me.uk>, 2009-2020.
|
||||
# Zander Brown <zbrown@gnome.org>, 2019-2020.
|
||||
# Bruce Cowan <bruce@bcowan.me.uk>, 2009-2022.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gitg\n"
|
||||
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gitg/issues\n"
|
||||
"POT-Creation-Date: 2020-07-12 12:36+0000\n"
|
||||
"PO-Revision-Date: 2020-08-20 02:05+0100\n"
|
||||
"Last-Translator: Zander Brown <zbrown@gnome.org>\n"
|
||||
"Language-Team: English - United Kingdom <en_GB@li.org>\n"
|
||||
"POT-Creation-Date: 2022-02-15 00:41+0000\n"
|
||||
"PO-Revision-Date: 2022-04-14 21:46+0100\n"
|
||||
"Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
|
||||
"Language-Team: English - United Kingdom <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 3.36.0\n"
|
||||
"X-Generator: Gtranslator 42.0\n"
|
||||
"X-DL-Team: en_GB\n"
|
||||
"X-DL-Module: gitg\n"
|
||||
"X-DL-Branch: master\n"
|
||||
"X-DL-Domain: po\n"
|
||||
"X-DL-State: Translating\n"
|
||||
|
||||
#: contrib/xml/xml-reader.c:327
|
||||
#, c-format
|
||||
|
|
@ -81,7 +86,7 @@ msgstr "Commit staged changes"
|
|||
msgid "Overview of recently used repositories"
|
||||
msgstr "Overview of recently used repositories"
|
||||
|
||||
#: data/org.gnome.gitg.appdata.xml.in.in:105
|
||||
#: data/org.gnome.gitg.appdata.xml.in.in:157
|
||||
msgid "The GNOME Project"
|
||||
msgstr "The GNOME Project"
|
||||
|
||||
|
|
@ -93,6 +98,10 @@ msgstr "@binary@"
|
|||
msgid "Git repository browser"
|
||||
msgstr "Git repository browser"
|
||||
|
||||
#: data/org.gnome.gitg.desktop.in.in:17
|
||||
msgid "New Window"
|
||||
msgstr "New Window"
|
||||
|
||||
#: data/org.gnome.gitg.gschema.xml.in:28
|
||||
msgid "Default Clone Directory"
|
||||
msgstr "Default Clone Directory"
|
||||
|
|
@ -614,12 +623,14 @@ msgstr "Are you sure you want to permanently discard the selected changes?"
|
|||
#: gitg/commit/gitg-commit.vala:1593
|
||||
#: gitg/gitg-commit-action-create-patch.vala:154 gitg/gitg-dash-view.vala:453
|
||||
#: gitg/gitg-window.vala:205 gitg/gitg-window.vala:703
|
||||
#: gitg/resources/ui/gitg-add-remote-action-dialog.ui:18
|
||||
#: 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-edit-remote-dialog.ui:18
|
||||
#: gitg/resources/ui/gitg-remote-notification.ui:30
|
||||
#: gitg/resources/ui/gitg-simple-notification.ui:61
|
||||
#: gitg/resources/ui/gitg-window.ui:154
|
||||
|
|
@ -726,8 +737,8 @@ msgstr ""
|
|||
|
||||
#: gitg/gitg-action-support.vala:133
|
||||
#: gitg/gitg-commit-action-cherry-pick.vala:163
|
||||
#: gitg/gitg-ref-action-delete.vala:88 gitg/gitg-ref-action-push.vala:138
|
||||
#: gitg/gitg-ref-action-merge.vala:194
|
||||
#: gitg/gitg-ref-action-delete.vala:88 gitg/gitg-ref-action-merge.vala:194
|
||||
#: gitg/gitg-ref-action-push.vala:138 gitg/gitg-remove-remote-action.vala:66
|
||||
msgid "Cancel"
|
||||
msgstr "Cancel"
|
||||
|
||||
|
|
@ -763,46 +774,88 @@ msgstr "Failed to create commit: %s"
|
|||
msgid "Failed to checkout index: %s"
|
||||
msgstr "Failed to checkout index: %s"
|
||||
|
||||
#: gitg/gitg-application.vala:38
|
||||
#: gitg/gitg-add-remote-action.vala:46
|
||||
msgid "Add Remote"
|
||||
msgstr "Add Remote"
|
||||
|
||||
#: gitg/gitg-add-remote-action.vala:51
|
||||
msgid "Adds remote to the remotes list"
|
||||
msgstr "Adds remote to the remotes list"
|
||||
|
||||
#: gitg/gitg-add-remote-action.vala:59 gitg/gitg-ref-action-fetch.vala:107
|
||||
#, c-format
|
||||
msgid "Fetching from %s"
|
||||
msgstr "Fetching from %s"
|
||||
|
||||
#. Translators: new refers to a new remote reference having been fetched,
|
||||
#: gitg/gitg-add-remote-action.vala:65 gitg/gitg-ref-action-fetch.vala:115
|
||||
msgid "new"
|
||||
msgstr "new"
|
||||
|
||||
#: gitg/gitg-add-remote-action.vala:75 gitg/gitg-ref-action-fetch.vala:130
|
||||
#, c-format
|
||||
msgid "Failed to fetch from %s: %s"
|
||||
msgstr "Failed to fetch from %s: %s"
|
||||
|
||||
#: gitg/gitg-add-remote-action.vala:78
|
||||
msgid "Failed to fetch added remote"
|
||||
msgstr "Failed to fetch added remote"
|
||||
|
||||
#. Translators: the first %s is the remote url to fetch from,
|
||||
#. * the second is a list of references that got updated.
|
||||
#: gitg/gitg-add-remote-action.vala:90 gitg/gitg-ref-action-fetch.vala:149
|
||||
#, c-format
|
||||
msgid "Fetched from %s: %s"
|
||||
msgstr "Fetched from %s: %s"
|
||||
|
||||
#: gitg/gitg-add-remote-action.vala:129
|
||||
msgid "Failed to add remote"
|
||||
msgstr "Failed to add remote"
|
||||
|
||||
#: gitg/gitg-application.vala:39
|
||||
msgid "Show the application’s version"
|
||||
msgstr "Show the application’s version"
|
||||
|
||||
#: gitg/gitg-application.vala:40
|
||||
#: gitg/gitg-application.vala:41
|
||||
msgid "Start gitg with a particular activity"
|
||||
msgstr "Start gitg with a particular activity"
|
||||
|
||||
#: gitg/gitg-application.vala:42
|
||||
#: gitg/gitg-application.vala:43
|
||||
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:44
|
||||
#: gitg/gitg-application.vala:45
|
||||
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:46
|
||||
#: gitg/gitg-application.vala:47
|
||||
msgid "Run gitg in standalone mode"
|
||||
msgstr "Run gitg in standalone mode"
|
||||
|
||||
#: gitg/gitg-application.vala:92
|
||||
#: gitg/gitg-application.vala:49
|
||||
msgid "Put paths under git if needed"
|
||||
msgstr "Put paths under git if needed"
|
||||
|
||||
#: gitg/gitg-application.vala:95
|
||||
msgid "— Git repository viewer"
|
||||
msgstr "— Git repository viewer"
|
||||
|
||||
#: gitg/gitg-application.vala:226
|
||||
#: gitg/gitg-application.vala:229
|
||||
msgid "gitg is a Git repository viewer for GTK+/GNOME"
|
||||
msgstr "gitg is a Git repository viewer for GTK/GNOME"
|
||||
|
||||
#: gitg/gitg-application.vala:235
|
||||
#: gitg/gitg-application.vala:238
|
||||
msgid "translator-credits"
|
||||
msgstr ""
|
||||
"David King <amigadave@amigadave.com>\n"
|
||||
"Bruce Cowan <bruce@bcowan.me.uk>\n"
|
||||
"Zander Brown <zbrown@gnome.org>"
|
||||
|
||||
#: gitg/gitg-application.vala:238
|
||||
#: gitg/gitg-application.vala:241
|
||||
msgid "gitg homepage"
|
||||
msgstr "gitg homepage"
|
||||
|
||||
#: gitg/gitg-application.vala:393
|
||||
#: gitg/gitg-application.vala:396
|
||||
msgid ""
|
||||
"We are terribly sorry, but gitg requires libgit2 (a library on which gitg "
|
||||
"depends) to be compiled with threading support.\n"
|
||||
|
|
@ -856,8 +909,8 @@ msgstr "Cherry pick this commit onto a branch"
|
|||
|
||||
#: 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"
|
||||
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
|
||||
#, c-format
|
||||
|
|
@ -872,21 +925,21 @@ msgstr "Cherry pick has conflicts"
|
|||
#: gitg/gitg-commit-action-cherry-pick.vala:153
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The cherry pick of %s onto %s has caused conflicts, would you like to "
|
||||
"checkout branch %s with the cherry pick to your working directory to resolve "
|
||||
"the conflicts?"
|
||||
"The cherry pick of “%s” onto “%s” has caused conflicts, would you like to "
|
||||
"checkout branch “%s” with the cherry pick to your working directory to "
|
||||
"resolve the conflicts?"
|
||||
msgstr ""
|
||||
"The cherry pick of %s onto %s has caused conflicts, would you like to "
|
||||
"checkout branch %s with the cherry pick to your working directory to resolve "
|
||||
"the conflicts?"
|
||||
"The cherry pick of “%s” onto “%s” has caused conflicts, would you like to "
|
||||
"checkout branch “%s” with the cherry pick to your working directory to "
|
||||
"resolve the conflicts?"
|
||||
|
||||
#: 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 "
|
||||
"The cherry-pick of “%s” onto “%s” has caused conflicts, would you like to "
|
||||
"checkout the cherry pick to your working directory to resolve the conflicts?"
|
||||
msgstr ""
|
||||
"The cherry-pick of %s onto %s has caused conflicts, would you like to "
|
||||
"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
|
||||
|
|
@ -904,8 +957,8 @@ msgstr "Cherry pick finished with conflicts in working directory"
|
|||
|
||||
#: gitg/gitg-commit-action-cherry-pick.vala:199
|
||||
#, c-format
|
||||
msgid "Cherry pick %s onto %s"
|
||||
msgstr "Cherry pick %s onto %s"
|
||||
msgid "Cherry pick “%s” onto “%s”"
|
||||
msgstr "Cherry pick “%s” onto “%s”"
|
||||
|
||||
#: gitg/gitg-commit-action-cherry-pick.vala:224
|
||||
msgid "Successfully cherry picked"
|
||||
|
|
@ -913,8 +966,8 @@ msgstr "Successfully cherry picked"
|
|||
|
||||
#: gitg/gitg-commit-action-cherry-pick.vala:261
|
||||
#, c-format
|
||||
msgid "Cherry pick onto %s"
|
||||
msgstr "Cherry pick onto %s"
|
||||
msgid "Cherry pick onto “%s”"
|
||||
msgstr "Cherry pick onto “%s”"
|
||||
|
||||
#: gitg/gitg-commit-action-create-branch.vala:48
|
||||
msgid "Create branch"
|
||||
|
|
@ -1024,14 +1077,26 @@ msgstr "Failed to create repository"
|
|||
msgid "Scanning for repositories in %s"
|
||||
msgstr "Scanning for repositories in %s"
|
||||
|
||||
#: gitg/gitg-edit-remote-action.vala:51
|
||||
msgid "Edit remote"
|
||||
msgstr "Edit remote"
|
||||
|
||||
#: gitg/gitg-edit-remote-action.vala:56
|
||||
msgid "Edits the remote from the remotes list"
|
||||
msgstr "Edits the remote from the remotes list"
|
||||
|
||||
#: gitg/gitg-edit-remote-action.vala:82
|
||||
msgid "Failed to edit remote"
|
||||
msgstr "Failed to edit remote"
|
||||
|
||||
#: gitg/gitg-ref-action-checkout.vala:53
|
||||
msgid "Checkout the selected reference"
|
||||
msgstr "Checkout the selected reference"
|
||||
|
||||
#: gitg/gitg-ref-action-checkout.vala:72
|
||||
#, c-format
|
||||
msgid "Checkout %s"
|
||||
msgstr "Checkout %s"
|
||||
msgid "Checkout “%s”"
|
||||
msgstr "Checkout “%s”"
|
||||
|
||||
#: gitg/gitg-ref-action-checkout.vala:101
|
||||
#, c-format
|
||||
|
|
@ -1049,7 +1114,6 @@ 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"
|
||||
|
||||
|
|
@ -1061,6 +1125,24 @@ msgstr "Copy name"
|
|||
msgid "Copy the name of the reference to the clipboard"
|
||||
msgstr "Copy the name of the reference to the clipboard"
|
||||
|
||||
#: gitg/gitg-ref-action-create-branch.vala:46
|
||||
msgid "Create a new branch at the selected reference"
|
||||
msgstr "Create a new branch at the selected reference"
|
||||
|
||||
#: gitg/gitg-ref-action-create-branch.vala:58
|
||||
#: gitg/gitg-ref-action-create-patch.vala:58
|
||||
#: gitg/gitg-ref-action-create-tag.vala:58
|
||||
msgid "Failed to lookup reference"
|
||||
msgstr "Failed to lookup reference"
|
||||
|
||||
#: gitg/gitg-ref-action-create-patch.vala:46
|
||||
msgid "Create a patch from the selected reference"
|
||||
msgstr "Create a patch from the selected reference"
|
||||
|
||||
#: gitg/gitg-ref-action-create-tag.vala:46
|
||||
msgid "Create a new tag at the selected reference"
|
||||
msgstr "Create a new tag at the selected reference"
|
||||
|
||||
#: gitg/gitg-ref-action-delete.vala:48 gitg/gitg-ref-action-delete.vala:89
|
||||
msgid "Delete"
|
||||
msgstr "Delete"
|
||||
|
|
@ -1123,48 +1205,104 @@ msgstr "Failed to delete branch %s"
|
|||
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:83
|
||||
#, c-format
|
||||
msgid "Fetch from %s"
|
||||
msgstr "Fetch from %s"
|
||||
|
||||
#: gitg/gitg-ref-action-fetch.vala:85
|
||||
#: gitg/gitg-ref-action-fetch.vala:94
|
||||
#, c-format
|
||||
msgid "Fetch remote objects from %s"
|
||||
msgstr "Fetch remote objects from %s"
|
||||
|
||||
#: 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
|
||||
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:120
|
||||
msgid "updated"
|
||||
msgstr "updated"
|
||||
|
||||
#: 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:143
|
||||
#, 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-merge.vala:63
|
||||
#, c-format
|
||||
msgid "Fetched from %s: %s"
|
||||
msgstr "Fetched from %s: %s"
|
||||
msgid "Merge into %s"
|
||||
msgstr "Merge into %s"
|
||||
|
||||
#. TODO
|
||||
#: 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
|
||||
#, 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
|
||||
msgid "Merge has conflicts"
|
||||
msgstr "Merge has conflicts"
|
||||
|
||||
#: gitg/gitg-ref-action-merge.vala:184
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The merge of “%s” into “%s” has caused conflicts, would you like to checkout "
|
||||
"branch “%s” with the merge to your working directory to resolve the "
|
||||
"conflicts?"
|
||||
msgstr ""
|
||||
"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
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The merge of “%s” into “%s” has caused conflicts, would you like to checkout "
|
||||
"the merge to your working directory to resolve the conflicts?"
|
||||
msgstr ""
|
||||
"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
|
||||
msgid "Merge failed with conflicts"
|
||||
msgstr "Merge failed with conflicts"
|
||||
|
||||
#: 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
|
||||
#, c-format
|
||||
msgid "Merge “%s” into “%s”"
|
||||
msgstr "Merge “%s” into “%s”"
|
||||
|
||||
#: 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
|
||||
#, c-format
|
||||
msgid "Failed to lookup their commit: %s"
|
||||
msgstr "Failed to lookup their commit: %s"
|
||||
|
||||
#: 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
|
||||
#, 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:1199
|
||||
msgid "Tags"
|
||||
msgstr "Tags"
|
||||
|
||||
#: gitg/gitg-ref-action-push.vala:80
|
||||
#, c-format
|
||||
|
|
@ -1206,82 +1344,6 @@ msgstr "Are you sure that you want to push the branch %s?"
|
|||
msgid "Push"
|
||||
msgstr "Push"
|
||||
|
||||
#: 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
|
||||
#, c-format
|
||||
msgid "Merge another branch into branch %s"
|
||||
msgstr "Merge another branch into branch %s"
|
||||
|
||||
#: 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
|
||||
msgid "Merge has conflicts"
|
||||
msgstr "Merge has conflicts"
|
||||
|
||||
#: gitg/gitg-ref-action-merge.vala:184
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The merge of %s into %s has caused conflicts, would you like to checkout "
|
||||
"branch %s with the merge to your working directory to resolve the conflicts?"
|
||||
msgstr ""
|
||||
"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
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The merge of %s into %s has caused conflicts, would you like to checkout the "
|
||||
"merge to your working directory to resolve the conflicts?"
|
||||
msgstr ""
|
||||
"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
|
||||
msgid "Merge failed with conflicts"
|
||||
msgstr "Merge failed with conflicts"
|
||||
|
||||
#: 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
|
||||
#, c-format
|
||||
msgid "Merge %s into %s"
|
||||
msgstr "Merge %s into %s"
|
||||
|
||||
#: 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
|
||||
#, c-format
|
||||
msgid "Failed to lookup their commit: %s"
|
||||
msgstr "Failed to lookup their commit: %s"
|
||||
|
||||
#: 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
|
||||
#, 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:1181
|
||||
msgid "Tags"
|
||||
msgstr "Tags"
|
||||
|
||||
#: gitg/gitg-ref-action-rename.vala:48
|
||||
msgid "Rename"
|
||||
msgstr "Rename"
|
||||
|
|
@ -1307,11 +1369,39 @@ msgstr "Failed to rename"
|
|||
msgid "Close"
|
||||
msgstr "Close"
|
||||
|
||||
#: gitg/gitg-remove-remote-action.vala:50
|
||||
msgid "Remove remote"
|
||||
msgstr "Remove remote"
|
||||
|
||||
#: gitg/gitg-remove-remote-action.vala:55
|
||||
msgid "Removes remote from the remotes list"
|
||||
msgstr "Removes remote from the remotes list"
|
||||
|
||||
#: gitg/gitg-remove-remote-action.vala:62
|
||||
#, c-format
|
||||
msgid "Delete remote %s"
|
||||
msgstr "Delete remote %s"
|
||||
|
||||
#: gitg/gitg-remove-remote-action.vala:63
|
||||
#, c-format
|
||||
msgid "Are you sure that you want to remove the remote %s?"
|
||||
msgstr "Are you sure that you want to remove the remote %s?"
|
||||
|
||||
#: gitg/gitg-remove-remote-action.vala:67
|
||||
msgid "Remove"
|
||||
msgstr "Remove"
|
||||
|
||||
#: gitg/gitg-remove-remote-action.vala:91
|
||||
msgid "Failed to remove remote"
|
||||
msgstr "Failed to remove remote"
|
||||
|
||||
#: gitg/gitg-window.vala:202
|
||||
msgid "Add Repository"
|
||||
msgstr "Add repository"
|
||||
|
||||
#: gitg/gitg-window.vala:206 gitg/resources/ui/gitg-window.ui:64
|
||||
#: gitg/gitg-window.vala:206
|
||||
#: gitg/resources/ui/gitg-add-remote-action-dialog.ui:34
|
||||
#: gitg/resources/ui/gitg-window.ui:64
|
||||
msgid "_Add"
|
||||
msgstr "_Add"
|
||||
|
||||
|
|
@ -1324,13 +1414,10 @@ msgid "Projects"
|
|||
msgstr "Projects"
|
||||
|
||||
#: 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"
|
||||
|
||||
|
|
@ -1415,11 +1502,11 @@ msgstr "%zu behind"
|
|||
msgid "All commits"
|
||||
msgstr "All commits"
|
||||
|
||||
#: gitg/history/gitg-history-refs-list.vala:1179
|
||||
#: gitg/history/gitg-history-refs-list.vala:1197
|
||||
msgid "Branches"
|
||||
msgstr "Branches"
|
||||
|
||||
#: gitg/history/gitg-history-refs-list.vala:1180
|
||||
#: gitg/history/gitg-history-refs-list.vala:1198
|
||||
msgid "Remotes"
|
||||
msgstr "Remotes"
|
||||
|
||||
|
|
@ -1433,7 +1520,7 @@ msgstr "History"
|
|||
msgid "Examine the history of the repository"
|
||||
msgstr "Examine the history of the repository"
|
||||
|
||||
#: gitg/history/gitg-history.vala:942
|
||||
#: gitg/history/gitg-history.vala:949
|
||||
msgid "Mainline"
|
||||
msgstr "Mainline"
|
||||
|
||||
|
|
@ -1451,7 +1538,23 @@ msgstr "_Use the system fixed width font (%s)"
|
|||
msgid "Interface"
|
||||
msgstr "Interface"
|
||||
|
||||
#: gitg/resources/ui/gitg-add-remote-action-dialog.ui:7
|
||||
msgid "Create Remote"
|
||||
msgstr "Create Remote"
|
||||
|
||||
#: gitg/resources/ui/gitg-add-remote-action-dialog.ui:69
|
||||
#: gitg/resources/ui/gitg-edit-remote-dialog.ui:69
|
||||
msgid "Remote _name:"
|
||||
msgstr "Remote _name:"
|
||||
|
||||
#: gitg/resources/ui/gitg-add-remote-action-dialog.ui:99
|
||||
#: gitg/resources/ui/gitg-clone-dialog.ui:68
|
||||
#: gitg/resources/ui/gitg-edit-remote-dialog.ui:99
|
||||
msgid "Remote _URL:"
|
||||
msgstr "Remote _URL:"
|
||||
|
||||
#: gitg/resources/ui/gitg-author-details-dialog.ui:35
|
||||
#: gitg/resources/ui/gitg-edit-remote-dialog.ui:34
|
||||
msgid "_Save"
|
||||
msgstr "_Save"
|
||||
|
||||
|
|
@ -1468,27 +1571,22 @@ 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"
|
||||
|
||||
|
|
@ -1501,10 +1599,6 @@ msgstr "Clone Repository"
|
|||
msgid "Cl_one"
|
||||
msgstr "Cl_one"
|
||||
|
||||
#: gitg/resources/ui/gitg-clone-dialog.ui:68
|
||||
msgid "Remote _URL:"
|
||||
msgstr "Remote _URL:"
|
||||
|
||||
#: gitg/resources/ui/gitg-clone-dialog.ui:99
|
||||
msgid "_Local Folder:"
|
||||
msgstr "_Local Folder:"
|
||||
|
|
@ -1592,7 +1686,6 @@ 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"
|
||||
|
||||
|
|
@ -1612,6 +1705,10 @@ 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-edit-remote-dialog.ui:7
|
||||
msgid "Edit Remote"
|
||||
msgstr "Edit Remote"
|
||||
|
||||
#: gitg/resources/ui/gitg-menus.ui:7
|
||||
msgid "_Reload"
|
||||
msgstr "_Reload"
|
||||
|
|
@ -1816,7 +1913,6 @@ 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"
|
||||
|
|
@ -1917,8 +2013,6 @@ 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"
|
||||
|
|
@ -1944,7 +2038,6 @@ msgid "General settings and options"
|
|||
msgstr "General settings and options"
|
||||
|
||||
#: gitg/resources/ui/gitg-window.ui:229
|
||||
#| msgid "Close"
|
||||
msgid "_Close"
|
||||
msgstr "_Close"
|
||||
|
||||
|
|
@ -2040,29 +2133,47 @@ msgstr "after (%s)"
|
|||
msgid "added (%s)"
|
||||
msgstr "added (%s)"
|
||||
|
||||
#: libgitg/gitg-diff-view-commit-details.vala:143
|
||||
#: libgitg/gitg-diff-view-commit-details.vala:145
|
||||
msgid "Collapse all"
|
||||
msgstr "Collapse all"
|
||||
|
||||
#: libgitg/gitg-diff-view-commit-details.vala:147
|
||||
#: libgitg/gitg-diff-view-commit-details.vala:149
|
||||
#: libgitg/resources/ui/gitg-diff-view-commit-details.ui:211
|
||||
msgid "Expand all"
|
||||
msgstr "Expand all"
|
||||
|
||||
#: libgitg/gitg-diff-view-commit-details.vala:202
|
||||
#: libgitg/gitg-diff-view-commit-details.vala:204
|
||||
#, c-format
|
||||
msgid "Committed by %s"
|
||||
msgstr "Committed by %s"
|
||||
|
||||
#: libgitg/gitg-diff-view-file.vala:177
|
||||
#. Translators: Unif stands for unified diff format
|
||||
#: libgitg/gitg-diff-view-file.vala:151
|
||||
msgid "Unif"
|
||||
msgstr "Unif"
|
||||
|
||||
#. Translators: Split stands for the noun
|
||||
#: libgitg/gitg-diff-view-file.vala:156
|
||||
msgid "Split"
|
||||
msgstr "Split"
|
||||
|
||||
#: libgitg/gitg-diff-view-file.vala:163
|
||||
msgid "Binary"
|
||||
msgstr "Binary"
|
||||
|
||||
#: libgitg/gitg-diff-view-file.vala:170
|
||||
msgid "Image"
|
||||
msgstr "Image"
|
||||
|
||||
#: libgitg/gitg-diff-view-file.vala:215
|
||||
msgid "_Open file"
|
||||
msgstr "_Open file"
|
||||
|
||||
#: libgitg/gitg-diff-view-file.vala:209
|
||||
#: libgitg/gitg-diff-view-file.vala:248
|
||||
msgid "Open containing _folder"
|
||||
msgstr "Open containing _folder"
|
||||
|
||||
#: libgitg/gitg-diff-view-file.vala:229
|
||||
#: libgitg/gitg-diff-view-file.vala:268
|
||||
msgid "_Copy file path"
|
||||
msgstr "_Copy file path"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user