{"thread":{"id":"9749","subject":"[PATCH 00/15] i18n support for git-gui","startedAt":"2007-09-02T16:23:50Z","lastAt":"2007-09-03T12:17:56Z","messageCount":21,"participants":["Johannes Schindelin","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":15},"messages":[{"id":"52216","messageId":"Pine.LNX.4.64.0709021719380.28586@racer.site","threadId":"9749","inReplyTo":null,"subject":"[PATCH 00/15] i18n support for git-gui","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:23:50Z","receivedAt":"2007-09-02T16:23:50Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nto test, as usual call \"make\" in git-gui and use git-gui.sh.  Or install \nright away.\n\n\nThe shortlog:\n\nChristian Stimming (6):\n      Mark strings for translation.\n      Makefile rules for translation catalog generation and installation.\n      Add glossary that can be converted into a po file for each language.\n      Add glossary translation template into git.\n      German translation for git-gui\n      German glossary for translation\n\nIrina Riesen (1):\n      git-gui: initial version of russian translation\n\nJohannes Schindelin (2):\n      Add po/git-gui.pot\n      Ignore po/*.msg\n\nJunio C Hamano (1):\n      git-gui po/README: Guide to translators\n\nMiklos Vajna (1):\n      Hungarian translation of git-gui\n\nPaolo Ciarrocchi (1):\n      Italian translation of git-gui\n\nXudong Guan (2):\n      Initial Chinese translation for git-gui\n      git-gui: Added initial version of po/glossary/zh_cn.po\n\nしらいしななこ (1):\n      Japanese translation of git-gui\n\n\nAnd the diffstat:\n\n Makefile                         |   21 +-\n git-gui.sh                       |  265 ++++----\n lib/blame.tcl                    |   10 +-\n lib/branch_checkout.tcl          |   16 +-\n lib/branch_create.tcl            |   38 +-\n lib/branch_delete.tcl            |   22 +-\n lib/branch_rename.tcl            |   22 +-\n lib/browser.tcl                  |   22 +-\n lib/checkout_op.tcl              |   48 +-\n lib/choose_rev.tcl               |   16 +-\n lib/commit.tcl                   |   52 +-\n lib/console.tcl                  |   14 +-\n lib/database.tcl                 |   28 +-\n lib/diff.tcl                     |   16 +-\n lib/error.tcl                    |    8 +-\n lib/index.tcl                    |   23 +-\n lib/merge.tcl                    |   60 +-\n lib/option.tcl                   |   49 +-\n lib/remote.tcl                   |    6 +-\n lib/remote_branch_delete.tcl     |   42 +-\n lib/shortcut.tcl                 |   12 +-\n lib/status_bar.tcl               |    2 +-\n lib/transport.tcl                |   30 +-\n po/.gitignore                    |    2 +\n po/README                        |  205 ++++++\n po/de.po                         | 1398 +++++++++++++++++++++++++++++++++++\n po/git-gui.pot                   | 1264 ++++++++++++++++++++++++++++++++\n po/glossary/Makefile             |    9 +\n po/glossary/de.po                |  158 ++++\n po/glossary/git-gui-glossary.pot |  152 ++++\n po/glossary/git-gui-glossary.txt |   34 +\n po/glossary/txt-to-pot.sh        |   48 ++\n po/glossary/zh_cn.po             |  170 +++++\n po/hu.po                         | 1422 ++++++++++++++++++++++++++++++++++++\n po/it.po                         | 1393 +++++++++++++++++++++++++++++++++++\n po/ja.po                         | 1381 +++++++++++++++++++++++++++++++++++\n po/ru.po                         | 1480 ++++++++++++++++++++++++++++++++++++++\n po/zh_cn.po                      | 1284 +++++++++++++++++++++++++++++++++\n 38 files changed, 10822 insertions(+), 400 deletions(-)\n\n\nHave fun!\n\nCiao,\nDscho\n"},{"id":"52217","messageId":"Pine.LNX.4.64.0709021724440.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 01/15] Mark strings for translation.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:25:00Z","receivedAt":"2007-09-02T16:25:00Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nThe procedure [mc ...] will translate the strings through msgcat.\nStrings must be enclosed in quotes, not in braces, because otherwise\nxgettext cannot extract them properly, although on the Tcl side both\ndelimiters would work fine.\n\n[jes: I merged the later patches to that end.]\n\nSigned-off-by: Christian Stimming <stimming@tuhh.de>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n git-gui.sh                   |  265 +++++++++++++++++++++---------------------\n lib/blame.tcl                |   10 +-\n lib/branch_checkout.tcl      |   16 ++--\n lib/branch_create.tcl        |   38 +++---\n lib/branch_delete.tcl        |   22 ++--\n lib/branch_rename.tcl        |   22 ++--\n lib/browser.tcl              |   22 ++--\n lib/checkout_op.tcl          |   48 ++++----\n lib/choose_rev.tcl           |   16 ++--\n lib/commit.tcl               |   52 ++++----\n lib/console.tcl              |   14 +-\n lib/database.tcl             |   28 +++---\n lib/diff.tcl                 |   16 ++--\n lib/error.tcl                |    8 +-\n lib/index.tcl                |   23 +++-\n lib/merge.tcl                |   60 +++++-----\n lib/option.tcl               |   49 ++++----\n lib/remote.tcl               |    6 +-\n lib/remote_branch_delete.tcl |   42 +++----\n lib/shortcut.tcl             |   12 +-\n lib/status_bar.tcl           |    2 +-\n lib/transport.tcl            |   30 +++---\n 22 files changed, 403 insertions(+), 398 deletions(-)\n\ndiff --git a/git-gui.sh b/git-gui.sh\nindex 486d36e..913ba68 100755\n--- a/git-gui.sh\n+++ b/git-gui.sh\n@@ -502,7 +502,7 @@ proc tk_optionMenu {w varName args} {\n set _git  [_which git]\n if {$_git eq {}} {\n \tcatch {wm withdraw .}\n-\terror_popup \"Cannot find git in PATH.\"\n+\terror_popup [mc \"Cannot find git in PATH.\"]\n \texit 1\n }\n \n@@ -529,7 +529,7 @@ if {![regsub {^git version } $_git_version {} _git_version]} {\n \t\t-icon error \\\n \t\t-type ok \\\n \t\t-title \"git-gui: fatal error\" \\\n-\t\t-message \"Cannot parse Git version string:\\n\\n$_git_version\"\n+\t\t-message [append [mc \"Cannot parse Git version string:\"] \"\\n\\n$_git_version\"]\n \texit 1\n }\n \n@@ -546,14 +546,14 @@ if {![regexp {^[1-9]+(\\.[0-9]+)+$} $_git_version]} {\n \t\t-type yesno \\\n \t\t-default no \\\n \t\t-title \"[appname]: warning\" \\\n-\t\t-message \"Git version cannot be determined.\n+\t\t -message [mc \"Git version cannot be determined.\n \n-$_git claims it is version '$_real_git_version'.\n+%s claims it is version '%s'.\n \n-[appname] requires at least Git 1.5.0 or later.\n+%s requires at least Git 1.5.0 or later.\n \n-Assume '$_real_git_version' is version 1.5.0?\n-\"] eq {yes}} {\n+Assume '%s' is version 1.5.0?\n+\" $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {\n \t\tset _git_version 1.5.0\n \t} else {\n \t\texit 1\n@@ -711,7 +711,7 @@ if {[catch {\n \t\tset _prefix [git rev-parse --show-prefix]\n \t} err]} {\n \tcatch {wm withdraw .}\n-\terror_popup \"Cannot find the git directory:\\n\\n$err\"\n+\terror_popup [append [mc \"Cannot find the git directory:\"] \"\\n\\n$err\"]\n \texit 1\n }\n if {![file isdirectory $_gitdir] && [is_Cygwin]} {\n@@ -719,7 +719,7 @@ if {![file isdirectory $_gitdir] && [is_Cygwin]} {\n }\n if {![file isdirectory $_gitdir]} {\n \tcatch {wm withdraw .}\n-\terror_popup \"Git directory not found:\\n\\n$_gitdir\"\n+\terror_popup [append [mc \"Git directory not found:\"] \"\\n\\n$_gitdir\"]\n \texit 1\n }\n if {$_prefix ne {}} {\n@@ -733,12 +733,12 @@ if {$_prefix ne {}} {\n } elseif {![is_enabled bare]} {\n \tif {[lindex [file split $_gitdir] end] ne {.git}} {\n \t\tcatch {wm withdraw .}\n-\t\terror_popup \"Cannot use funny .git directory:\\n\\n$_gitdir\"\n+\t\terror_popup [append [mc \"Cannot use funny .git directory:\"] \"\\n\\n$_gitdir\"]\n \t\texit 1\n \t}\n \tif {[catch {cd [file dirname $_gitdir]} err]} {\n \t\tcatch {wm withdraw .}\n-\t\terror_popup \"No working directory [file dirname $_gitdir]:\\n\\n$err\"\n+\t\terror_popup [append [mc \"No working directory\"] \" [file dirname $_gitdir]:\\n\\n$err\"]\n \t\texit 1\n \t}\n }\n@@ -885,7 +885,7 @@ proc rescan {after {honor_trustmtime 1}} {\n \t\trescan_stage2 {} $after\n \t} else {\n \t\tset rescan_active 1\n-\t\tui_status {Refreshing file status...}\n+\t\tui_status [mc \"Refreshing file status...\"]\n \t\tset fd_rf [git_read update-index \\\n \t\t\t-q \\\n \t\t\t--unmerged \\\n@@ -922,7 +922,7 @@ proc rescan_stage2 {fd after} {\n \tset buf_rlo {}\n \n \tset rescan_active 3\n-\tui_status {Scanning for modified files ...}\n+\tui_status [mc \"Scanning for modified files ...\"]\n \tset fd_di [git_read diff-index --cached -z [PARENT]]\n \tset fd_df [git_read diff-files -z]\n \tset fd_lo [eval git_read ls-files --others -z $ls_others]\n@@ -1088,7 +1088,7 @@ proc ui_status {msg} {\n }\n \n proc ui_ready {{test {}}} {\n-\t$::main_status show {Ready.} $test\n+\t$::main_status show [mc \"Ready.\"] $test\n }\n \n proc escape_path {path} {\n@@ -1353,31 +1353,32 @@ set all_icons(O$ui_workdir) file_plain\n \n set max_status_desc 0\n foreach i {\n-\t\t{__ \"Unmodified\"}\n-\n-\t\t{_M \"Modified, not staged\"}\n-\t\t{M_ \"Staged for commit\"}\n-\t\t{MM \"Portions staged for commit\"}\n-\t\t{MD \"Staged for commit, missing\"}\n-\n-\t\t{_O \"Untracked, not staged\"}\n-\t\t{A_ \"Staged for commit\"}\n-\t\t{AM \"Portions staged for commit\"}\n-\t\t{AD \"Staged for commit, missing\"}\n-\n-\t\t{_D \"Missing\"}\n-\t\t{D_ \"Staged for removal\"}\n-\t\t{DO \"Staged for removal, still present\"}\n-\n-\t\t{U_ \"Requires merge resolution\"}\n-\t\t{UU \"Requires merge resolution\"}\n-\t\t{UM \"Requires merge resolution\"}\n-\t\t{UD \"Requires merge resolution\"}\n+\t\t{__ {mc \"Unmodified\"}}\n+\n+\t\t{_M {mc \"Modified, not staged\"}}\n+\t\t{M_ {mc \"Staged for commit\"}}\n+\t\t{MM {mc \"Portions staged for commit\"}}\n+\t\t{MD {mc \"Staged for commit, missing\"}}\n+\n+\t\t{_O {mc \"Untracked, not staged\"}}\n+\t\t{A_ {mc \"Staged for commit\"}}\n+\t\t{AM {mc \"Portions staged for commit\"}}\n+\t\t{AD {mc \"Staged for commit, missing\"}}\n+\n+\t\t{_D {mc \"Missing\"}}\n+\t\t{D_ {mc \"Staged for removal\"}}\n+\t\t{DO {mc \"Staged for removal, still present\"}}\n+\n+\t\t{U_ {mc \"Requires merge resolution\"}}\n+\t\t{UU {mc \"Requires merge resolution\"}}\n+\t\t{UM {mc \"Requires merge resolution\"}}\n+\t\t{UD {mc \"Requires merge resolution\"}}\n \t} {\n-\tif {$max_status_desc < [string length [lindex $i 1]]} {\n-\t\tset max_status_desc [string length [lindex $i 1]]\n+\tset text [eval [lindex $i 1]]\n+\tif {$max_status_desc < [string length $text]} {\n+\t\tset max_status_desc [string length $text]\n \t}\n-\tset all_descs([lindex $i 0]) [lindex $i 1]\n+\tset all_descs([lindex $i 0]) $text\n }\n unset i\n \n@@ -1416,7 +1417,7 @@ proc incr_font_size {font {amt 1}} {\n ##\n ## ui commands\n \n-set starting_gitk_msg {Starting gitk... please wait...}\n+set starting_gitk_msg [mc \"Starting gitk... please wait...\"]\n \n proc do_gitk {revs} {\n \t# -- Always start gitk through whatever we were loaded with.  This\n@@ -1425,7 +1426,7 @@ proc do_gitk {revs} {\n \tset exe [file join [file dirname $::_git] gitk]\n \tset cmd [list [info nameofexecutable] $exe]\n \tif {! [file exists $exe]} {\n-\t\terror_popup \"Unable to start gitk:\\n\\n$exe does not exist\"\n+\t\terror_popup [mc \"Unable to start gitk:\\n\\n%s does not exist\" $exe]\n \t} else {\n \t\teval exec $cmd $revs &\n \t\tui_status $::starting_gitk_msg\n@@ -1642,7 +1643,7 @@ proc apply_config {} {\n \t\t\t\tfont configure $font $cn $cv\n \t\t\t}\n \t\t\t} err]} {\n-\t\t\terror_popup \"Invalid font specified in gui.$name:\\n\\n$err\"\n+\t\t\terror_popup [append [mc \"Invalid font specified in gui.%s:\" $name] \"\\n\\n$err\"]\n \t\t}\n \t\tforeach {cn cv} [font configure $font] {\n \t\t\tfont configure ${font}bold $cn $cv\n@@ -1667,8 +1668,8 @@ set default_config(gui.newbranchtemplate) {}\n set default_config(gui.fontui) [font configure font_ui]\n set default_config(gui.fontdiff) [font configure font_diff]\n set font_descs {\n-\t{fontui   font_ui   {Main Font}}\n-\t{fontdiff font_diff {Diff/Console Font}}\n+\t{fontui   font_ui   {mc \"Main Font\"}}\n+\t{fontdiff font_diff {mc \"Diff/Console Font\"}}\n }\n load_config 0\n apply_config\n@@ -1682,18 +1683,18 @@ set ui_comm {}\n # -- Menu Bar\n #\n menu .mbar -tearoff 0\n-.mbar add cascade -label Repository -menu .mbar.repository\n-.mbar add cascade -label Edit -menu .mbar.edit\n+.mbar add cascade -label [mc Repository] -menu .mbar.repository\n+.mbar add cascade -label [mc Edit] -menu .mbar.edit\n if {[is_enabled branch]} {\n-\t.mbar add cascade -label Branch -menu .mbar.branch\n+\t.mbar add cascade -label [mc Branch] -menu .mbar.branch\n }\n if {[is_enabled multicommit] || [is_enabled singlecommit]} {\n-\t.mbar add cascade -label Commit -menu .mbar.commit\n+\t.mbar add cascade -label [mc Commit] -menu .mbar.commit\n }\n if {[is_enabled transport]} {\n-\t.mbar add cascade -label Merge -menu .mbar.merge\n-\t.mbar add cascade -label Fetch -menu .mbar.fetch\n-\t.mbar add cascade -label Push -menu .mbar.push\n+\t.mbar add cascade -label [mc Merge] -menu .mbar.merge\n+\t.mbar add cascade -label [mc Fetch] -menu .mbar.fetch\n+\t.mbar add cascade -label [mc Push] -menu .mbar.push\n }\n . configure -menu .mbar\n \n@@ -1702,87 +1703,87 @@ if {[is_enabled transport]} {\n menu .mbar.repository\n \n .mbar.repository add command \\\n-\t-label {Browse Current Branch's Files} \\\n+\t-label [mc \"Browse Current Branch's Files\"] \\\n \t-command {browser::new $current_branch}\n set ui_browse_current [.mbar.repository index last]\n .mbar.repository add command \\\n-\t-label {Browse Branch Files...} \\\n+\t-label [mc \"Browse Branch Files...\"] \\\n \t-command browser_open::dialog\n .mbar.repository add separator\n \n .mbar.repository add command \\\n-\t-label {Visualize Current Branch's History} \\\n+\t-label [mc \"Visualize Current Branch's History\"] \\\n \t-command {do_gitk $current_branch}\n set ui_visualize_current [.mbar.repository index last]\n .mbar.repository add command \\\n-\t-label {Visualize All Branch History} \\\n+\t-label [mc \"Visualize All Branch History\"] \\\n \t-command {do_gitk --all}\n .mbar.repository add separator\n \n proc current_branch_write {args} {\n \tglobal current_branch\n \t.mbar.repository entryconf $::ui_browse_current \\\n-\t\t-label \"Browse $current_branch's Files\"\n+\t\t-label [mc \"Browse %s's Files\" $current_branch]\n \t.mbar.repository entryconf $::ui_visualize_current \\\n-\t\t-label \"Visualize $current_branch's History\"\n+\t\t-label [mc \"Visualize %s's History\" $current_branch]\n }\n trace add variable current_branch write current_branch_write\n \n if {[is_enabled multicommit]} {\n-\t.mbar.repository add command -label {Database Statistics} \\\n+\t.mbar.repository add command -label [mc \"Database Statistics\"] \\\n \t\t-command do_stats\n \n-\t.mbar.repository add command -label {Compress Database} \\\n+\t.mbar.repository add command -label [mc \"Compress Database\"] \\\n \t\t-command do_gc\n \n-\t.mbar.repository add command -label {Verify Database} \\\n+\t.mbar.repository add command -label [mc \"Verify Database\"] \\\n \t\t-command do_fsck_objects\n \n \t.mbar.repository add separator\n \n \tif {[is_Cygwin]} {\n \t\t.mbar.repository add command \\\n-\t\t\t-label {Create Desktop Icon} \\\n+\t\t\t-label [mc \"Create Desktop Icon\"] \\\n \t\t\t-command do_cygwin_shortcut\n \t} elseif {[is_Windows]} {\n \t\t.mbar.repository add command \\\n-\t\t\t-label {Create Desktop Icon} \\\n+\t\t\t-label [mc \"Create Desktop Icon\"] \\\n \t\t\t-command do_windows_shortcut\n \t} elseif {[is_MacOSX]} {\n \t\t.mbar.repository add command \\\n-\t\t\t-label {Create Desktop Icon} \\\n+\t\t\t-label [mc \"Create Desktop Icon\"] \\\n \t\t\t-command do_macosx_app\n \t}\n }\n \n-.mbar.repository add command -label Quit \\\n+.mbar.repository add command -label [mc Quit] \\\n \t-command do_quit \\\n \t-accelerator $M1T-Q\n \n # -- Edit Menu\n #\n menu .mbar.edit\n-.mbar.edit add command -label Undo \\\n+.mbar.edit add command -label [mc Undo] \\\n \t-command {catch {[focus] edit undo}} \\\n \t-accelerator $M1T-Z\n-.mbar.edit add command -label Redo \\\n+.mbar.edit add command -label [mc Redo] \\\n \t-command {catch {[focus] edit redo}} \\\n \t-accelerator $M1T-Y\n .mbar.edit add separator\n-.mbar.edit add command -label Cut \\\n+.mbar.edit add command -label [mc Cut] \\\n \t-command {catch {tk_textCut [focus]}} \\\n \t-accelerator $M1T-X\n-.mbar.edit add command -label Copy \\\n+.mbar.edit add command -label [mc Copy] \\\n \t-command {catch {tk_textCopy [focus]}} \\\n \t-accelerator $M1T-C\n-.mbar.edit add command -label Paste \\\n+.mbar.edit add command -label [mc Paste] \\\n \t-command {catch {tk_textPaste [focus]; [focus] see insert}} \\\n \t-accelerator $M1T-V\n-.mbar.edit add command -label Delete \\\n+.mbar.edit add command -label [mc Delete] \\\n \t-command {catch {[focus] delete sel.first sel.last}} \\\n \t-accelerator Del\n .mbar.edit add separator\n-.mbar.edit add command -label {Select All} \\\n+.mbar.edit add command -label [mc \"Select All\"] \\\n \t-command {catch {[focus] tag add sel 0.0 end}} \\\n \t-accelerator $M1T-A\n \n@@ -1791,29 +1792,29 @@ menu .mbar.edit\n if {[is_enabled branch]} {\n \tmenu .mbar.branch\n \n-\t.mbar.branch add command -label {Create...} \\\n+\t.mbar.branch add command -label [mc \"Create...\"] \\\n \t\t-command branch_create::dialog \\\n \t\t-accelerator $M1T-N\n \tlappend disable_on_lock [list .mbar.branch entryconf \\\n \t\t[.mbar.branch index last] -state]\n \n-\t.mbar.branch add command -label {Checkout...} \\\n+\t.mbar.branch add command -label [mc \"Checkout...\"] \\\n \t\t-command branch_checkout::dialog \\\n \t\t-accelerator $M1T-O\n \tlappend disable_on_lock [list .mbar.branch entryconf \\\n \t\t[.mbar.branch index last] -state]\n \n-\t.mbar.branch add command -label {Rename...} \\\n+\t.mbar.branch add command -label [mc \"Rename...\"] \\\n \t\t-command branch_rename::dialog\n \tlappend disable_on_lock [list .mbar.branch entryconf \\\n \t\t[.mbar.branch index last] -state]\n \n-\t.mbar.branch add command -label {Delete...} \\\n+\t.mbar.branch add command -label [mc \"Delete...\"] \\\n \t\t-command branch_delete::dialog\n \tlappend disable_on_lock [list .mbar.branch entryconf \\\n \t\t[.mbar.branch index last] -state]\n \n-\t.mbar.branch add command -label {Reset...} \\\n+\t.mbar.branch add command -label [mc \"Reset...\"] \\\n \t\t-command merge::reset_hard\n \tlappend disable_on_lock [list .mbar.branch entryconf \\\n \t\t[.mbar.branch index last] -state]\n@@ -1825,7 +1826,7 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {\n \tmenu .mbar.commit\n \n \t.mbar.commit add radiobutton \\\n-\t\t-label {New Commit} \\\n+\t\t-label [mc \"New Commit\"] \\\n \t\t-command do_select_commit_type \\\n \t\t-variable selected_commit_type \\\n \t\t-value new\n@@ -1833,7 +1834,7 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {\n \t\t[list .mbar.commit entryconf [.mbar.commit index last] -state]\n \n \t.mbar.commit add radiobutton \\\n-\t\t-label {Amend Last Commit} \\\n+\t\t-label [mc \"Amend Last Commit\"] \\\n \t\t-command do_select_commit_type \\\n \t\t-variable selected_commit_type \\\n \t\t-value amend\n@@ -1842,40 +1843,40 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {\n \n \t.mbar.commit add separator\n \n-\t.mbar.commit add command -label Rescan \\\n+\t.mbar.commit add command -label [mc Rescan] \\\n \t\t-command do_rescan \\\n \t\t-accelerator F5\n \tlappend disable_on_lock \\\n \t\t[list .mbar.commit entryconf [.mbar.commit index last] -state]\n \n-\t.mbar.commit add command -label {Stage To Commit} \\\n+\t.mbar.commit add command -label [mc \"Stage To Commit\"] \\\n \t\t-command do_add_selection\n \tlappend disable_on_lock \\\n \t\t[list .mbar.commit entryconf [.mbar.commit index last] -state]\n \n-\t.mbar.commit add command -label {Stage Changed Files To Commit} \\\n+\t.mbar.commit add command -label [mc \"Stage Changed Files To Commit\"] \\\n \t\t-command do_add_all \\\n \t\t-accelerator $M1T-I\n \tlappend disable_on_lock \\\n \t\t[list .mbar.commit entryconf [.mbar.commit index last] -state]\n \n-\t.mbar.commit add command -label {Unstage From Commit} \\\n+\t.mbar.commit add command -label [mc \"Unstage From Commit\"] \\\n \t\t-command do_unstage_selection\n \tlappend disable_on_lock \\\n \t\t[list .mbar.commit entryconf [.mbar.commit index last] -state]\n \n-\t.mbar.commit add command -label {Revert Changes} \\\n+\t.mbar.commit add command -label [mc \"Revert Changes\"] \\\n \t\t-command do_revert_selection\n \tlappend disable_on_lock \\\n \t\t[list .mbar.commit entryconf [.mbar.commit index last] -state]\n \n \t.mbar.commit add separator\n \n-\t.mbar.commit add command -label {Sign Off} \\\n+\t.mbar.commit add command -label [mc \"Sign Off\"] \\\n \t\t-command do_signoff \\\n \t\t-accelerator $M1T-S\n \n-\t.mbar.commit add command -label Commit \\\n+\t.mbar.commit add command -label [mc Commit] \\\n \t\t-command do_commit \\\n \t\t-accelerator $M1T-Return\n \tlappend disable_on_lock \\\n@@ -1886,12 +1887,12 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {\n #\n if {[is_enabled branch]} {\n \tmenu .mbar.merge\n-\t.mbar.merge add command -label {Local Merge...} \\\n+\t.mbar.merge add command -label [mc \"Local Merge...\"] \\\n \t\t-command merge::dialog \\\n \t\t-accelerator $M1T-M\n \tlappend disable_on_lock \\\n \t\t[list .mbar.merge entryconf [.mbar.merge index last] -state]\n-\t.mbar.merge add command -label {Abort Merge...} \\\n+\t.mbar.merge add command -label [mc \"Abort Merge...\"] \\\n \t\t-command merge::reset_hard\n \tlappend disable_on_lock \\\n \t\t[list .mbar.merge entryconf [.mbar.merge index last] -state]\n@@ -1903,38 +1904,38 @@ if {[is_enabled transport]} {\n \tmenu .mbar.fetch\n \n \tmenu .mbar.push\n-\t.mbar.push add command -label {Push...} \\\n+\t.mbar.push add command -label [mc \"Push...\"] \\\n \t\t-command do_push_anywhere \\\n \t\t-accelerator $M1T-P\n-\t.mbar.push add command -label {Delete...} \\\n+\t.mbar.push add command -label [mc \"Delete...\"] \\\n \t\t-command remote_branch_delete::dialog\n }\n \n if {[is_MacOSX]} {\n \t# -- Apple Menu (Mac OS X only)\n \t#\n-\t.mbar add cascade -label Apple -menu .mbar.apple\n+\t.mbar add cascade -label [mc Apple] -menu .mbar.apple\n \tmenu .mbar.apple\n \n-\t.mbar.apple add command -label \"About [appname]\" \\\n+\t.mbar.apple add command -label [mc \"About %s\" [appname]] \\\n \t\t-command do_about\n-\t.mbar.apple add command -label \"Options...\" \\\n+\t.mbar.apple add command -label [mc \"Options...\"] \\\n \t\t-command do_options\n } else {\n \t# -- Edit Menu\n \t#\n \t.mbar.edit add separator\n-\t.mbar.edit add command -label {Options...} \\\n+\t.mbar.edit add command -label [mc \"Options...\"] \\\n \t\t-command do_options\n }\n \n # -- Help Menu\n #\n-.mbar add cascade -label Help -menu .mbar.help\n+.mbar add cascade -label [mc Help] -menu .mbar.help\n menu .mbar.help\n \n if {![is_MacOSX]} {\n-\t.mbar.help add command -label \"About [appname]\" \\\n+\t.mbar.help add command -label [mc \"About %s\" [appname]] \\\n \t\t-command do_about\n }\n \n@@ -1971,7 +1972,7 @@ if {[file isfile $doc_path]} {\n }\n \n if {$browser ne {}} {\n-\t.mbar.help add command -label {Online Documentation} \\\n+\t.mbar.help add command -label [mc \"Online Documentation\"] \\\n \t\t-command [list exec $browser $doc_url &]\n }\n unset browser doc_path doc_url\n@@ -2093,7 +2094,7 @@ frame .branch \\\n \t-borderwidth 1 \\\n \t-relief sunken\n label .branch.l1 \\\n-\t-text {Current Branch:} \\\n+\t-text [mc \"Current Branch:\"] \\\n \t-anchor w \\\n \t-justify left\n label .branch.cb \\\n@@ -2114,7 +2115,7 @@ pack .vpane -anchor n -side top -fill both -expand 1\n # -- Index File List\n #\n frame .vpane.files.index -height 100 -width 200\n-label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \\\n+label .vpane.files.index.title -text [mc \"Staged Changes (Will Be Committed)\"] \\\n \t-background lightgreen\n text $ui_index -background white -borderwidth 0 \\\n \t-width 20 -height 10 \\\n@@ -2134,7 +2135,7 @@ pack $ui_index -side left -fill both -expand 1\n # -- Working Directory File List\n #\n frame .vpane.files.workdir -height 100 -width 200\n-label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \\\n+label .vpane.files.workdir.title -text [mc \"Unstaged Changes (Will Not Be Committed)\"] \\\n \t-background lightsalmon\n text $ui_workdir -background white -borderwidth 0 \\\n \t-width 20 -height 10 \\\n@@ -2175,29 +2176,29 @@ label .vpane.lower.commarea.buttons.l -text {} \\\n pack .vpane.lower.commarea.buttons.l -side top -fill x\n pack .vpane.lower.commarea.buttons -side left -fill y\n \n-button .vpane.lower.commarea.buttons.rescan -text {Rescan} \\\n+button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \\\n \t-command do_rescan\n pack .vpane.lower.commarea.buttons.rescan -side top -fill x\n lappend disable_on_lock \\\n \t{.vpane.lower.commarea.buttons.rescan conf -state}\n \n-button .vpane.lower.commarea.buttons.incall -text {Stage Changed} \\\n+button .vpane.lower.commarea.buttons.incall -text [mc \"Stage Changed\"] \\\n \t-command do_add_all\n pack .vpane.lower.commarea.buttons.incall -side top -fill x\n lappend disable_on_lock \\\n \t{.vpane.lower.commarea.buttons.incall conf -state}\n \n-button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \\\n+button .vpane.lower.commarea.buttons.signoff -text [mc \"Sign Off\"] \\\n \t-command do_signoff\n pack .vpane.lower.commarea.buttons.signoff -side top -fill x\n \n-button .vpane.lower.commarea.buttons.commit -text {Commit} \\\n+button .vpane.lower.commarea.buttons.commit -text [mc Commit] \\\n \t-command do_commit\n pack .vpane.lower.commarea.buttons.commit -side top -fill x\n lappend disable_on_lock \\\n \t{.vpane.lower.commarea.buttons.commit conf -state}\n \n-button .vpane.lower.commarea.buttons.push -text {Push} \\\n+button .vpane.lower.commarea.buttons.push -text [mc Push] \\\n \t-command do_push_anywhere\n pack .vpane.lower.commarea.buttons.push -side top -fill x\n \n@@ -2208,14 +2209,14 @@ frame .vpane.lower.commarea.buffer.header\n set ui_comm .vpane.lower.commarea.buffer.t\n set ui_coml .vpane.lower.commarea.buffer.header.l\n radiobutton .vpane.lower.commarea.buffer.header.new \\\n-\t-text {New Commit} \\\n+\t-text [mc \"New Commit\"] \\\n \t-command do_select_commit_type \\\n \t-variable selected_commit_type \\\n \t-value new\n lappend disable_on_lock \\\n \t[list .vpane.lower.commarea.buffer.header.new conf -state]\n radiobutton .vpane.lower.commarea.buffer.header.amend \\\n-\t-text {Amend Last Commit} \\\n+\t-text [mc \"Amend Last Commit\"] \\\n \t-command do_select_commit_type \\\n \t-variable selected_commit_type \\\n \t-value amend\n@@ -2227,12 +2228,12 @@ label $ui_coml \\\n proc trace_commit_type {varname args} {\n \tglobal ui_coml commit_type\n \tswitch -glob -- $commit_type {\n-\tinitial       {set txt {Initial Commit Message:}}\n-\tamend         {set txt {Amended Commit Message:}}\n-\tamend-initial {set txt {Amended Initial Commit Message:}}\n-\tamend-merge   {set txt {Amended Merge Commit Message:}}\n-\tmerge         {set txt {Merge Commit Message:}}\n-\t*             {set txt {Commit Message:}}\n+\tinitial       {set txt [mc \"Initial Commit Message:\"]}\n+\tamend         {set txt [mc \"Amended Commit Message:\"]}\n+\tamend-initial {set txt [mc \"Amended Initial Commit Message:\"]}\n+\tamend-merge   {set txt [mc \"Amended Merge Commit Message:\"]}\n+\tmerge         {set txt [mc \"Merge Commit Message:\"]}\n+\t*             {set txt [mc \"Commit Message:\"]}\n \t}\n \t$ui_coml conf -text $txt\n }\n@@ -2261,23 +2262,23 @@ pack .vpane.lower.commarea.buffer -side left -fill y\n set ctxm .vpane.lower.commarea.buffer.ctxm\n menu $ctxm -tearoff 0\n $ctxm add command \\\n-\t-label {Cut} \\\n+\t-label [mc Cut] \\\n \t-command {tk_textCut $ui_comm}\n $ctxm add command \\\n-\t-label {Copy} \\\n+\t-label [mc Copy] \\\n \t-command {tk_textCopy $ui_comm}\n $ctxm add command \\\n-\t-label {Paste} \\\n+\t-label [mc Paste] \\\n \t-command {tk_textPaste $ui_comm}\n $ctxm add command \\\n-\t-label {Delete} \\\n+\t-label [mc Delete] \\\n \t-command {$ui_comm delete sel.first sel.last}\n $ctxm add separator\n $ctxm add command \\\n-\t-label {Select All} \\\n+\t-label [mc \"Select All\"] \\\n \t-command {focus $ui_comm;$ui_comm tag add sel 0.0 end}\n $ctxm add command \\\n-\t-label {Copy All} \\\n+\t-label [mc \"Copy All\"] \\\n \t-command {\n \t\t$ui_comm tag add sel 0.0 end\n \t\ttk_textCopy $ui_comm\n@@ -2285,7 +2286,7 @@ $ctxm add command \\\n \t}\n $ctxm add separator\n $ctxm add command \\\n-\t-label {Sign Off} \\\n+\t-label [mc \"Sign Off\"] \\\n \t-command do_signoff\n bind_button3 $ui_comm \"tk_popup $ctxm %X %Y\"\n \n@@ -2301,7 +2302,7 @@ proc trace_current_diff_path {varname args} {\n \t} else {\n \t\tset p $current_diff_path\n \t\tset s [mapdesc [lindex $file_states($p) 0] $p]\n-\t\tset f {File:}\n+\t\tset f [mc \"File:\"]\n \t\tset p [escape_path $p]\n \t\tset o normal\n \t}\n@@ -2335,7 +2336,7 @@ pack .vpane.lower.diff.header.path -fill x\n set ctxm .vpane.lower.diff.header.ctxm\n menu $ctxm -tearoff 0\n $ctxm add command \\\n-\t-label {Copy} \\\n+\t-label [mc Copy] \\\n \t-command {\n \t\tclipboard clear\n \t\tclipboard append \\\n@@ -2403,19 +2404,19 @@ $ui_diff tag raise sel\n set ctxm .vpane.lower.diff.body.ctxm\n menu $ctxm -tearoff 0\n $ctxm add command \\\n-\t-label {Refresh} \\\n+\t-label [mc Refresh] \\\n \t-command reshow_diff\n lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]\n $ctxm add command \\\n-\t-label {Copy} \\\n+\t-label [mc Copy] \\\n \t-command {tk_textCopy $ui_diff}\n lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]\n $ctxm add command \\\n-\t-label {Select All} \\\n+\t-label [mc \"Select All\"] \\\n \t-command {focus $ui_diff;$ui_diff tag add sel 0.0 end}\n lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]\n $ctxm add command \\\n-\t-label {Copy All} \\\n+\t-label [mc \"Copy All\"] \\\n \t-command {\n \t\t$ui_diff tag add sel 0.0 end\n \t\ttk_textCopy $ui_diff\n@@ -2424,36 +2425,36 @@ $ctxm add command \\\n lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]\n $ctxm add separator\n $ctxm add command \\\n-\t-label {Apply/Reverse Hunk} \\\n+\t-label [mc \"Apply/Reverse Hunk\"] \\\n \t-command {apply_hunk $cursorX $cursorY}\n set ui_diff_applyhunk [$ctxm index last]\n lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]\n $ctxm add separator\n $ctxm add command \\\n-\t-label {Decrease Font Size} \\\n+\t-label [mc \"Decrease Font Size\"] \\\n \t-command {incr_font_size font_diff -1}\n lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]\n $ctxm add command \\\n-\t-label {Increase Font Size} \\\n+\t-label [mc \"Increase Font Size\"] \\\n \t-command {incr_font_size font_diff 1}\n lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]\n $ctxm add separator\n $ctxm add command \\\n-\t-label {Show Less Context} \\\n+\t-label [mc \"Show Less Context\"] \\\n \t-command {if {$repo_config(gui.diffcontext) >= 1} {\n \t\tincr repo_config(gui.diffcontext) -1\n \t\treshow_diff\n \t}}\n lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]\n $ctxm add command \\\n-\t-label {Show More Context} \\\n+\t-label [mc \"Show More Context\"] \\\n \t-command {if {$repo_config(gui.diffcontext) < 99} {\n \t\tincr repo_config(gui.diffcontext)\n \t\treshow_diff\n \t}}\n lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]\n $ctxm add separator\n-$ctxm add command -label {Options...} \\\n+$ctxm add command -label [mc \"Options...\"] \\\n \t-command do_options\n proc popup_diff_menu {ctxm x y X Y} {\n \tglobal current_diff_path file_states\n@@ -2461,7 +2462,7 @@ proc popup_diff_menu {ctxm x y X Y} {\n \tset ::cursorY $y\n \tif {$::ui_index eq $::current_diff_side} {\n \t\tset s normal\n-\t\tset l \"Unstage Hunk From Commit\"\n+\t\tset l [mc \"Unstage Hunk From Commit\"]\n \t} else {\n \t\tif {$current_diff_path eq {}\n \t\t\t|| ![info exists file_states($current_diff_path)]\n@@ -2470,7 +2471,7 @@ proc popup_diff_menu {ctxm x y X Y} {\n \t\t} else {\n \t\t\tset s normal\n \t\t}\n-\t\tset l \"Stage Hunk For Commit\"\n+\t\tset l [mc \"Stage Hunk For Commit\"]\n \t}\n \tif {$::is_3way_diff} {\n \t\tset s disabled\n@@ -2484,7 +2485,7 @@ bind_button3 $ui_diff [list popup_diff_menu $ctxm %x %y %X %Y]\n #\n set main_status [::status_bar::new .status]\n pack .status -anchor w -side bottom -fill x\n-$main_status show {Initializing...}\n+$main_status show [mc \"Initializing...\"]\n \n # -- Load geometry\n #\ndiff --git a/lib/blame.tcl b/lib/blame.tcl\nindex 9607284..b5fdad5 100644\n--- a/lib/blame.tcl\n+++ b/lib/blame.tcl\n@@ -74,11 +74,11 @@ constructor new {i_commit i_path} {\n \tset path   $i_path\n \n \tmake_toplevel top w\n-\twm title $top \"[appname] ([reponame]): File Viewer\"\n+\twm title $top [append \"[appname] ([reponame]): \" [mc \"File Viewer\"]]\n \n \tframe $w.header -background gold\n \tlabel $w.header.commit_l \\\n-\t\t-text {Commit:} \\\n+\t\t-text [mc \"Commit:\"] \\\n \t\t-background gold \\\n \t\t-anchor w \\\n \t\t-justify left\n@@ -101,7 +101,7 @@ constructor new {i_commit i_path} {\n \t\t-anchor w \\\n \t\t-justify left\n \tlabel $w.header.path_l \\\n-\t\t-text {File:} \\\n+\t\t-text [mc \"File:\"] \\\n \t\t-background gold \\\n \t\t-anchor w \\\n \t\t-justify left\n@@ -246,7 +246,7 @@ constructor new {i_commit i_path} {\n \n \tmenu $w.ctxm -tearoff 0\n \t$w.ctxm add command \\\n-\t\t-label \"Copy Commit\" \\\n+\t\t-label [mc \"Copy Commit\"] \\\n \t\t-command [cb _copycommit]\n \n \tforeach i $w_columns {\n@@ -366,7 +366,7 @@ method _load {jump} {\n \tset amov_data [list [list]]\n \tset asim_data [list [list]]\n \n-\t$status show \"Reading $commit:[escape_path $path]...\"\n+\t$status show [mc \"Reading %s...\" \"$commit:[escape_path $path]\"]\n \t$w_path conf -text [escape_path $path]\n \tif {$commit eq {}} {\n \t\tset fd [open $path r]\ndiff --git a/lib/branch_checkout.tcl b/lib/branch_checkout.tcl\nindex 72c45b4..6603703 100644\n--- a/lib/branch_checkout.tcl\n+++ b/lib/branch_checkout.tcl\n@@ -11,37 +11,37 @@ field opt_detach    0; # force a detached head case?\n \n constructor dialog {} {\n \tmake_toplevel top w\n-\twm title $top \"[appname] ([reponame]): Checkout Branch\"\n+\twm title $top [append \"[appname] ([reponame]): \" [mc \"Checkout Branch\"]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t}\n \n-\tlabel $w.header -text {Checkout Branch} -font font_uibold\n+\tlabel $w.header -text [mc \"Checkout Branch\"] -font font_uibold\n \tpack $w.header -side top -fill x\n \n \tframe $w.buttons\n-\tbutton $w.buttons.create -text Checkout \\\n+\tbutton $w.buttons.create -text [mc Checkout] \\\n \t\t-default active \\\n \t\t-command [cb _checkout]\n \tpack $w.buttons.create -side right\n-\tbutton $w.buttons.cancel -text {Cancel} \\\n+\tbutton $w.buttons.cancel -text [mc Cancel] \\\n \t\t-command [list destroy $w]\n \tpack $w.buttons.cancel -side right -padx 5\n \tpack $w.buttons -side bottom -fill x -pady 10 -padx 10\n \n-\tset w_rev [::choose_rev::new $w.rev {Revision}]\n+\tset w_rev [::choose_rev::new $w.rev [mc Revision]]\n \t$w_rev bind_listbox <Double-Button-1> [cb _checkout]\n \tpack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5\n \n-\tlabelframe $w.options -text {Options}\n+\tlabelframe $w.options -text [mc Options]\n \n \tcheckbutton $w.options.fetch \\\n-\t\t-text {Fetch Tracking Branch} \\\n+\t\t-text [mc \"Fetch Tracking Branch\"] \\\n \t\t-variable @opt_fetch\n \tpack $w.options.fetch -anchor nw\n \n \tcheckbutton $w.options.detach \\\n-\t\t-text {Detach From Local Branch} \\\n+\t\t-text [mc \"Detach From Local Branch\"] \\\n \t\t-variable @opt_detach\n \tpack $w.options.detach -anchor nw\n \ndiff --git a/lib/branch_create.tcl b/lib/branch_create.tcl\nindex def615d..53dfb4c 100644\n--- a/lib/branch_create.tcl\n+++ b/lib/branch_create.tcl\n@@ -19,28 +19,28 @@ constructor dialog {} {\n \tglobal repo_config\n \n \tmake_toplevel top w\n-\twm title $top \"[appname] ([reponame]): Create Branch\"\n+\twm title $top [append \"[appname] ([reponame]): \" [mc \"Create Branch\"]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t}\n \n-\tlabel $w.header -text {Create New Branch} -font font_uibold\n+\tlabel $w.header -text [mc \"Create New Branch\"] -font font_uibold\n \tpack $w.header -side top -fill x\n \n \tframe $w.buttons\n-\tbutton $w.buttons.create -text Create \\\n+\tbutton $w.buttons.create -text [mc Create] \\\n \t\t-default active \\\n \t\t-command [cb _create]\n \tpack $w.buttons.create -side right\n-\tbutton $w.buttons.cancel -text {Cancel} \\\n+\tbutton $w.buttons.cancel -text [mc Cancel] \\\n \t\t-command [list destroy $w]\n \tpack $w.buttons.cancel -side right -padx 5\n \tpack $w.buttons -side bottom -fill x -pady 10 -padx 10\n \n-\tlabelframe $w.desc -text {Branch Name}\n+\tlabelframe $w.desc -text [mc \"Branch Name\"]\n \tradiobutton $w.desc.name_r \\\n \t\t-anchor w \\\n-\t\t-text {Name:} \\\n+\t\t-text [mc \"Name:\"] \\\n \t\t-value user \\\n \t\t-variable @name_type\n \tset w_name $w.desc.name_t\n@@ -55,7 +55,7 @@ constructor dialog {} {\n \n \tradiobutton $w.desc.match_r \\\n \t\t-anchor w \\\n-\t\t-text {Match Tracking Branch Name} \\\n+\t\t-text [mc \"Match Tracking Branch Name\"] \\\n \t\t-value match \\\n \t\t-variable @name_type\n \tgrid $w.desc.match_r -sticky we -padx {0 5} -columnspan 2\n@@ -63,38 +63,38 @@ constructor dialog {} {\n \tgrid columnconfigure $w.desc 1 -weight 1\n \tpack $w.desc -anchor nw -fill x -pady 5 -padx 5\n \n-\tset w_rev [::choose_rev::new $w.rev {Starting Revision}]\n+\tset w_rev [::choose_rev::new $w.rev [mc \"Starting Revision\"]]\n \tpack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5\n \n-\tlabelframe $w.options -text {Options}\n+\tlabelframe $w.options -text [mc Options]\n \n \tframe $w.options.merge\n-\tlabel $w.options.merge.l -text {Update Existing Branch:}\n+\tlabel $w.options.merge.l -text [mc \"Update Existing Branch:\"]\n \tpack $w.options.merge.l -side left\n \tradiobutton $w.options.merge.no \\\n-\t\t-text No \\\n+\t\t-text [mc No] \\\n \t\t-value none \\\n \t\t-variable @opt_merge\n \tpack $w.options.merge.no -side left\n \tradiobutton $w.options.merge.ff \\\n-\t\t-text {Fast Forward Only} \\\n+\t\t-text [mc \"Fast Forward Only\"] \\\n \t\t-value ff \\\n \t\t-variable @opt_merge\n \tpack $w.options.merge.ff -side left\n \tradiobutton $w.options.merge.reset \\\n-\t\t-text {Reset} \\\n+\t\t-text [mc Reset] \\\n \t\t-value reset \\\n \t\t-variable @opt_merge\n \tpack $w.options.merge.reset -side left\n \tpack $w.options.merge -anchor nw\n \n \tcheckbutton $w.options.fetch \\\n-\t\t-text {Fetch Tracking Branch} \\\n+\t\t-text [mc \"Fetch Tracking Branch\"] \\\n \t\t-variable @opt_fetch\n \tpack $w.options.fetch -anchor nw\n \n \tcheckbutton $w.options.checkout \\\n-\t\t-text {Checkout After Creation} \\\n+\t\t-text [mc \"Checkout After Creation\"] \\\n \t\t-variable @opt_checkout\n \tpack $w.options.checkout -anchor nw\n \tpack $w.options -anchor nw -fill x -pady 5 -padx 5\n@@ -128,7 +128,7 @@ method _create {} {\n \t\t\t\t-type ok \\\n \t\t\t\t-title [wm title $w] \\\n \t\t\t\t-parent $w \\\n-\t\t\t\t-message \"Please select a tracking branch.\"\n+\t\t\t\t-message [mc \"Please select a tracking branch.\"]\n \t\t\treturn\n \t\t}\n \t\tif {![regsub ^refs/heads/ [lindex $spec 2] {} newbranch]} {\n@@ -137,7 +137,7 @@ method _create {} {\n \t\t\t\t-type ok \\\n \t\t\t\t-title [wm title $w] \\\n \t\t\t\t-parent $w \\\n-\t\t\t\t-message \"Tracking branch [$w get] is not a branch in the remote repository.\"\n+\t\t\t\t-message [mc \"Tracking branch %s is not a branch in the remote repository.\" [$w get]]\n \t\t\treturn\n \t\t}\n \t}\n@@ -150,7 +150,7 @@ method _create {} {\n \t\t\t-type ok \\\n \t\t\t-title [wm title $w] \\\n \t\t\t-parent $w \\\n-\t\t\t-message \"Please supply a branch name.\"\n+\t\t\t-message [mc \"Please supply a branch name.\"]\n \t\tfocus $w_name\n \t\treturn\n \t}\n@@ -161,7 +161,7 @@ method _create {} {\n \t\t\t-type ok \\\n \t\t\t-title [wm title $w] \\\n \t\t\t-parent $w \\\n-\t\t\t-message \"'$newbranch' is not an acceptable branch name.\"\n+\t\t\t-message [mc \"'%s' is not an acceptable branch name.\" $newbranch]\n \t\tfocus $w_name\n \t\treturn\n \t}\ndiff --git a/lib/branch_delete.tcl b/lib/branch_delete.tcl\nindex c7573c6..86c4f73 100644\n--- a/lib/branch_delete.tcl\n+++ b/lib/branch_delete.tcl\n@@ -12,29 +12,29 @@ constructor dialog {} {\n \tglobal current_branch\n \n \tmake_toplevel top w\n-\twm title $top \"[appname] ([reponame]): Delete Branch\"\n+\twm title $top [append \"[appname] ([reponame]): \" [mc \"Delete Branch\"]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t}\n \n-\tlabel $w.header -text {Delete Local Branch} -font font_uibold\n+\tlabel $w.header -text [mc \"Delete Local Branch\"] -font font_uibold\n \tpack $w.header -side top -fill x\n \n \tframe $w.buttons\n \tset w_delete $w.buttons.delete\n \tbutton $w_delete \\\n-\t\t-text Delete \\\n+\t\t-text [mc Delete] \\\n \t\t-default active \\\n \t\t-state disabled \\\n \t\t-command [cb _delete]\n \tpack $w_delete -side right\n \tbutton $w.buttons.cancel \\\n-\t\t-text {Cancel} \\\n+\t\t-text [mc Cancel] \\\n \t\t-command [list destroy $w]\n \tpack $w.buttons.cancel -side right -padx 5\n \tpack $w.buttons -side bottom -fill x -pady 10 -padx 10\n \n-\tlabelframe $w.list -text {Local Branches}\n+\tlabelframe $w.list -text [mc \"Local Branches\"]\n \tset w_heads $w.list.l\n \tlistbox $w_heads \\\n \t\t-height 10 \\\n@@ -49,9 +49,9 @@ constructor dialog {} {\n \n \tset w_check [choose_rev::new \\\n \t\t$w.check \\\n-\t\t{Delete Only If Merged Into} \\\n+\t\t[mc \"Delete Only If Merged Into\"] \\\n \t\t]\n-\t$w_check none {Always (Do not perform merge test.)}\n+\t$w_check none [mc \"Always (Do not perform merge test.)\"]\n \tpack $w.check -anchor nw -fill x -pady 5 -padx 5\n \n \tforeach h [load_all_heads] {\n@@ -100,7 +100,7 @@ method _delete {} {\n \t\tlappend to_delete [list $b $o]\n \t}\n \tif {$not_merged ne {}} {\n-\t\tset msg \"The following branches are not completely merged into [$w_check get]:\n+\t\tset msg \"[mc \"The following branches are not completely merged into %s:\" [$w_check get]]\n \n  - [join $not_merged \"\\n - \"]\"\n \t\ttk_messageBox \\\n@@ -112,9 +112,7 @@ method _delete {} {\n \t}\n \tif {$to_delete eq {}} return\n \tif {$check_cmt eq {}} {\n-\t\tset msg {Recovering deleted branches is difficult.\n-\n-Delete the selected branches?}\n+\t\tset msg [mc \"Recovering deleted branches is difficult. \\n\\n Delete the selected branches?\"]\n \t\tif {[tk_messageBox \\\n \t\t\t-icon warning \\\n \t\t\t-type yesno \\\n@@ -140,7 +138,7 @@ Delete the selected branches?}\n \t\t\t-type ok \\\n \t\t\t-title [wm title $w] \\\n \t\t\t-parent $w \\\n-\t\t\t-message \"Failed to delete branches:\\n$failed\"\n+\t\t\t-message [mc \"Failed to delete branches:\\n%s\" $failed]\n \t}\n \n \tdestroy $w\ndiff --git a/lib/branch_rename.tcl b/lib/branch_rename.tcl\nindex 1cadc31..d6f040e 100644\n--- a/lib/branch_rename.tcl\n+++ b/lib/branch_rename.tcl\n@@ -11,7 +11,7 @@ constructor dialog {} {\n \tglobal current_branch\n \n \tmake_toplevel top w\n-\twm title $top \"[appname] ([reponame]): Rename Branch\"\n+\twm title $top [append \"[appname] ([reponame]): \" [mc \"Rename Branch\"]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t}\n@@ -19,24 +19,24 @@ constructor dialog {} {\n \tset oldname $current_branch\n \tset newname [get_config gui.newbranchtemplate]\n \n-\tlabel $w.header -text {Rename Branch} -font font_uibold\n+\tlabel $w.header -text [mc \"Rename Branch\"] -font font_uibold\n \tpack $w.header -side top -fill x\n \n \tframe $w.buttons\n-\tbutton $w.buttons.rename -text Rename \\\n+\tbutton $w.buttons.rename -text [mc Rename] \\\n \t\t-default active \\\n \t\t-command [cb _rename]\n \tpack $w.buttons.rename -side right\n-\tbutton $w.buttons.cancel -text {Cancel} \\\n+\tbutton $w.buttons.cancel -text [mc Cancel] \\\n \t\t-command [list destroy $w]\n \tpack $w.buttons.cancel -side right -padx 5\n \tpack $w.buttons -side bottom -fill x -pady 10 -padx 10\n \n \tframe $w.rename\n-\tlabel $w.rename.oldname_l -text {Branch:}\n+\tlabel $w.rename.oldname_l -text [mc \"Branch:\"]\n \teval tk_optionMenu $w.rename.oldname_m @oldname [load_all_heads]\n \n-\tlabel $w.rename.newname_l -text {New Name:}\n+\tlabel $w.rename.newname_l -text [mc \"New Name:\"]\n \tentry $w.rename.newname_t \\\n \t\t-borderwidth 1 \\\n \t\t-relief sunken \\\n@@ -72,7 +72,7 @@ method _rename {} {\n \t\t\t-type ok \\\n \t\t\t-title [wm title $w] \\\n \t\t\t-parent $w \\\n-\t\t\t-message \"Please select a branch to rename.\"\n+\t\t\t-message [mc \"Please select a branch to rename.\"]\n \t\tfocus $w.rename.oldname_m\n \t\treturn\n \t}\n@@ -83,7 +83,7 @@ method _rename {} {\n \t\t\t-type ok \\\n \t\t\t-title [wm title $w] \\\n \t\t\t-parent $w \\\n-\t\t\t-message \"Please supply a branch name.\"\n+\t\t\t-message [mc \"Please supply a branch name.\"]\n \t\tfocus $w.rename.newname_t\n \t\treturn\n \t}\n@@ -93,7 +93,7 @@ method _rename {} {\n \t\t\t-type ok \\\n \t\t\t-title [wm title $w] \\\n \t\t\t-parent $w \\\n-\t\t\t-message \"Branch '$newname' already exists.\"\n+\t\t\t-message [mc \"Branch '%s' already exists.\" $newname]\n \t\tfocus $w.rename.newname_t\n \t\treturn\n \t}\n@@ -103,7 +103,7 @@ method _rename {} {\n \t\t\t-type ok \\\n \t\t\t-title [wm title $w] \\\n \t\t\t-parent $w \\\n-\t\t\t-message \"We do not like '$newname' as a branch name.\"\n+\t\t\t-message [mc \"'%s' is not an acceptable branch name.\" $newname]\n \t\tfocus $w.rename.newname_t\n \t\treturn\n \t}\n@@ -114,7 +114,7 @@ method _rename {} {\n \t\t\t-type ok \\\n \t\t\t-title [wm title $w] \\\n \t\t\t-parent $w \\\n-\t\t\t-message \"Failed to rename '$oldname'.\\n\\n$err\"\n+\t\t\t-message [append [mc \"Failed to rename '%s'.\" $oldname] \"\\n\\n$err\"]\n \t\treturn\n \t}\n \ndiff --git a/lib/browser.tcl b/lib/browser.tcl\nindex 888db3c..9876229 100644\n--- a/lib/browser.tcl\n+++ b/lib/browser.tcl\n@@ -14,7 +14,7 @@ field w\n field browser_commit\n field browser_path\n field browser_files  {}\n-field browser_status {Starting...}\n+field browser_status [mc \"Starting...\"]\n field browser_stack  {}\n field browser_busy   1\n \n@@ -23,7 +23,7 @@ field ls_buf     {}; # Buffered record output from ls-tree\n constructor new {commit {path {}}} {\n \tglobal cursor_ptr M1B\n \tmake_toplevel top w\n-\twm title $top \"[appname] ([reponame]): File Browser\"\n+\twm title $top [append \"[appname] ([reponame]): \" [mc \"File Browser\"]]\n \n \tset browser_commit $commit\n \tset browser_path $browser_commit:$path\n@@ -124,7 +124,7 @@ method _parent {} {\n \t\t} else {\n \t\t\tregsub {/[^/]+$} $browser_path {} browser_path\n \t\t}\n-\t\tset browser_status \"Loading $browser_path...\"\n+\t\tset browser_status [mc \"Loading %s...\" $browser_path]\n \t\t_ls $this [lindex $parent 0] [lindex $parent 1]\n \t}\n }\n@@ -141,7 +141,7 @@ method _enter {} {\n \t\ttree {\n \t\t\tset name [lindex $info 2]\n \t\t\tset escn [escape_path $name]\n-\t\t\tset browser_status \"Loading $escn...\"\n+\t\t\tset browser_status [mc \"Loading %s...\" $escn]\n \t\t\tappend browser_path $escn\n \t\t\t_ls $this [lindex $info 1] $name\n \t\t}\n@@ -185,7 +185,7 @@ method _ls {tree_id {name {}}} {\n \t\t\t-align center -padx 5 -pady 1 \\\n \t\t\t-name icon0 \\\n \t\t\t-image ::browser::img_parent\n-\t\t$w insert end {[Up To Parent]}\n+\t\t$w insert end [mc \"\\[Up To Parent\\]\"]\n \t\tlappend browser_files parent\n \t}\n \tlappend browser_stack [list $tree_id $name]\n@@ -244,7 +244,7 @@ method _read {fd} {\n \n \tif {[eof $fd]} {\n \t\tclose $fd\n-\t\tset browser_status Ready.\n+\t\tset browser_status [mc \"Ready.\"]\n \t\tset browser_busy 0\n \t\tset ls_buf {}\n \t\tif {$n > 0} {\n@@ -265,27 +265,27 @@ field w_rev          ; # mega-widget to pick the initial revision\n \n constructor dialog {} {\n \tmake_toplevel top w\n-\twm title $top \"[appname] ([reponame]): Browse Branch Files\"\n+\twm title $top [append \"[appname] ([reponame]): \" [mc \"Browse Branch Files\"]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t}\n \n \tlabel $w.header \\\n-\t\t-text {Browse Branch Files} \\\n+\t\t-text [mc \"Browse Branch Files\"] \\\n \t\t-font font_uibold\n \tpack $w.header -side top -fill x\n \n \tframe $w.buttons\n-\tbutton $w.buttons.browse -text Browse \\\n+\tbutton $w.buttons.browse -text [mc Browse] \\\n \t\t-default active \\\n \t\t-command [cb _open]\n \tpack $w.buttons.browse -side right\n-\tbutton $w.buttons.cancel -text {Cancel} \\\n+\tbutton $w.buttons.cancel -text [mc Cancel] \\\n \t\t-command [list destroy $w]\n \tpack $w.buttons.cancel -side right -padx 5\n \tpack $w.buttons -side bottom -fill x -pady 10 -padx 10\n \n-\tset w_rev [::choose_rev::new $w.rev {Revision}]\n+\tset w_rev [::choose_rev::new $w.rev [mc Revision]]\n \t$w_rev bind_listbox <Double-Button-1> [cb _open]\n \tpack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5\n \ndiff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl\nindex 170f737..b98c9cb 100644\n--- a/lib/checkout_op.tcl\n+++ b/lib/checkout_op.tcl\n@@ -76,7 +76,7 @@ method run {} {\n \t\t_toplevel $this {Refreshing Tracking Branch}\n \t\tset w_cons [::console::embed \\\n \t\t\t$w.console \\\n-\t\t\t\"Fetching $r_name from $remote\"]\n+\t\t\t[mc \"Fetching %s from %s\" $r_name $remote]]\n \t\tpack $w.console -fill both -expand 1\n \t\t$w_cons exec $cmd [cb _finish_fetch]\n \n@@ -137,7 +137,7 @@ method _finish_fetch {ok} {\n \t\tdestroy $w\n \t\tset w {}\n \t} else {\n-\t\tbutton $w.close -text Close -command [list destroy $w]\n+\t\tbutton $w.close -text [mc Close] -command [list destroy $w]\n \t\tpack $w.close -side bottom -anchor e -padx 10 -pady 10\n \t}\n \n@@ -166,7 +166,7 @@ method _update_ref {} {\n \t\t# Assume it does not exist, and that is what the error was.\n \t\t#\n \t\tif {!$create} {\n-\t\t\t_error $this \"Branch '$newbranch' does not exist.\"\n+\t\t\t_error $this [mc \"Branch '%s' does not exist.\" $newbranch]\n \t\t\treturn 0\n \t\t}\n \n@@ -176,7 +176,7 @@ method _update_ref {} {\n \t\t# We were told to create it, but not do a merge.\n \t\t# Bad.  Name shouldn't have existed.\n \t\t#\n-\t\t_error $this \"Branch '$newbranch' already exists.\"\n+\t\t_error $this [mc \"Branch '%s' already exists.\" $newbranch]\n \t\treturn 0\n \t} elseif {!$create && $merge_type eq {none}} {\n \t\t# We aren't creating, it exists and we don't merge.\n@@ -203,7 +203,7 @@ method _update_ref {} {\n \t\t\t\t\tset new $cur\n \t\t\t\t\tset new_hash $cur\n \t\t\t\t} else {\n-\t\t\t\t\t_error $this \"Branch '$newbranch' already exists.\\n\\nIt cannot fast-forward to $new_expr.\\nA merge is required.\"\n+\t\t\t\t\t_error $this [mc \"Branch '%s' already exists.\\n\\nIt cannot fast-forward to %s.\\nA merge is required.\" $newbranch $new_expr]\n \t\t\t\t\treturn 0\n \t\t\t\t}\n \t\t\t}\n@@ -217,7 +217,7 @@ method _update_ref {} {\n \t\t\t\t}\n \t\t\t}\n \t\t\tdefault {\n-\t\t\t\t_error $this \"Merge strategy '$merge_type' not supported.\"\n+\t\t\t\t_error $this [mc \"Merge strategy '%s' not supported.\" $merge_type]\n \t\t\t\treturn 0\n \t\t\t}\n \t\t\t}\n@@ -236,7 +236,7 @@ method _update_ref {} {\n \t\tif {[catch {\n \t\t\t\tgit update-ref -m $reflog_msg $ref $new $cur\n \t\t\t} err]} {\n-\t\t\t_error $this \"Failed to update '$newbranch'.\\n\\n$err\"\n+\t\t\t_error $this [append [mc \"Failed to update '%s'.\" $newbranch] \"\\n\\n$err\"]\n \t\t\treturn 0\n \t\t}\n \t}\n@@ -248,7 +248,7 @@ method _checkout {} {\n \tif {[lock_index checkout_op]} {\n \t\tafter idle [cb _start_checkout]\n \t} else {\n-\t\t_error $this \"Staging area (index) is already locked.\"\n+\t\t_error $this [mc \"Staging area (index) is already locked.\"]\n \t\tdelete_this\n \t}\n }\n@@ -263,12 +263,12 @@ method _start_checkout {} {\n \t\t&& $curType eq {normal}\n \t\t&& $curHEAD eq $HEAD} {\n \t} elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {\n-\t\tinfo_popup {Last scanned state does not match repository state.\n+\t\tinfo_popup [mc \"Last scanned state does not match repository state.\n \n Another Git program has modified this repository since the last scan.  A rescan must be performed before the current branch can be changed.\n \n The rescan will be automatically started now.\n-}\n+\"]\n \t\tunlock_index\n \t\trescan ui_ready\n \t\tdelete_this\n@@ -350,12 +350,12 @@ method _readtree_wait {fd} {\n \tif {[catch {close $fd}]} {\n \t\tset err $readtree_d\n \t\tregsub {^fatal: } $err {} err\n-\t\t$::main_status stop \"Aborted checkout of '[_name $this]' (file level merging is required).\"\n-\t\twarn_popup \"File level merge required.\n+\t\t$::main_status stop [mc \"Aborted checkout of '%s' (file level merging is required).\" [_name $this]]\n+\t\twarn_popup [append [mc \"File level merge required.\"] \"\n \n $err\n \n-Staying on branch '$current_branch'.\"\n+\" [mc \"Staying on branch '%s'.\" $current_branch]]\n \t\tunlock_index\n \t\tdelete_this\n \t\treturn\n@@ -426,9 +426,9 @@ method _after_readtree {} {\n \t}\n \n \tif {$is_detached} {\n-\t\tinfo_popup \"You are no longer on a local branch.\n+\t\tinfo_popup [mc \"You are no longer on a local branch.\n \n-If you wanted to be on a branch, create one now starting from 'This Detached Checkout'.\"\n+If you wanted to be on a branch, create one now starting from 'This Detached Checkout'.\"]\n \t}\n \n \t# -- Update our repository state.  If we were previously in\n@@ -475,7 +475,7 @@ method _confirm_reset {cur} {\n \tpack [label $w.msg1 \\\n \t\t-anchor w \\\n \t\t-justify left \\\n-\t\t-text \"Resetting '$name' to $new_expr will lose the following commits:\" \\\n+\t\t-text [mc \"Resetting '%s' to '%s' will lose the following commits:\" $name $new_expr]\\\n \t\t] -anchor w\n \n \tset list $w.list.l\n@@ -497,21 +497,21 @@ method _confirm_reset {cur} {\n \tpack [label $w.msg2 \\\n \t\t-anchor w \\\n \t\t-justify left \\\n-\t\t-text {Recovering lost commits may not be easy.} \\\n+\t\t-text [mc \"Recovering lost commits may not be easy.\"] \\\n \t\t]\n \tpack [label $w.msg3 \\\n \t\t-anchor w \\\n \t\t-justify left \\\n-\t\t-text \"Reset '$name'?\" \\\n+\t\t-text [mc \"Reset '%s'?\" $name] \\\n \t\t]\n \n \tframe $w.buttons\n \tbutton $w.buttons.visualize \\\n-\t\t-text Visualize \\\n+\t\t-text [mc Visualize] \\\n \t\t-command $gitk\n \tpack $w.buttons.visualize -side left\n \tbutton $w.buttons.reset \\\n-\t\t-text Reset \\\n+\t\t-text [mc Reset] \\\n \t\t-command \"\n \t\t\tset @reset_ok 1\n \t\t\tdestroy $w\n@@ -519,7 +519,7 @@ method _confirm_reset {cur} {\n \tpack $w.buttons.reset -side right\n \tbutton $w.buttons.cancel \\\n \t\t-default active \\\n-\t\t-text Cancel \\\n+\t\t-text [mc Cancel] \\\n \t\t-command [list destroy $w]\n \tpack $w.buttons.cancel -side right -padx 5\n \tpack $w.buttons -side bottom -fill x -pady 10 -padx 10\n@@ -575,13 +575,13 @@ method _toplevel {title} {\n }\n \n method _fatal {err} {\n-\terror_popup \"Failed to set current branch.\n+\terror_popup [append [mc \"Failed to set current branch.\n \n This working directory is only partially switched.  We successfully updated your files, but failed to update an internal Git file.\n \n-This should not have occurred.  [appname] will now close and give up.\n+This should not have occurred.  %s will now close and give up.\" [appname]] \"\n \n-$err\"\n+$err\"]\n \texit 1\n }\n \ndiff --git a/lib/choose_rev.tcl b/lib/choose_rev.tcl\nindex ec064b3..a58b752 100644\n--- a/lib/choose_rev.tcl\n+++ b/lib/choose_rev.tcl\n@@ -50,14 +50,14 @@ constructor _new {path unmerged_only title} {\n \tif {$is_detached} {\n \t\tradiobutton $w.detachedhead_r \\\n \t\t\t-anchor w \\\n-\t\t\t-text {This Detached Checkout} \\\n+\t\t\t-text [mc \"This Detached Checkout\"] \\\n \t\t\t-value HEAD \\\n \t\t\t-variable @revtype\n \t\tgrid $w.detachedhead_r -sticky we -padx {0 5} -columnspan 2\n \t}\n \n \tradiobutton $w.expr_r \\\n-\t\t-text {Revision Expression:} \\\n+\t\t-text [mc \"Revision Expression:\"] \\\n \t\t-value expr \\\n \t\t-variable @revtype\n \tentry $w.expr_t \\\n@@ -71,17 +71,17 @@ constructor _new {path unmerged_only title} {\n \n \tframe $w.types\n \tradiobutton $w.types.head_r \\\n-\t\t-text {Local Branch} \\\n+\t\t-text [mc \"Local Branch\"] \\\n \t\t-value head \\\n \t\t-variable @revtype\n \tpack $w.types.head_r -side left\n \tradiobutton $w.types.trck_r \\\n-\t\t-text {Tracking Branch} \\\n+\t\t-text [mc \"Tracking Branch\"] \\\n \t\t-value trck \\\n \t\t-variable @revtype\n \tpack $w.types.trck_r -side left\n \tradiobutton $w.types.tag_r \\\n-\t\t-text {Tag} \\\n+\t\t-text [mc \"Tag\"] \\\n \t\t-value tag \\\n \t\t-variable @revtype\n \tpack $w.types.tag_r -side left\n@@ -314,7 +314,7 @@ method commit_or_die {} {\n \t\t}\n \n \t\tset top [winfo toplevel $w]\n-\t\tset msg \"Invalid revision: [get $this]\\n\\n$err\"\n+\t\tset msg [append [mc \"Invalid revision: %s\" [get $this]] \"\\n\\n$err\"]\n \t\ttk_messageBox \\\n \t\t\t-icon error \\\n \t\t\t-type ok \\\n@@ -335,7 +335,7 @@ method _expr {} {\n \t\tif {$i ne {}} {\n \t\t\treturn [lindex $cur_specs $i 1]\n \t\t} else {\n-\t\t\terror \"No revision selected.\"\n+\t\t\terror [mc \"No revision selected.\"]\n \t\t}\n \t}\n \n@@ -343,7 +343,7 @@ method _expr {} {\n \t\tif {$c_expr ne {}} {\n \t\t\treturn $c_expr\n \t\t} else {\n-\t\t\terror \"Revision expression is empty.\"\n+\t\t\terror [mc \"Revision expression is empty.\"]\n \t\t}\n \t}\n \tHEAD { return HEAD                     }\ndiff --git a/lib/commit.tcl b/lib/commit.tcl\nindex f857a2f..15489c6 100644\n--- a/lib/commit.tcl\n+++ b/lib/commit.tcl\n@@ -6,19 +6,19 @@ proc load_last_commit {} {\n \tglobal repo_config\n \n \tif {[llength $PARENT] == 0} {\n-\t\terror_popup {There is nothing to amend.\n+\t\terror_popup [mc \"There is nothing to amend.\n \n You are about to create the initial commit.  There is no commit before this to amend.\n-}\n+\"]\n \t\treturn\n \t}\n \n \trepository_state curType curHEAD curMERGE_HEAD\n \tif {$curType eq {merge}} {\n-\t\terror_popup {Cannot amend while merging.\n+\t\terror_popup [mc \"Cannot amend while merging.\n \n You are currently in the middle of a merge that has not been fully completed.  You cannot amend the prior commit unless you first abort the current merge activity.\n-}\n+\"]\n \t\treturn\n \t}\n \n@@ -46,7 +46,7 @@ You are currently in the middle of a merge that has not been fully completed.  Y\n \t\t\t}\n \t\t\tset msg [string trim $msg]\n \t\t} err]} {\n-\t\terror_popup \"Error loading commit data for amend:\\n\\n$err\"\n+ \t    error_popup [append [mc \"Error loading commit data for amend:\"] \"\\n\\n$err\"]\n \t\treturn\n \t}\n \n@@ -73,12 +73,12 @@ proc committer_ident {} {\n \n \tif {$GIT_COMMITTER_IDENT eq {}} {\n \t\tif {[catch {set me [git var GIT_COMMITTER_IDENT]} err]} {\n-\t\t\terror_popup \"Unable to obtain your identity:\\n\\n$err\"\n+\t\t\terror_popup [append [mc \"Unable to obtain your identity:\"] \"\\n\\n$err\"]\n \t\t\treturn {}\n \t\t}\n \t\tif {![regexp {^(.*) [0-9]+ [-+0-9]+$} \\\n \t\t\t$me me GIT_COMMITTER_IDENT]} {\n-\t\t\terror_popup \"Invalid GIT_COMMITTER_IDENT:\\n\\n$me\"\n+\t\t\terror_popup [append [mc \"Invalid GIT_COMMITTER_IDENT:\"] \"\\n\\n$me\"]\n \t\t\treturn {}\n \t\t}\n \t}\n@@ -130,12 +130,12 @@ proc commit_tree {} {\n \t\t&& $curType eq {normal}\n \t\t&& $curHEAD eq $HEAD} {\n \t} elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {\n-\t\tinfo_popup {Last scanned state does not match repository state.\n+\t\tinfo_popup [mc \"Last scanned state does not match repository state.\n \n Another Git program has modified this repository since the last scan.  A rescan must be performed before another commit can be created.\n \n The rescan will be automatically started now.\n-}\n+\"]\n \t\tunlock_index\n \t\trescan ui_ready\n \t\treturn\n@@ -151,26 +151,26 @@ The rescan will be automatically started now.\n \t\tD? -\n \t\tM? {set files_ready 1}\n \t\tU? {\n-\t\t\terror_popup \"Unmerged files cannot be committed.\n+\t\t\terror_popup [mc \"Unmerged files cannot be committed.\n \n-File [short_path $path] has merge conflicts.  You must resolve them and stage the file before committing.\n-\"\n+File %s has merge conflicts.  You must resolve them and stage the file before committing.\n+\" [short_path $path]]\n \t\t\tunlock_index\n \t\t\treturn\n \t\t}\n \t\tdefault {\n-\t\t\terror_popup \"Unknown file state [lindex $s 0] detected.\n+\t\t\terror_popup [mc \"Unknown file state %s detected.\n \n-File [short_path $path] cannot be committed by this program.\n-\"\n+File %s cannot be committed by this program.\n+\" [lindex $s 0] [short_path $path]]\n \t\t}\n \t\t}\n \t}\n \tif {!$files_ready && ![string match *merge $curType]} {\n-\t\tinfo_popup {No changes to commit.\n+\t\tinfo_popup [mc \"No changes to commit.\n \n You must stage at least 1 file before you can commit.\n-}\n+\"]\n \t\tunlock_index\n \t\treturn\n \t}\n@@ -180,14 +180,14 @@ You must stage at least 1 file before you can commit.\n \tset msg [string trim [$ui_comm get 1.0 end]]\n \tregsub -all -line {[ \\t\\r]+$} $msg {} msg\n \tif {$msg eq {}} {\n-\t\terror_popup {Please supply a commit message.\n+\t\terror_popup [mc \"Please supply a commit message.\n \n A good commit message has the following format:\n \n - First line: Describe in one sentance what you did.\n - Second line: Blank\n - Remaining lines: Describe why this change is good.\n-}\n+\"]\n \t\tunlock_index\n \t\treturn\n \t}\n@@ -254,7 +254,7 @@ proc commit_committree {fd_wt curHEAD msg} {\n \n \tgets $fd_wt tree_id\n \tif {$tree_id eq {} || [catch {close $fd_wt} err]} {\n-\t\terror_popup \"write-tree failed:\\n\\n$err\"\n+\t\terror_popup [append [mc \"write-tree failed:\"] \"\\n\\n$err\"]\n \t\tui_status {Commit failed.}\n \t\tunlock_index\n \t\treturn\n@@ -276,14 +276,14 @@ proc commit_committree {fd_wt curHEAD msg} {\n \t\t}\n \n \t\tif {$tree_id eq $old_tree} {\n-\t\t\tinfo_popup {No changes to commit.\n+\t\t\tinfo_popup [mc \"No changes to commit.\n \n No files were modified by this commit and it was not a merge commit.\n \n A rescan will be automatically started now.\n-}\n+\"]\n \t\t\tunlock_index\n-\t\t\trescan {ui_status {No changes to commit.}}\n+\t\t\trescan {ui_status [mc \"No changes to commit.\"]}\n \t\t\treturn\n \t\t}\n \t}\n@@ -314,7 +314,7 @@ A rescan will be automatically started now.\n \t}\n \tlappend cmd <$msg_p\n \tif {[catch {set cmt_id [eval git $cmd]} err]} {\n-\t\terror_popup \"commit-tree failed:\\n\\n$err\"\n+\t\terror_popup [append [mc \"commit-tree failed:\"] \"\\n\\n$err\"]\n \t\tui_status {Commit failed.}\n \t\tunlock_index\n \t\treturn\n@@ -336,7 +336,7 @@ A rescan will be automatically started now.\n \tif {[catch {\n \t\t\tgit update-ref -m $reflogm HEAD $cmt_id $curHEAD\n \t\t} err]} {\n-\t\terror_popup \"update-ref failed:\\n\\n$err\"\n+\t\terror_popup [append [mc \"update-ref failed:\"] \"\\n\\n$err\"]\n \t\tui_status {Commit failed.}\n \t\tunlock_index\n \t\treturn\n@@ -427,5 +427,5 @@ A rescan will be automatically started now.\n \tdisplay_all_files\n \tunlock_index\n \treshow_diff\n-\tui_status \"Created commit [string range $cmt_id 0 7]: $subject\"\n+\tui_status [mc \"Created commit %s: %s\" [string range $cmt_id 0 7] $subject]\n }\ndiff --git a/lib/console.tcl b/lib/console.tcl\nindex 6f718fb..e5f9ba4 100644\n--- a/lib/console.tcl\n+++ b/lib/console.tcl\n@@ -52,7 +52,7 @@ method _init {} {\n \t\t-state disabled \\\n \t\t-xscrollcommand [list $w.m.sbx set] \\\n \t\t-yscrollcommand [list $w.m.sby set]\n-\tlabel $w.m.s -text {Working... please wait...} \\\n+\tlabel $w.m.s -text [mc \"Working... please wait...\"] \\\n \t\t-anchor w \\\n \t\t-justify left \\\n \t\t-font font_uibold\n@@ -66,11 +66,11 @@ method _init {} {\n \tpack $w.m -side top -fill both -expand 1 -padx 5 -pady 10\n \n \tmenu $w.ctxm -tearoff 0\n-\t$w.ctxm add command -label \"Copy\" \\\n+\t$w.ctxm add command -label [mc \"Copy\"] \\\n \t\t-command \"tk_textCopy $w.m.t\"\n-\t$w.ctxm add command -label \"Select All\" \\\n+\t$w.ctxm add command -label [mc \"Select All\"] \\\n \t\t-command \"focus $w.m.t;$w.m.t tag add sel 0.0 end\"\n-\t$w.ctxm add command -label \"Copy All\" \\\n+\t$w.ctxm add command -label [mc \"Copy All\"] \\\n \t\t-command \"\n \t\t\t$w.m.t tag add sel 0.0 end\n \t\t\ttk_textCopy $w.m.t\n@@ -78,7 +78,7 @@ method _init {} {\n \t\t\"\n \n \tif {$is_toplevel} {\n-\t\tbutton $w.ok -text {Close} \\\n+\t\tbutton $w.ok -text [mc \"Close\"] \\\n \t\t\t-state disabled \\\n \t\t\t-command [list destroy $w]\n \t\tpack $w.ok -side bottom -anchor e -pady 10 -padx 10\n@@ -181,7 +181,7 @@ method insert {txt} {\n method done {ok} {\n \tif {$ok} {\n \t\tif {[winfo exists $w.m.s]} {\n-\t\t\t$w.m.s conf -background green -text {Success}\n+\t\t\t$w.m.s conf -background green -text [mc \"Success\"]\n \t\t\tif {$is_toplevel} {\n \t\t\t\t$w.ok conf -state normal\n \t\t\t\tfocus $w.ok\n@@ -191,7 +191,7 @@ method done {ok} {\n \t\tif {![winfo exists $w.m.s]} {\n \t\t\t_init $this\n \t\t}\n-\t\t$w.m.s conf -background red -text {Error: Command Failed}\n+\t\t$w.m.s conf -background red -text [mc \"Error: Command Failed\"]\n \t\tif {$is_toplevel} {\n \t\t\t$w.ok conf -state normal\n \t\t\tfocus $w.ok\ndiff --git a/lib/database.tcl b/lib/database.tcl\nindex 0657cc2..118b1b2 100644\n--- a/lib/database.tcl\n+++ b/lib/database.tcl\n@@ -24,14 +24,14 @@ proc do_stats {} {\n \ttoplevel $w\n \twm geometry $w \"+[winfo rootx .]+[winfo rooty .]\"\n \n-\tlabel $w.header -text {Database Statistics}\n+\tlabel $w.header -text [mc \"Database Statistics\"]\n \tpack $w.header -side top -fill x\n \n \tframe $w.buttons -border 1\n-\tbutton $w.buttons.close -text Close \\\n+\tbutton $w.buttons.close -text [mc Close] \\\n \t\t-default active \\\n \t\t-command [list destroy $w]\n-\tbutton $w.buttons.gc -text {Compress Database} \\\n+\tbutton $w.buttons.gc -text [mc \"Compress Database\"] \\\n \t\t-default normal \\\n \t\t-command \"destroy $w;do_gc\"\n \tpack $w.buttons.close -side right\n@@ -40,16 +40,16 @@ proc do_stats {} {\n \n \tframe $w.stat -borderwidth 1 -relief solid\n \tforeach s {\n-\t\t{count           {Number of loose objects}}\n-\t\t{size            {Disk space used by loose objects} { KiB}}\n-\t\t{in-pack         {Number of packed objects}}\n-\t\t{packs           {Number of packs}}\n-\t\t{size-pack       {Disk space used by packed objects} { KiB}}\n-\t\t{prune-packable  {Packed objects waiting for pruning}}\n-\t\t{garbage         {Garbage files}}\n+\t\t{count           {mc \"Number of loose objects\"}}\n+\t\t{size            {mc \"Disk space used by loose objects\"} { KiB}}\n+\t\t{in-pack         {mc \"Number of packed objects\"}}\n+\t\t{packs           {mc \"Number of packs\"}}\n+\t\t{size-pack       {mc \"Disk space used by packed objects\"} { KiB}}\n+\t\t{prune-packable  {mc \"Packed objects waiting for pruning\"}}\n+\t\t{garbage         {mc \"Garbage files\"}}\n \t\t} {\n \t\tset name [lindex $s 0]\n-\t\tset label [lindex $s 1]\n+\t\tset label [eval [lindex $s 1]]\n \t\tif {[catch {set value $stats($name)}]} continue\n \t\tif {[llength $s] > 2} {\n \t\t\tset value \"$value[lindex $s 2]\"\n@@ -64,12 +64,12 @@ proc do_stats {} {\n \tbind $w <Visibility> \"grab $w; focus $w.buttons.close\"\n \tbind $w <Key-Escape> [list destroy $w]\n \tbind $w <Key-Return> [list destroy $w]\n-\twm title $w \"[appname] ([reponame]): Database Statistics\"\n+\twm title $w [append \"[appname] ([reponame]): \" [mc \"Database Statistics\"]]\n \ttkwait window $w\n }\n \n proc do_gc {} {\n-\tset w [console::new {gc} {Compressing the object database}]\n+\tset w [console::new {gc} [mc \"Compressing the object database\"]]\n \tconsole::chain $w {\n \t\t{exec git pack-refs --prune}\n \t\t{exec git reflog expire --all}\n@@ -80,7 +80,7 @@ proc do_gc {} {\n \n proc do_fsck_objects {} {\n \tset w [console::new {fsck-objects} \\\n-\t\t{Verifying the object database with fsck-objects}]\n+\t\t[mc \"Verifying the object database with fsck-objects\"]]\n \tset cmd [list git fsck-objects]\n \tlappend cmd --full\n \tlappend cmd --cache\ndiff --git a/lib/diff.tcl b/lib/diff.tcl\nindex e09e125..b1129d5 100644\n--- a/lib/diff.tcl\n+++ b/lib/diff.tcl\n@@ -39,13 +39,13 @@ proc handle_empty_diff {} {\n \tset s $file_states($path)\n \tif {[lindex $s 0] ne {_M}} return\n \n-\tinfo_popup \"No differences detected.\n+\tinfo_popup [mc \"No differences detected.\n \n-[short_path $path] has no changes.\n+%s has no changes.\n \n The modification date of this file was updated by another application, but the content within the file was not changed.\n \n-A rescan will be automatically started to find other files which may have the same state.\"\n+A rescan will be automatically started to find other files which may have the same state.\" [short_path $path]]\n \n \tclear_diff\n \tdisplay_file $path __\n@@ -94,7 +94,7 @@ proc show_diff {path w {lno {}}} {\n \t\t\tset diff_active 0\n \t\t\tunlock_index\n \t\t\tui_status \"Unable to display [escape_path $path]\"\n-\t\t\terror_popup \"Error loading file:\\n\\n$err\"\n+ \t\t    error_popup [append [mc \"Error loading file:\"] \"\\n\\n$err\"]\n \t\t\treturn\n \t\t}\n \t\t$ui_diff conf -state normal\n@@ -159,7 +159,7 @@ proc show_diff {path w {lno {}}} {\n \t\tset diff_active 0\n \t\tunlock_index\n \t\tui_status \"Unable to display [escape_path $path]\"\n-\t\terror_popup \"Error loading diff:\\n\\n$err\"\n+\t\terror_popup [append [mc \"Error loading diff:\"] \"\\n\\n$err\"]\n \t\treturn\n \t}\n \n@@ -275,14 +275,14 @@ proc apply_hunk {x y} {\n \tset apply_cmd {apply --cached --whitespace=nowarn}\n \tset mi [lindex $file_states($current_diff_path) 0]\n \tif {$current_diff_side eq $ui_index} {\n-\t\tset mode unstage\n+\t\tset failed_msg [mc \"Failed to unstage selected hunk.\"]\n \t\tlappend apply_cmd --reverse\n \t\tif {[string index $mi 0] ne {M}} {\n \t\t\tunlock_index\n \t\t\treturn\n \t\t}\n \t} else {\n-\t\tset mode stage\n+\t\tset failed_msg [mc \"Failed to stage selected hunk.\"]\n \t\tif {[string index $mi 1] ne {M}} {\n \t\t\tunlock_index\n \t\t\treturn\n@@ -307,7 +307,7 @@ proc apply_hunk {x y} {\n \t\tputs -nonewline $p $current_diff_header\n \t\tputs -nonewline $p [$ui_diff get $s_lno $e_lno]\n \t\tclose $p} err]} {\n-\t\terror_popup \"Failed to $mode selected hunk.\\n\\n$err\"\n+\t\terror_popup [append $failed_msg \"\\n\\n$err\"]\n \t\tunlock_index\n \t\treturn\n \t}\ndiff --git a/lib/error.tcl b/lib/error.tcl\nindex 16a2218..13565b7 100644\n--- a/lib/error.tcl\n+++ b/lib/error.tcl\n@@ -9,7 +9,7 @@ proc error_popup {msg} {\n \tset cmd [list tk_messageBox \\\n \t\t-icon error \\\n \t\t-type ok \\\n-\t\t-title \"$title: error\" \\\n+\t\t-title [append \"$title: \" [mc \"error\"]] \\\n \t\t-message $msg]\n \tif {[winfo ismapped .]} {\n \t\tlappend cmd -parent .\n@@ -25,7 +25,7 @@ proc warn_popup {msg} {\n \tset cmd [list tk_messageBox \\\n \t\t-icon warning \\\n \t\t-type ok \\\n-\t\t-title \"$title: warning\" \\\n+\t\t-title [append \"$title: \" [mc \"warning\"]] \\\n \t\t-message $msg]\n \tif {[winfo ismapped .]} {\n \t\tlappend cmd -parent .\n@@ -78,7 +78,7 @@ proc hook_failed_popup {hook msg} {\n \t\t-font font_diff \\\n \t\t-yscrollcommand [list $w.m.sby set]\n \tlabel $w.m.l2 \\\n-\t\t-text {You must correct the above errors before committing.} \\\n+\t\t-text [mc \"You must correct the above errors before committing.\"] \\\n \t\t-anchor w \\\n \t\t-justify left \\\n \t\t-font font_uibold\n@@ -99,6 +99,6 @@ proc hook_failed_popup {hook msg} {\n \n \tbind $w <Visibility> \"grab $w; focus $w\"\n \tbind $w <Key-Return> \"destroy $w\"\n-\twm title $w \"[appname] ([reponame]): error\"\n+\twm title $w [append \"[appname] ([reponame]): \" [mc \"error\"]]\n \ttkwait window $w\n }\ndiff --git a/lib/index.tcl b/lib/index.tcl\nindex f47f929..b3f5e17 100644\n--- a/lib/index.tcl\n+++ b/lib/index.tcl\n@@ -345,26 +345,35 @@ proc revert_helper {txt paths} {\n \t\t}\n \t}\n \n+\n+\t# Split question between singular and plural cases, because\n+\t# such distinction is needed in some languages. Previously, the\n+\t# code used \"Revert changes in\" for both, but that can't work\n+\t# in languages where 'in' must be combined with word from\n+\t# rest of string (in diffrent way for both cases of course).\n+\t#\n+\t# FIXME: Unfortunately, even that isn't enough in some languages\n+\t# as they have quite complex plural-form rules. Unfortunately,\n+\t# msgcat doesn't seem to support that kind of string translation.\n+\t#\n \tset n [llength $pathList]\n \tif {$n == 0} {\n \t\tunlock_index\n \t\treturn\n \t} elseif {$n == 1} {\n-\t\tset s \"[short_path [lindex $pathList]]\"\n+\t\tset query [mc \"Revert changes in file %s?\" [short_path [lindex $pathList]]]\n \t} else {\n-\t\tset s \"these $n files\"\n+\t\tset query [mc \"Revert changes in these %i files?\" $n]\n \t}\n \n \tset reply [tk_dialog \\\n \t\t.confirm_revert \\\n \t\t\"[appname] ([reponame])\" \\\n-\t\t\"Revert changes in $s?\n-\n-Any unstaged changes will be permanently lost by the revert.\" \\\n+\t\t[mc \"Any unstaged changes will be permanently lost by the revert.\"] \\\n \t\tquestion \\\n \t\t1 \\\n-\t\t{Do Nothing} \\\n-\t\t{Revert Changes} \\\n+\t\t[mc \"Do Nothing\"] \\\n+\t\t[mc \"Revert Changes\"] \\\n \t\t]\n \tif {$reply == 1} {\n \t\tcheckout_index \\\ndiff --git a/lib/merge.tcl b/lib/merge.tcl\nindex 0e50919..63e1427 100644\n--- a/lib/merge.tcl\n+++ b/lib/merge.tcl\n@@ -10,10 +10,10 @@ method _can_merge {} {\n \tglobal HEAD commit_type file_states\n \n \tif {[string match amend* $commit_type]} {\n-\t\tinfo_popup {Cannot merge while amending.\n+\t\tinfo_popup [mc \"Cannot merge while amending.\n \n You must finish amending this commit before starting any type of merge.\n-}\n+\"]\n \t\treturn 0\n \t}\n \n@@ -24,12 +24,12 @@ You must finish amending this commit before starting any type of merge.\n \t#\n \trepository_state curType curHEAD curMERGE_HEAD\n \tif {$commit_type ne $curType || $HEAD ne $curHEAD} {\n-\t\tinfo_popup {Last scanned state does not match repository state.\n+\t\tinfo_popup [mc \"Last scanned state does not match repository state.\n \n Another Git program has modified this repository since the last scan.  A rescan must be performed before a merge can be performed.\n \n The rescan will be automatically started now.\n-}\n+\"]\n \t\tunlock_index\n \t\trescan ui_ready\n \t\treturn 0\n@@ -41,22 +41,22 @@ The rescan will be automatically started now.\n \t\t\tcontinue; # and pray it works!\n \t\t}\n \t\tU? {\n-\t\t\terror_popup \"You are in the middle of a conflicted merge.\n+\t\t\terror_popup [mc \"You are in the middle of a conflicted merge.\n \n-File [short_path $path] has merge conflicts.\n+File %s has merge conflicts.\n \n You must resolve them, stage the file, and commit to complete the current merge.  Only then can you begin another merge.\n-\"\n+\" [short_path $path]]\n \t\t\tunlock_index\n \t\t\treturn 0\n \t\t}\n \t\t?? {\n-\t\t\terror_popup \"You are in the middle of a change.\n+\t\t\terror_popup [mc \"You are in the middle of a change.\n \n-File [short_path $path] is modified.\n+File %s is modified.\n \n You should complete the current commit before starting a merge.  Doing so will help you abort a failed merge, should the need arise.\n-\"\n+\" [short_path $path]]\n \t\t\tunlock_index\n \t\t\treturn 0\n \t\t}\n@@ -103,7 +103,7 @@ method _start {} {\n \t\t\tregsub {^[^:@]*@} $remote {} remote\n \t\t}\n \t\tset branch [lindex $spec 2]\n-\t\tset stitle \"$branch of $remote\"\n+\t\tset stitle [mc \"%s of %s\" $branch $remote]\n \t}\n \tregsub ^refs/heads/ $branch {} branch\n \tputs $fh \"$cmit\\t\\tbranch '$branch' of $remote\"\n@@ -116,9 +116,9 @@ method _start {} {\n \tlappend cmd HEAD\n \tlappend cmd $name\n \n-\tset msg \"Merging $current_branch and $stitle\"\n+\tset msg [mc \"Merging %s and %s\" $current_branch $stitle]\n \tui_status \"$msg...\"\n-\tset cons [console::new \"Merge\" \"merge $stitle\"]\n+\tset cons [console::new [mc \"Merge\"] \"merge $stitle\"]\n \tconsole::exec $cons $cmd [cb _finish $cons]\n \n \twm protocol $w WM_DELETE_WINDOW {}\n@@ -128,9 +128,9 @@ method _start {} {\n method _finish {cons ok} {\n \tconsole::done $cons $ok\n \tif {$ok} {\n-\t\tset msg {Merge completed successfully.}\n+\t\tset msg [mc \"Merge completed successfully.\"]\n \t} else {\n-\t\tset msg {Merge failed.  Conflict resolution is required.}\n+\t\tset msg [mc \"Merge failed.  Conflict resolution is required.\"]\n \t}\n \tunlock_index\n \trescan [list ui_status $msg]\n@@ -147,7 +147,7 @@ constructor dialog {} {\n \t}\n \n \tmake_toplevel top w\n-\twm title $top \"[appname] ([reponame]): Merge\"\n+\twm title $top [append \"[appname] ([reponame]): \" [mc \"Merge\"]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t}\n@@ -155,26 +155,26 @@ constructor dialog {} {\n \tset _start [cb _start]\n \n \tlabel $w.header \\\n-\t\t-text \"Merge Into $current_branch\" \\\n+\t\t-text [mc \"Merge Into %s\" $current_branch] \\\n \t\t-font font_uibold\n \tpack $w.header -side top -fill x\n \n \tframe $w.buttons\n \tbutton $w.buttons.visualize \\\n-\t\t-text Visualize \\\n+\t\t-text [mc Visualize] \\\n \t\t-command [cb _visualize]\n \tpack $w.buttons.visualize -side left\n \tbutton $w.buttons.merge \\\n-\t\t-text Merge \\\n+\t\t-text [mc Merge] \\\n \t\t-command $_start\n \tpack $w.buttons.merge -side right\n \tbutton $w.buttons.cancel \\\n-\t\t-text {Cancel} \\\n+\t\t-text [mc \"Cancel\"] \\\n \t\t-command [cb _cancel]\n \tpack $w.buttons.cancel -side right -padx 5\n \tpack $w.buttons -side bottom -fill x -pady 10 -padx 10\n \n-\tset w_rev [::choose_rev::new_unmerged $w.rev {Revision To Merge}]\n+\tset w_rev [::choose_rev::new_unmerged $w.rev [mc \"Revision To Merge\"]]\n \tpack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5\n \n \tbind $w <$M1B-Key-Return> $_start\n@@ -209,34 +209,34 @@ proc reset_hard {} {\n \tglobal HEAD commit_type file_states\n \n \tif {[string match amend* $commit_type]} {\n-\t\tinfo_popup {Cannot abort while amending.\n+\t\tinfo_popup [mc \"Cannot abort while amending.\n \n You must finish amending this commit.\n-}\n+\"]\n \t\treturn\n \t}\n \n \tif {![lock_index abort]} return\n \n \tif {[string match *merge* $commit_type]} {\n-\t\tset op_question \"Abort merge?\n+\t\tset op_question [mc \"Abort merge?\n \n Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n \n-Continue with aborting the current merge?\"\n+Continue with aborting the current merge?\"]\n \t} else {\n-\t\tset op_question \"Reset changes?\n+\t\tset op_question [mc \"Reset changes?\n \n Resetting the changes will cause *ALL* uncommitted changes to be lost.\n \n-Continue with resetting the current changes?\"\n+Continue with resetting the current changes?\"]\n \t}\n \n \tif {[ask_popup $op_question] eq {yes}} {\n \t\tset fd [git_read --stderr read-tree --reset -u -v HEAD]\n \t\tfconfigure $fd -blocking 0 -translation binary\n \t\tfileevent $fd readable [namespace code [list _reset_wait $fd]]\n-\t\t$::main_status start {Aborting} {files reset}\n+\t\t$::main_status start [mc \"Aborting\"] {files reset}\n \t} else {\n \t\tunlock_index\n \t}\n@@ -263,9 +263,9 @@ proc _reset_wait {fd} {\n \t\tcatch {file delete [gitdir GITGUI_MSG]}\n \n \t\tif {$fail} {\n-\t\t\twarn_popup \"Abort failed.\\n\\n$err\"\n+\t\t\twarn_popup \"[mc \"Abort failed.\"]\\n\\n$err\"\n \t\t}\n-\t\trescan {ui_status {Abort completed.  Ready.}}\n+\t\trescan {ui_status [mc \"Abort completed.  Ready.\"]}\n \t} else {\n \t\tfconfigure $fd -blocking 0\n \t}\ndiff --git a/lib/option.tcl b/lib/option.tcl\nindex aa9f783..31c7d47 100644\n--- a/lib/option.tcl\n+++ b/lib/option.tcl\n@@ -62,7 +62,7 @@ proc do_about {} {\n \ttoplevel $w\n \twm geometry $w \"+[winfo rootx .]+[winfo rooty .]\"\n \n-\tlabel $w.header -text \"About [appname]\" \\\n+\tlabel $w.header -text [mc \"About %s\" [appname]] \\\n \t\t-font font_uibold\n \tpack $w.header -side top -fill x\n \n@@ -74,8 +74,7 @@ proc do_about {} {\n \tpack $w.buttons -side bottom -fill x -pady 10 -padx 10\n \n \tlabel $w.desc \\\n-\t\t-text \"git-gui - a graphical user interface for Git.\n-$copyright\" \\\n+\t\t-text \"[mc \"git-gui - a graphical user interface for Git.\"]\\n$copyright\" \\\n \t\t-padx 5 -pady 5 \\\n \t\t-justify left \\\n \t\t-anchor w \\\n@@ -157,48 +156,48 @@ proc do_options {} {\n \ttoplevel $w\n \twm geometry $w \"+[winfo rootx .]+[winfo rooty .]\"\n \n-\tlabel $w.header -text \"Options\" \\\n+\tlabel $w.header -text [mc \"Options\"] \\\n \t\t-font font_uibold\n \tpack $w.header -side top -fill x\n \n \tframe $w.buttons\n-\tbutton $w.buttons.restore -text {Restore Defaults} \\\n+\tbutton $w.buttons.restore -text [mc \"Restore Defaults\"] \\\n \t\t-default normal \\\n \t\t-command do_restore_defaults\n \tpack $w.buttons.restore -side left\n-\tbutton $w.buttons.save -text Save \\\n+\tbutton $w.buttons.save -text [mc Save] \\\n \t\t-default active \\\n \t\t-command [list do_save_config $w]\n \tpack $w.buttons.save -side right\n-\tbutton $w.buttons.cancel -text {Cancel} \\\n+\tbutton $w.buttons.cancel -text [mc \"Cancel\"] \\\n \t\t-default normal \\\n \t\t-command [list destroy $w]\n \tpack $w.buttons.cancel -side right -padx 5\n \tpack $w.buttons -side bottom -fill x -pady 10 -padx 10\n \n-\tlabelframe $w.repo -text \"[reponame] Repository\"\n-\tlabelframe $w.global -text {Global (All Repositories)}\n+\tlabelframe $w.repo -text [mc \"%s Repository\" [reponame]]\n+\tlabelframe $w.global -text [mc \"Global (All Repositories)\"]\n \tpack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5\n \tpack $w.global -side right -fill both -expand 1 -pady 5 -padx 5\n \n \tset optid 0\n \tforeach option {\n-\t\t{t user.name {User Name}}\n-\t\t{t user.email {Email Address}}\n-\n-\t\t{b merge.summary {Summarize Merge Commits}}\n-\t\t{i-1..5 merge.verbosity {Merge Verbosity}}\n-\t\t{b merge.diffstat {Show Diffstat After Merge}}\n-\n-\t\t{b gui.trustmtime  {Trust File Modification Timestamps}}\n-\t\t{b gui.pruneduringfetch {Prune Tracking Branches During Fetch}}\n-\t\t{b gui.matchtrackingbranch {Match Tracking Branches}}\n-\t\t{i-0..99 gui.diffcontext {Number of Diff Context Lines}}\n-\t\t{t gui.newbranchtemplate {New Branch Name Template}}\n+\t\t{t user.name {mc \"User Name\"}}\n+\t\t{t user.email {mc \"Email Address\"}}\n+\n+\t\t{b merge.summary {mc \"Summarize Merge Commits\"}}\n+\t\t{i-1..5 merge.verbosity {mc \"Merge Verbosity\"}}\n+\t\t{b merge.diffstat {mc \"Show Diffstat After Merge\"}}\n+\n+\t\t{b gui.trustmtime  {mc \"Trust File Modification Timestamps\"}}\n+\t\t{b gui.pruneduringfetch {mc \"Prune Tracking Branches During Fetch\"}}\n+\t\t{b gui.matchtrackingbranch {mc \"Match Tracking Branches\"}}\n+\t\t{i-0..99 gui.diffcontext {mc \"Number of Diff Context Lines\"}}\n+\t\t{t gui.newbranchtemplate {mc \"New Branch Name Template\"}}\n \t\t} {\n \t\tset type [lindex $option 0]\n \t\tset name [lindex $option 1]\n-\t\tset text [lindex $option 2]\n+\t\tset text [eval [lindex $option 2]]\n \t\tincr optid\n \t\tforeach f {repo global} {\n \t\t\tswitch -glob -- $type {\n@@ -246,7 +245,7 @@ proc do_options {} {\n \tforeach option $font_descs {\n \t\tset name [lindex $option 0]\n \t\tset font [lindex $option 1]\n-\t\tset text [lindex $option 2]\n+\t\tset text [eval [lindex $option 2]]\n \n \t\tset global_config_new(gui.$font^^family) \\\n \t\t\t[font configure $font -family]\n@@ -272,7 +271,7 @@ proc do_options {} {\n \tbind $w <Visibility> \"grab $w; focus $w.buttons.save\"\n \tbind $w <Key-Escape> \"destroy $w\"\n \tbind $w <Key-Return> [list do_save_config $w]\n-\twm title $w \"[appname] ([reponame]): Options\"\n+\twm title $w [append \"[appname] ([reponame]): \" [mc \"Options\"]]\n \ttkwait window $w\n }\n \n@@ -303,7 +302,7 @@ proc do_restore_defaults {} {\n \n proc do_save_config {w} {\n \tif {[catch {save_config} err]} {\n-\t\terror_popup \"Failed to completely save options:\\n\\n$err\"\n+\t\terror_popup [append [mc \"Failed to completely save options:\"] \"\\n\\n$err\"]\n \t}\n \treshow_diff\n \tdestroy $w\ndiff --git a/lib/remote.tcl b/lib/remote.tcl\nindex cf9b9d5..62bfe8f 100644\n--- a/lib/remote.tcl\n+++ b/lib/remote.tcl\n@@ -159,7 +159,7 @@ proc populate_fetch_menu {} {\n \t\tif {$enable} {\n \t\t\tlappend prune_list $r\n \t\t\t$m add command \\\n-\t\t\t\t-label \"Fetch from $r...\" \\\n+\t\t\t\t-label [mc \"Fetch from %s...\" $r] \\\n \t\t\t\t-command [list fetch_from $r]\n \t\t}\n \t}\n@@ -169,7 +169,7 @@ proc populate_fetch_menu {} {\n \t}\n \tforeach r $prune_list {\n \t\t$m add command \\\n-\t\t\t-label \"Prune from $r...\" \\\n+\t\t\t-label [mc \"Prune from %s...\" $r] \\\n \t\t\t-command [list prune_from $r]\n \t}\n }\n@@ -203,7 +203,7 @@ proc populate_push_menu {} {\n \t\t\t\t$m add separator\n \t\t\t}\n \t\t\t$m add command \\\n-\t\t\t\t-label \"Push to $r...\" \\\n+\t\t\t\t-label [mc \"Push to %s...\" $r] \\\n \t\t\t\t-command [list push_to $r]\n \t\t\tincr fast_count\n \t\t}\ndiff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl\nindex c88a360..06b5eab 100644\n--- a/lib/remote_branch_delete.tcl\n+++ b/lib/remote_branch_delete.tcl\n@@ -26,28 +26,28 @@ constructor dialog {} {\n \tglobal all_remotes M1B\n \n \tmake_toplevel top w\n-\twm title $top \"[appname] ([reponame]): Delete Remote Branch\"\n+\twm title $top [append \"[appname] ([reponame]): \" [mc \"Delete Remote Branch\"]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t}\n \n-\tlabel $w.header -text {Delete Remote Branch} -font font_uibold\n+\tlabel $w.header -text [mc \"Delete Remote Branch\"] -font font_uibold\n \tpack $w.header -side top -fill x\n \n \tframe $w.buttons\n-\tbutton $w.buttons.delete -text Delete \\\n+\tbutton $w.buttons.delete -text [mc Delete] \\\n \t\t-default active \\\n \t\t-command [cb _delete]\n \tpack $w.buttons.delete -side right\n-\tbutton $w.buttons.cancel -text {Cancel} \\\n+\tbutton $w.buttons.cancel -text [mc \"Cancel\"] \\\n \t\t-command [list destroy $w]\n \tpack $w.buttons.cancel -side right -padx 5\n \tpack $w.buttons -side bottom -fill x -pady 10 -padx 10\n \n-\tlabelframe $w.dest -text {From Repository}\n+\tlabelframe $w.dest -text [mc \"From Repository\"]\n \tif {$all_remotes ne {}} {\n \t\tradiobutton $w.dest.remote_r \\\n-\t\t\t-text {Remote:} \\\n+\t\t\t-text [mc \"Remote:\"] \\\n \t\t\t-value remote \\\n \t\t\t-variable @urltype\n \t\teval tk_optionMenu $w.dest.remote_m @remote $all_remotes\n@@ -63,7 +63,7 @@ constructor dialog {} {\n \t\tset urltype url\n \t}\n \tradiobutton $w.dest.url_r \\\n-\t\t-text {Arbitrary URL:} \\\n+\t\t-text [mc \"Arbitrary URL:\"] \\\n \t\t-value url \\\n \t\t-variable @urltype\n \tentry $w.dest.url_t \\\n@@ -81,7 +81,7 @@ constructor dialog {} {\n \tgrid columnconfigure $w.dest 1 -weight 1\n \tpack $w.dest -anchor nw -fill x -pady 5 -padx 5\n \n-\tlabelframe $w.heads -text {Branches}\n+\tlabelframe $w.heads -text [mc \"Branches\"]\n \tlistbox $w.heads.l \\\n \t\t-height 10 \\\n \t\t-width 70 \\\n@@ -96,7 +96,7 @@ constructor dialog {} {\n \t\t-anchor w \\\n \t\t-justify left\n \tbutton $w.heads.footer.rescan \\\n-\t\t-text {Rescan} \\\n+\t\t-text [mc \"Rescan\"] \\\n \t\t-command [cb _rescan]\n \tpack $w.heads.footer.status -side left -fill x\n \tpack $w.heads.footer.rescan -side right\n@@ -106,9 +106,9 @@ constructor dialog {} {\n \tpack $w.heads.l -side left -fill both -expand 1\n \tpack $w.heads -fill both -expand 1 -pady 5 -padx 5\n \n-\tlabelframe $w.validate -text {Delete Only If}\n+\tlabelframe $w.validate -text [mc \"Delete Only If\"]\n \tradiobutton $w.validate.head_r \\\n-\t\t-text {Merged Into:} \\\n+\t\t-text [mc \"Merged Into:\"] \\\n \t\t-value head \\\n \t\t-variable @checktype\n \tset head_m [tk_optionMenu $w.validate.head_m @check_head {}]\n@@ -116,7 +116,7 @@ constructor dialog {} {\n \ttrace add variable @check_head write [cb _write_check_head]\n \tgrid $w.validate.head_r $w.validate.head_m -sticky w\n \tradiobutton $w.validate.always_r \\\n-\t\t-text {Always (Do not perform merge checks)} \\\n+\t\t-text [mc \"Always (Do not perform merge checks)\"] \\\n \t\t-value always \\\n \t\t-variable @checktype\n \tgrid $w.validate.always_r -columnspan 2 -sticky w\n@@ -149,7 +149,7 @@ method _delete {} {\n \t\t\t\t-type ok \\\n \t\t\t\t-title [wm title $w] \\\n \t\t\t\t-parent $w \\\n-\t\t\t\t-message \"A branch is required for 'Merged Into'.\"\n+\t\t\t\t-message [mc \"A branch is required for 'Merged Into'.\"]\n \t\t\treturn\n \t\t}\n \t\tset crev $full_cache(\"$cache\\nrefs/heads/$check_head\")\n@@ -186,9 +186,7 @@ method _delete {} {\n  - [join $not_merged \"\\n - \"]\"\n \n \t\tif {$need_fetch} {\n-\t\t\tappend msg \"\n-\n-One or more of the merge tests failed because you have not fetched the necessary commits.  Try fetching from $uri first.\"\n+\t\t\tappend msg \"\\n\\n\" [mc \"One or more of the merge tests failed because you have not fetched the necessary commits.  Try fetching from %s first.\" $uri]\n \t\t}\n \n \t\ttk_messageBox \\\n@@ -206,7 +204,7 @@ One or more of the merge tests failed because you have not fetched the necessary\n \t\t\t-type ok \\\n \t\t\t-title [wm title $w] \\\n \t\t\t-parent $w \\\n-\t\t\t-message \"Please select one or more branches to delete.\"\n+\t\t\t-message [mc \"Please select one or more branches to delete.\"]\n \t\treturn\n \t}\n \n@@ -215,9 +213,9 @@ One or more of the merge tests failed because you have not fetched the necessary\n \t\t-type yesno \\\n \t\t-title [wm title $w] \\\n \t\t-parent $w \\\n-\t\t-message {Recovering deleted branches is difficult.\n+\t\t-message [mc \"Recovering deleted branches is difficult.\n \n-Delete the selected branches?}] ne yes} {\n+Delete the selected branches?\"]] ne yes} {\n \t\treturn\n \t}\n \n@@ -225,7 +223,7 @@ Delete the selected branches?}] ne yes} {\n \n \tset cons [console::new \\\n \t\t\"push $uri\" \\\n-\t\t\"Deleting branches from $uri\"]\n+\t\t[mc \"Deleting branches from %s\" $uri]]\n \tconsole::exec $cons $push_cmd\n }\n \n@@ -285,12 +283,12 @@ method _load {cache uri} {\n \t\t$w.heads.l conf -state disabled\n \t\tset head_list [list]\n \t\tset full_list [list]\n-\t\tset status {No repository selected.}\n+\t\tset status [mc \"No repository selected.\"]\n \t\treturn\n \t}\n \n \tif {[catch {set x $cached($cache)}]} {\n-\t\tset status \"Scanning $uri...\"\n+\t\tset status [mc \"Scanning %s...\" $uri]\n \t\t$w.heads.l conf -state disabled\n \t\tset head_list [list]\n \t\tset full_list [list]\ndiff --git a/lib/shortcut.tcl b/lib/shortcut.tcl\nindex c36be2f..d0e63a3 100644\n--- a/lib/shortcut.tcl\n+++ b/lib/shortcut.tcl\n@@ -6,7 +6,7 @@ proc do_windows_shortcut {} {\n \n \tset fn [tk_getSaveFile \\\n \t\t-parent . \\\n-\t\t-title \"[appname] ([reponame]): Create Desktop Icon\" \\\n+\t\t-title [append \"[appname] ([reponame]): \" [mc \"Create Desktop Icon\"]] \\\n \t\t-initialfile \"Git [reponame].bat\"]\n \tif {$fn != {}} {\n \t\tif {[file extension $fn] ne {.bat}} {\n@@ -23,7 +23,7 @@ proc do_windows_shortcut {} {\n \t\t\t\tputs $fd \" \\\"[file normalize $argv0]\\\"\"\n \t\t\t\tclose $fd\n \t\t\t} err]} {\n-\t\t\terror_popup \"Cannot write script:\\n\\n$err\"\n+\t\t\terror_popup [append [mc \"Cannot write script:\"] \"\\n\\n$err\"]\n \t\t}\n \t}\n }\n@@ -42,7 +42,7 @@ proc do_cygwin_shortcut {} {\n \t}\n \tset fn [tk_getSaveFile \\\n \t\t-parent . \\\n-\t\t-title \"[appname] ([reponame]): Create Desktop Icon\" \\\n+\t\t-title [append \"[appname] ([reponame]): \" [mc \"Create Desktop Icon\"]] \\\n \t\t-initialdir $desktop \\\n \t\t-initialfile \"Git [reponame].bat\"]\n \tif {$fn != {}} {\n@@ -71,7 +71,7 @@ proc do_cygwin_shortcut {} {\n \t\t\t\tputs $fd \" &\\\"\"\n \t\t\t\tclose $fd\n \t\t\t} err]} {\n-\t\t\terror_popup \"Cannot write script:\\n\\n$err\"\n+\t\t\terror_popup [append [mc \"Cannot write script:\"] \"\\n\\n$err\"]\n \t\t}\n \t}\n }\n@@ -81,7 +81,7 @@ proc do_macosx_app {} {\n \n \tset fn [tk_getSaveFile \\\n \t\t-parent . \\\n-\t\t-title \"[appname] ([reponame]): Create Desktop Icon\" \\\n+\t\t-title [append \"[appname] ([reponame]): \" [mc \"Create Desktop Icon\"]] \\\n \t\t-initialdir [file join $env(HOME) Desktop] \\\n \t\t-initialfile \"Git [reponame].app\"]\n \tif {$fn != {}} {\n@@ -146,7 +146,7 @@ proc do_macosx_app {} {\n \n \t\t\t\tfile attributes $exe -permissions u+x,g+x,o+x\n \t\t\t} err]} {\n-\t\t\terror_popup \"Cannot write icon:\\n\\n$err\"\n+\t\t\terror_popup [append [mc \"Cannot write icon:\"] \"\\n\\n$err\"]\n \t\t}\n \t}\n }\ndiff --git a/lib/status_bar.tcl b/lib/status_bar.tcl\nindex 72a8fe1..769ef81 100644\n--- a/lib/status_bar.tcl\n+++ b/lib/status_bar.tcl\n@@ -55,7 +55,7 @@ method update {have total} {\n \t\tset pdone [expr {100 * $have / $total}]\n \t}\n \n-\tset status [format \"%s ... %i of %i %s (%2i%%)\" \\\n+\tset status [mc \"%s ... %i of %i %s (%2i%%)\" \\\n \t\t$prefix $have $total $units $pdone]\n \t$w_c coords bar 0 0 $pdone 20\n }\ndiff --git a/lib/transport.tcl b/lib/transport.tcl\nindex 3a22bd4..1c7baef 100644\n--- a/lib/transport.tcl\n+++ b/lib/transport.tcl\n@@ -4,7 +4,7 @@\n proc fetch_from {remote} {\n \tset w [console::new \\\n \t\t\"fetch $remote\" \\\n-\t\t\"Fetching new changes from $remote\"]\n+\t\t[mc \"Fetching new changes from %s\" $remote]]\n \tset cmds [list]\n \tlappend cmds [list exec git fetch $remote]\n \tif {[is_config_true gui.pruneduringfetch]} {\n@@ -16,14 +16,14 @@ proc fetch_from {remote} {\n proc prune_from {remote} {\n \tset w [console::new \\\n \t\t\"remote prune $remote\" \\\n-\t\t\"Pruning tracking branches deleted from $remote\"]\n+\t\t[mc \"Pruning tracking branches deleted from %s\" $remote]]\n \tconsole::exec $w [list git remote prune $remote]\n }\n \n proc push_to {remote} {\n \tset w [console::new \\\n \t\t\"push $remote\" \\\n-\t\t\"Pushing changes to $remote\"]\n+\t\t[mc \"Pushing changes to %s\" $remote]]\n \tset cmd [list git push]\n \tlappend cmd -v\n \tlappend cmd $remote\n@@ -65,7 +65,7 @@ proc start_push_anywhere_action {w} {\n \n \tset cons [console::new \\\n \t\t\"push $r_url\" \\\n-\t\t\"Pushing $cnt $unit to $r_url\"]\n+\t\t[mc \"Pushing %s %s to %s\" $cnt $unit $r_url]]\n \tconsole::exec $cons $cmd\n \tdestroy $w\n }\n@@ -81,21 +81,21 @@ proc do_push_anywhere {} {\n \ttoplevel $w\n \twm geometry $w \"+[winfo rootx .]+[winfo rooty .]\"\n \n-\tlabel $w.header -text {Push Branches} -font font_uibold\n+\tlabel $w.header -text [mc \"Push Branches\"] -font font_uibold\n \tpack $w.header -side top -fill x\n \n \tframe $w.buttons\n-\tbutton $w.buttons.create -text Push \\\n+\tbutton $w.buttons.create -text [mc Push] \\\n \t\t-default active \\\n \t\t-command [list start_push_anywhere_action $w]\n \tpack $w.buttons.create -side right\n-\tbutton $w.buttons.cancel -text {Cancel} \\\n+\tbutton $w.buttons.cancel -text [mc \"Cancel\"] \\\n \t\t-default normal \\\n \t\t-command [list destroy $w]\n \tpack $w.buttons.cancel -side right -padx 5\n \tpack $w.buttons -side bottom -fill x -pady 10 -padx 10\n \n-\tlabelframe $w.source -text {Source Branches}\n+\tlabelframe $w.source -text [mc \"Source Branches\"]\n \tlistbox $w.source.l \\\n \t\t-height 10 \\\n \t\t-width 70 \\\n@@ -112,10 +112,10 @@ proc do_push_anywhere {} {\n \tpack $w.source.l -side left -fill both -expand 1\n \tpack $w.source -fill both -expand 1 -pady 5 -padx 5\n \n-\tlabelframe $w.dest -text {Destination Repository}\n+\tlabelframe $w.dest -text [mc \"Destination Repository\"]\n \tif {$all_remotes ne {}} {\n \t\tradiobutton $w.dest.remote_r \\\n-\t\t\t-text {Remote:} \\\n+\t\t\t-text [mc \"Remote:\"] \\\n \t\t\t-value remote \\\n \t\t\t-variable push_urltype\n \t\teval tk_optionMenu $w.dest.remote_m push_remote $all_remotes\n@@ -130,7 +130,7 @@ proc do_push_anywhere {} {\n \t\tset push_urltype url\n \t}\n \tradiobutton $w.dest.url_r \\\n-\t\t-text {Arbitrary URL:} \\\n+\t\t-text [mc \"Arbitrary URL:\"] \\\n \t\t-value url \\\n \t\t-variable push_urltype\n \tentry $w.dest.url_t \\\n@@ -150,13 +150,13 @@ proc do_push_anywhere {} {\n \tgrid columnconfigure $w.dest 1 -weight 1\n \tpack $w.dest -anchor nw -fill x -pady 5 -padx 5\n \n-\tlabelframe $w.options -text {Transfer Options}\n+\tlabelframe $w.options -text [mc \"Transfer Options\"]\n \tcheckbutton $w.options.thin \\\n-\t\t-text {Use thin pack (for slow network connections)} \\\n+\t\t-text [mc \"Use thin pack (for slow network connections)\"] \\\n \t\t-variable push_thin\n \tgrid $w.options.thin -columnspan 2 -sticky w\n \tcheckbutton $w.options.tags \\\n-\t\t-text {Include tags} \\\n+\t\t-text [mc \"Include tags\"] \\\n \t\t-variable push_tags\n \tgrid $w.options.tags -columnspan 2 -sticky w\n \tgrid columnconfigure $w.options 1 -weight 1\n@@ -169,6 +169,6 @@ proc do_push_anywhere {} {\n \tbind $w <Visibility> \"grab $w; focus $w.buttons.create\"\n \tbind $w <Key-Escape> \"destroy $w\"\n \tbind $w <Key-Return> [list start_push_anywhere_action $w]\n-\twm title $w \"[appname] ([reponame]): Push\"\n+\twm title $w [append \"[appname] ([reponame]): \" [mc \"Push\"]]\n \ttkwait window $w\n }\n-- \n1.5.3.2.g46909\n"},{"id":"52218","messageId":"Pine.LNX.4.64.0709021725080.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 02/15] Makefile rules for translation catalog generation and installation.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:25:17Z","receivedAt":"2007-09-02T16:25:17Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\n[jes: with fixes by the i18n team.]\n\nSigned-off-by: Christian Stimming <stimming@tuhh.de>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n Makefile |   21 +++++++++++++++++++--\n 1 files changed, 19 insertions(+), 2 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 1bac6fe..559e65e 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -103,6 +103,21 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh\n $(GITGUI_BUILT_INS): git-gui\n \t$(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@\n \n+XGETTEXT   ?= xgettext\n+msgsdir    ?= $(libdir)/msgs\n+msgsdir_SQ  = $(subst ','\\'',$(msgsdir))\n+PO_TEMPLATE = po/git-gui.pot\n+ALL_POFILES = $(wildcard po/*.po)\n+ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))\n+\n+$(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES)\n+\t$(XGETTEXT) -kmc -LTcl -o $@ $(SCRIPT_SH) $(ALL_LIBFILES)\n+update-po:: $(PO_TEMPLATE)\n+\t$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )\n+$(ALL_MSGFILES): %.msg : %.po\n+\t@echo Generating catalog $@\n+\tmsgfmt --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)\n+\n lib/tclIndex: $(ALL_LIBFILES)\n \t$(QUIET_INDEX)if echo \\\n \t  $(foreach p,$(PRELOAD_FILES),source $p\\;) \\\n@@ -136,7 +151,7 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS\n \t\techo 1>$@ \"$$VARS\"; \\\n \tfi\n \n-all:: $(ALL_PROGRAMS) lib/tclIndex\n+all:: $(ALL_PROGRAMS) lib/tclIndex $(ALL_MSGFILES)\n \n install: all\n \t$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1)\n@@ -145,13 +160,15 @@ install: all\n \t$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(INSTALL_D1)\n \t$(QUIET)$(INSTALL_R0)lib/tclIndex $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'\n \t$(QUIET)$(foreach p,$(ALL_LIBFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)' &&) true\n+\t$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(INSTALL_D1)\n+\t$(QUIET)$(foreach p,$(ALL_MSGFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true\n \n dist-version:\n \t@mkdir -p $(TARDIR)\n \t@echo $(GITGUI_VERSION) > $(TARDIR)/version\n \n clean::\n-\trm -f $(ALL_PROGRAMS) lib/tclIndex\n+\trm -f $(ALL_PROGRAMS) lib/tclIndex po/*.msg\n \trm -f GIT-VERSION-FILE GIT-GUI-VARS\n \n .PHONY: all install dist-version clean\n-- \n1.5.3.2.g46909\n"},{"id":"52219","messageId":"Pine.LNX.4.64.0709021725520.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 02/15] Makefile rules for translation catalog generation and installation.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:26:13Z","receivedAt":"2007-09-02T16:26:13Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Christian Stimming <stimming@tuhh.de>\n\n[jes: with fixes by the i18n team.]\n\nSigned-off-by: Christian Stimming <stimming@tuhh.de>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n Makefile |   21 +++++++++++++++++++--\n 1 files changed, 19 insertions(+), 2 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 1bac6fe..559e65e 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -103,6 +103,21 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh\n $(GITGUI_BUILT_INS): git-gui\n \t$(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@\n \n+XGETTEXT   ?= xgettext\n+msgsdir    ?= $(libdir)/msgs\n+msgsdir_SQ  = $(subst ','\\'',$(msgsdir))\n+PO_TEMPLATE = po/git-gui.pot\n+ALL_POFILES = $(wildcard po/*.po)\n+ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))\n+\n+$(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES)\n+\t$(XGETTEXT) -kmc -LTcl -o $@ $(SCRIPT_SH) $(ALL_LIBFILES)\n+update-po:: $(PO_TEMPLATE)\n+\t$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )\n+$(ALL_MSGFILES): %.msg : %.po\n+\t@echo Generating catalog $@\n+\tmsgfmt --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)\n+\n lib/tclIndex: $(ALL_LIBFILES)\n \t$(QUIET_INDEX)if echo \\\n \t  $(foreach p,$(PRELOAD_FILES),source $p\\;) \\\n@@ -136,7 +151,7 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS\n \t\techo 1>$@ \"$$VARS\"; \\\n \tfi\n \n-all:: $(ALL_PROGRAMS) lib/tclIndex\n+all:: $(ALL_PROGRAMS) lib/tclIndex $(ALL_MSGFILES)\n \n install: all\n \t$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1)\n@@ -145,13 +160,15 @@ install: all\n \t$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(INSTALL_D1)\n \t$(QUIET)$(INSTALL_R0)lib/tclIndex $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'\n \t$(QUIET)$(foreach p,$(ALL_LIBFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)' &&) true\n+\t$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(INSTALL_D1)\n+\t$(QUIET)$(foreach p,$(ALL_MSGFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true\n \n dist-version:\n \t@mkdir -p $(TARDIR)\n \t@echo $(GITGUI_VERSION) > $(TARDIR)/version\n \n clean::\n-\trm -f $(ALL_PROGRAMS) lib/tclIndex\n+\trm -f $(ALL_PROGRAMS) lib/tclIndex po/*.msg\n \trm -f GIT-VERSION-FILE GIT-GUI-VARS\n \n .PHONY: all install dist-version clean\n-- \n1.5.3.2.g46909\n"},{"id":"52220","messageId":"Pine.LNX.4.64.0709021727350.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021724440.28586@racer.site","subject":"Re: [PATCH 01/15] Mark strings for translation.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:28:30Z","receivedAt":"2007-09-02T16:28:30Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\noops... this patch is\n\nFrom: Christian Stimming <stimming@tuhh.de>\n\nSorry,\nDscho\n"},{"id":"52221","messageId":"Pine.LNX.4.64.0709021730280.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 03/15] git-gui po/README: Guide to translators","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:30:41Z","receivedAt":"2007-09-02T16:30:41Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nFrom: Junio C Hamano <gitster@pobox.com>\n\nThis short note is to help a translation contributor to help us\nlocalizing git-gui message files by covering the basics.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n po/README |  205 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 205 insertions(+), 0 deletions(-)\n create mode 100644 po/README\n\ndiff --git a/po/README b/po/README\nnew file mode 100644\nindex 0000000..af5dfad\n--- /dev/null\n+++ b/po/README\n@@ -0,0 +1,205 @@\n+Localizing git-gui for your language\n+====================================\n+\n+This short note is to help you, who reads and writes English and your\n+own language, help us getting git-gui localized for more languages.  It\n+does not try to be a comprehensive manual of GNU gettext, which is the\n+i18n framework we use, but tries to help you get started by covering the\n+basics and how it is used in this project.\n+\n+1. Getting started.\n+\n+You would first need to have a working \"git\".  Your distribution may\n+have it as \"git-core\" package (do not get \"GNU Interactive Tools\" --\n+that is a different \"git\").  You would also need GNU gettext toolchain\n+to test the resulting translation out.  Although you can work on message\n+translation files with a regular text editor, it is a good idea to have\n+specialized so-called \"po file editors\" (e.g. emacs po-mode, KBabel,\n+poedit, GTranslator --- any of them would work well).  Please install\n+them.\n+\n+You would then need to clone the git-gui internationalization project\n+repository, so that you can work on it:\n+\n+\t$ git clone mob@repo.or.cz:/srv/git/git-gui/git-gui-i18n.git/\n+\t$ cd git-gui-i18n\n+\t$ git checkout --track -b mob origin/mob\n+\t$ git config remote.origin.push mob\n+\n+The \"git checkout\" command creates a 'mob' branch from upstream's\n+corresponding branch and makes it your current branch.  You will be\n+working on this branch.\n+\n+The \"git config\" command records in your repository configuration file\n+that you would push \"mob\" branch to the upstream when you say \"git\n+push\".\n+\n+\n+2. Starting a new language.\n+\n+In the git-gui-i18n directory is a po/ subdirectory.  It has a\n+handful files whose names end with \".po\".  Is there a file that has\n+messages in your language?\n+\n+If you do not know what your language should be named, you need to find\n+it.  This currently follows ISO 639-1 two letter codes:\n+\n+\thttp://www.loc.gov/standards/iso639-2/php/code_list.php\n+\n+For example, if you are preparing a translation for Afrikaans, the\n+language code is \"af\".  If there already is a translation for your\n+language, you do not have to perform any step in this section, but keep\n+reading, because we are covering the basics.\n+\n+If you did not find your language, you would need to start one yourself.\n+Copy po/git-gui.pot file to po/af.po (replace \"af\" with the code for\n+your language).  Edit the first several lines to match existing *.po\n+files to make it clear this is a translation table for git-gui project,\n+and you are the primary translator.  The result of your editing would\n+look something like this:\n+\n+    # Translation of git-gui to Afrikaans\n+    # Copyright (C) 2007 Shawn Pearce\n+    # This file is distributed under the same license as the git-gui package.\n+    # YOUR NAME <YOUR@E-MAIL.ADDRESS>, 2007.\n+    #\n+    #, fuzzy\n+    msgid \"\"\n+    msgstr \"\"\n+    \"Project-Id-Version: git-gui\\n\"\n+    \"Report-Msgid-Bugs-To: \\n\"\n+    \"POT-Creation-Date: 2007-07-24 22:19+0300\\n\"\n+    \"PO-Revision-Date: 2007-07-25 18:00+0900\\n\"\n+    \"Last-Translator: YOUR NAME <YOUR@E-MAIL.ADDRESS>\\n\"\n+    \"Language-Team: Afrikaans\\n\"\n+    \"MIME-Version: 1.0\\n\"\n+    \"Content-Type: text/plain; charset=UTF-8\\n\"\n+    \"Content-Transfer-Encoding: 8bit\\n\"\n+\n+You will find many pairs of a \"msgid\" line followed by a \"msgstr\" line.\n+These pairs define how messages in git-gui application are translated to\n+your language.  Your primarily job is to fill in the empty double quote\n+pairs on msgstr lines with the translation of the strings on their\n+matching msgid lines.  A few tips:\n+\n+ - Control characters, such as newlines, are written in backslash\n+   sequence similar to string literals in the C programming language.\n+   When the string given on a msgid line has such a backslash sequence,\n+   you would typically want to have corresponding ones in the string on\n+   your msgstr line.\n+\n+ - Often the messages being translated are format strings given to\n+   \"printf()\"-like functions.  Make sure \"%s\", \"%d\", and \"%%\" in your\n+   translated messages match the original.\n+\n+   When you have to change the order of words, you can add \"<number>\\$\"\n+   between '%' and the conversion ('s', 'd', etc.) to say \"<number>-th\n+   parameter to the format string is used at this point\".  For example,\n+   if the original message is like this:\n+\n+\t\"Length is %d, Weight is %d\"\n+\n+   and if for whatever reason your translation needs to say weight first\n+   and then length, you can say something like:\n+\n+\t\"WEIGHT IS %2\\$d, LENGTH IS %1\\$d\"\n+\n+   The reason you need a backslash before dollar sign is because\n+   this is a double quoted string in Tcl language, and without\n+   it the letter introduces a variable interpolation, which you\n+   do not want here.\n+\n+ - A long message can be split across multiple lines by ending the\n+   string with a double quote, and starting another string on the next\n+   line with another double quote.  They will be concatenated in the\n+   result.  For example:\n+\n+   #: lib/remote_branch_delete.tcl:189\n+   #, tcl-format\n+   msgid \"\"\n+   \"One or more of the merge tests failed because you have not fetched the \"\n+   \"necessary commits.  Try fetching from %s first.\"\n+   msgstr \"\"\n+   \"HERE YOU WILL WRITE YOUR TRANSLATION OF THE ABOVE LONG \"\n+   \"MESSAGE IN YOUR LANGUAGE.\"\n+\n+You can test your translation by running \"make install\", which would\n+create po/af.msg file and installs the result, and then running the\n+resulting git-gui under your locale:\n+\n+\t$ make install\n+\t$ LANG=af git-gui\n+\n+There is a trick to test your translation without first installing, if\n+you prefer.  First, create this symbolic link in the source tree:\n+\n+\t$ ln -s ../po lib/msgs\n+\n+After setting up such a symbolic link, you can:\n+\n+\t$ make\n+\t$ LANG=af ./git-gui.sh\n+\n+When you are satisfied with your translation, commit your changes, and\n+push it back to the 'mob' branch:\n+\n+\t$ edit po/af.po\n+\t... be sure to update Last-Translator: and\n+\t... PO-Revision-Date: lines.\n+\t$ git add po/af.po\n+\t$ git commit -m 'Started Afrikaans translation.'\n+\t$ git push\n+\n+\n+3. Updating your translation.\n+\n+There may already be a translation for your language, and you may want\n+to contribute an update.  This may be because you would want to improve\n+the translation of existing messages, or because the git-gui software\n+itself was updated and there are new messages that need translation.\n+\n+In any case, make sure you are up-to-date before starting your work:\n+\n+\t$ git pull\n+\n+In the former case, you will edit po/af.po (again, replace \"af\" with\n+your language code), and after testing and updating the Last-Translator:\n+and PO-Revision-Date: lines, \"add/commit/push\" as in the previous\n+section.\n+\n+By comparing \"POT-Creation-Date:\" line in po/git-gui.pot file and\n+po/af.po file, you can tell if there are new messages that need to be\n+translated.  You would need the GNU gettext package to perform this\n+step.\n+\n+\t$ msgmerge -U po/af.po po/git-gui.pot\n+\n+[NEEDSWORK: who is responsible for updating po/git-gui.pot file by\n+running xgettext?  IIRC, Christian recommended against running it\n+nilly-willy because it can become a source of unnecessary merge\n+conflicts.  Perhaps we should mention something like \"\n+\n+The po/git-gui.pot file is updated by the internationalization\n+coordinator from time to time.  You _could_ update it yourself, but\n+translators are discouraged from doing so because we would want all\n+language teams to be working off of the same version of git-gui.pot.\n+\n+\" here?]\n+\n+This updates po/af.po (again, replace \"af\" with your language\n+code) so that it contains msgid lines (i.e. the original) that\n+your translation did not have before.  There are a few things to\n+watch out for:\n+\n+ - The original text in English of an older message you already\n+   translated might have been changed.  You will notice a comment line\n+   that begins with \"#, fuzzy\" in front of such a message.  msgmerge\n+   tool made its best effort to match your old translation with the\n+   message from the updated software, but you may find cases that it\n+   matched your old translated message to a new msgid and the pairing\n+   does not make any sense -- you would need to fix them, and then\n+   remove the \"#, fuzzy\" line from the message (your fixed translation\n+   of the message will not be used before you remove the marker).\n+\n+ - New messages added to the software will have msgstr lines with empty\n+   strings.  You would need to translate them.\n-- \n1.5.3.2.g46909\n"},{"id":"52222","messageId":"Pine.LNX.4.64.0709021730490.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 04/15] Add po/git-gui.pot","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:31:02Z","receivedAt":"2007-09-02T16:31:02Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nUsually, generated files are not part of the tracked content in\na project.  However, translators may lack the tools to generate\ngit-gui.pot.  Besides, it is possible that a contributor does\nnot even check out the repository, but gets this file via gitweb.\n\nPointed out by Junio.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n po/git-gui.pot | 1264 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 1264 insertions(+), 0 deletions(-)\n create mode 100644 po/git-gui.pot\n\ndiff --git a/po/git-gui.pot b/po/git-gui.pot\nnew file mode 100644\nindex 0000000..991efea\n--- /dev/null\n+++ b/po/git-gui.pot\n@@ -0,0 +1,1264 @@\n+# SOME DESCRIPTIVE TITLE.\n+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER\n+# This file is distributed under the same license as the PACKAGE package.\n+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.\n+#\n+#, fuzzy\n+msgid \"\"\n+msgstr \"\"\n+\"Project-Id-Version: PACKAGE VERSION\\n\"\n+\"Report-Msgid-Bugs-To: \\n\"\n+\"POT-Creation-Date: 2007-08-11 17:28+0200\\n\"\n+\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n+\"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n\"\n+\"Language-Team: LANGUAGE <LL@li.org>\\n\"\n+\"MIME-Version: 1.0\\n\"\n+\"Content-Type: text/plain; charset=CHARSET\\n\"\n+\"Content-Transfer-Encoding: 8bit\\n\"\n+\n+#: git-gui.sh:531\n+msgid \"Cannot find git in PATH.\"\n+msgstr \"\"\n+\n+#: git-gui.sh:550\n+msgid \"Cannot parse Git version string:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:567\n+#, tcl-format\n+msgid \"\"\n+\"Git version cannot be determined.\\n\"\n+\"\\n\"\n+\"%s claims it is version '%s'.\\n\"\n+\"\\n\"\n+\"%s requires at least Git 1.5.0 or later.\\n\"\n+\"\\n\"\n+\"Assume '%s' is version 1.5.0?\\n\"\n+msgstr \"\"\n+\n+#: git-gui.sh:689\n+msgid \"Cannot find the git directory:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:697\n+msgid \"Git directory not found:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:703\n+msgid \"Cannot use funny .git directory:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:708\n+msgid \"No working directory\"\n+msgstr \"\"\n+\n+#: git-gui.sh:854\n+msgid \"Refreshing file status...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:891\n+msgid \"Scanning for modified files ...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1057 lib/browser.tcl:247\n+msgid \"Ready.\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1322\n+msgid \"Unmodified\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1324\n+msgid \"Modified, not staged\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1325 git-gui.sh:1330\n+msgid \"Staged for commit\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1326 git-gui.sh:1331\n+msgid \"Portions staged for commit\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1327 git-gui.sh:1332\n+msgid \"Staged for commit, missing\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1329\n+msgid \"Untracked, not staged\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1334\n+msgid \"Missing\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1335\n+msgid \"Staged for removal\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1336\n+msgid \"Staged for removal, still present\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341\n+msgid \"Requires merge resolution\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1383\n+msgid \"Starting gitk... please wait...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1392\n+#, tcl-format\n+msgid \"\"\n+\"Unable to start gitk:\\n\"\n+\"\\n\"\n+\"%s does not exist\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1609\n+#, tcl-format\n+msgid \"Invalid font specified in gui.%s:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1634\n+msgid \"Main Font\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1635\n+msgid \"Diff/Console Font\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1649\n+msgid \"Repository\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1650\n+msgid \"Edit\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1652\n+msgid \"Branch\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152\n+msgid \"Commit\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168\n+msgid \"Merge\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1659\n+msgid \"Fetch\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172\n+msgid \"Push\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1669\n+msgid \"Browse Current Branch's Files\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1673\n+msgid \"Browse Branch Files...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1678\n+msgid \"Visualize Current Branch's History\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1682\n+msgid \"Visualize All Branch History\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1689\n+#, tcl-format\n+msgid \"Browse %s's Files\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1691\n+#, tcl-format\n+msgid \"Visualize %s's History\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67\n+msgid \"Database Statistics\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1699 lib/database.tcl:34\n+msgid \"Compress Database\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1702\n+msgid \"Verify Database\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9\n+#: lib/shortcut.tcl:45 lib/shortcut.tcl:84\n+msgid \"Create Desktop Icon\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1722\n+msgid \"Quit\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1729\n+msgid \"Undo\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1732\n+msgid \"Redo\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1736 git-gui.sh:2222\n+msgid \"Cut\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368\n+#: lib/console.tcl:69\n+msgid \"Copy\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1742 git-gui.sh:2228\n+msgid \"Paste\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26\n+#: lib/remote_branch_delete.tcl:38\n+msgid \"Delete\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71\n+msgid \"Select All\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1758\n+msgid \"Create...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1764\n+msgid \"Checkout...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1770\n+msgid \"Rename...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1775 git-gui.sh:1873\n+msgid \"Delete...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1780\n+msgid \"Reset...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1792 git-gui.sh:2169\n+msgid \"New Commit\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1800 git-gui.sh:2176\n+msgid \"Amend Last Commit\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99\n+msgid \"Rescan\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1815\n+msgid \"Stage To Commit\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1820\n+msgid \"Stage Changed Files To Commit\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1826\n+msgid \"Unstage From Commit\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1831 lib/index.tcl:376\n+msgid \"Revert Changes\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246\n+msgid \"Sign Off\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1853\n+msgid \"Local Merge...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1858\n+msgid \"Abort Merge...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1870\n+msgid \"Push...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1880\n+msgid \"Apple\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65\n+#, tcl-format\n+msgid \"About %s\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414\n+msgid \"Options...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1897\n+msgid \"Help\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1938\n+msgid \"Online Documentation\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2054\n+msgid \"Current Branch:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2075\n+msgid \"Staged Changes (Will Be Committed)\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2095\n+msgid \"Unstaged Changes (Will Not Be Committed)\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2142\n+msgid \"Stage Changed\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2188\n+msgid \"Initial Commit Message:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2189\n+msgid \"Amended Commit Message:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2190\n+msgid \"Amended Initial Commit Message:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2191\n+msgid \"Amended Merge Commit Message:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2192\n+msgid \"Merge Commit Message:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2193\n+msgid \"Commit Message:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73\n+msgid \"Copy All\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2262 lib/blame.tcl:104\n+msgid \"File:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2364\n+msgid \"Refresh\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2385\n+msgid \"Apply/Reverse Hunk\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2391\n+msgid \"Decrease Font Size\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2395\n+msgid \"Increase Font Size\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2400\n+msgid \"Show Less Context\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2407\n+msgid \"Show More Context\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2422\n+msgid \"Unstage Hunk From Commit\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2426 git-gui.sh:2430\n+msgid \"Stage Hunk For Commit\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2440\n+msgid \"Initializing...\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:77\n+msgid \"File Viewer\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:81\n+msgid \"Commit:\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:249\n+msgid \"Copy Commit\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:369\n+#, tcl-format\n+msgid \"Reading %s...\"\n+msgstr \"\"\n+\n+#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19\n+msgid \"Checkout Branch\"\n+msgstr \"\"\n+\n+#: lib/branch_checkout.tcl:23\n+msgid \"Checkout\"\n+msgstr \"\"\n+\n+#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35\n+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:283\n+#: lib/checkout_op.tcl:522 lib/merge.tcl:172 lib/option.tcl:172\n+#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92\n+msgid \"Cancel\"\n+msgstr \"\"\n+\n+#: lib/branch_checkout.tcl:32 lib/browser.tcl:288\n+msgid \"Revision\"\n+msgstr \"\"\n+\n+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159\n+#: lib/option.tcl:274\n+msgid \"Options\"\n+msgstr \"\"\n+\n+#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92\n+msgid \"Fetch Tracking Branch\"\n+msgstr \"\"\n+\n+#: lib/branch_checkout.tcl:44\n+msgid \"Detach From Local Branch\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:22\n+msgid \"Create Branch\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:27\n+msgid \"Create New Branch\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:31\n+msgid \"Create\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:40\n+msgid \"Branch Name\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:43\n+msgid \"Name:\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:58\n+msgid \"Match Tracking Branch Name\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:66\n+msgid \"Starting Revision\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:72\n+msgid \"Update Existing Branch:\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:75\n+msgid \"No\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:80\n+msgid \"Fast Forward Only\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514\n+msgid \"Reset\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:97\n+msgid \"Checkout After Creation\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:131\n+msgid \"Please select a tracking branch.\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:140\n+#, tcl-format\n+msgid \"Tracking branch %s is not a branch in the remote repository.\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86\n+msgid \"Please supply a branch name.\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106\n+#, tcl-format\n+msgid \"'%s' is not an acceptable branch name.\"\n+msgstr \"\"\n+\n+#: lib/branch_delete.tcl:15\n+msgid \"Delete Branch\"\n+msgstr \"\"\n+\n+#: lib/branch_delete.tcl:20\n+msgid \"Delete Local Branch\"\n+msgstr \"\"\n+\n+#: lib/branch_delete.tcl:37\n+msgid \"Local Branches\"\n+msgstr \"\"\n+\n+#: lib/branch_delete.tcl:52\n+msgid \"Delete Only If Merged Into\"\n+msgstr \"\"\n+\n+#: lib/branch_delete.tcl:54\n+msgid \"Always (Do not perform merge test.)\"\n+msgstr \"\"\n+\n+#: lib/branch_delete.tcl:103\n+#, tcl-format\n+msgid \"The following branches are not completely merged into %s:\"\n+msgstr \"\"\n+\n+#: lib/branch_delete.tcl:115\n+msgid \"\"\n+\"Recovering deleted branches is difficult. \\n\"\n+\"\\n\"\n+\" Delete the selected branches?\"\n+msgstr \"\"\n+\n+#: lib/branch_delete.tcl:141\n+#, tcl-format\n+msgid \"\"\n+\"Failed to delete branches:\\n\"\n+\"%s\"\n+msgstr \"\"\n+\n+#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22\n+msgid \"Rename Branch\"\n+msgstr \"\"\n+\n+#: lib/branch_rename.tcl:26\n+msgid \"Rename\"\n+msgstr \"\"\n+\n+#: lib/branch_rename.tcl:36\n+msgid \"Branch:\"\n+msgstr \"\"\n+\n+#: lib/branch_rename.tcl:39\n+msgid \"New Name:\"\n+msgstr \"\"\n+\n+#: lib/branch_rename.tcl:75\n+msgid \"Please select a branch to rename.\"\n+msgstr \"\"\n+\n+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179\n+#, tcl-format\n+msgid \"Branch '%s' already exists.\"\n+msgstr \"\"\n+\n+#: lib/branch_rename.tcl:117\n+#, tcl-format\n+msgid \"Failed to rename '%s'.\"\n+msgstr \"\"\n+\n+#: lib/browser.tcl:17\n+msgid \"Starting...\"\n+msgstr \"\"\n+\n+#: lib/browser.tcl:26\n+msgid \"File Browser\"\n+msgstr \"\"\n+\n+#: lib/browser.tcl:127 lib/browser.tcl:144\n+#, tcl-format\n+msgid \"Loading %s...\"\n+msgstr \"\"\n+\n+#: lib/browser.tcl:188\n+msgid \"[Up To Parent]\"\n+msgstr \"\"\n+\n+#: lib/browser.tcl:268 lib/browser.tcl:274\n+msgid \"Browse Branch Files\"\n+msgstr \"\"\n+\n+#: lib/browser.tcl:279\n+msgid \"Browse\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:79\n+#, tcl-format\n+msgid \"Fetching %s from %s\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31\n+msgid \"Close\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:169\n+#, tcl-format\n+msgid \"Branch '%s' does not exist.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:206\n+#, tcl-format\n+msgid \"\"\n+\"Branch '%s' already exists.\\n\"\n+\"\\n\"\n+\"It cannot fast-forward to %s.\\n\"\n+\"A merge is required.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:220\n+#, tcl-format\n+msgid \"Merge strategy '%s' not supported.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:239\n+#, tcl-format\n+msgid \"Failed to update '%s'.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:251\n+msgid \"Staging area (index) is already locked.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:266\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before the current branch can be changed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:353\n+#, tcl-format\n+msgid \"Aborted checkout of '%s' (file level merging is required).\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:354\n+msgid \"File level merge required.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:358\n+#, tcl-format\n+msgid \"Staying on branch '%s'.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:429\n+msgid \"\"\n+\"You are no longer on a local branch.\\n\"\n+\"\\n\"\n+\"If you wanted to be on a branch, create one now starting from 'This Detached \"\n+\"Checkout'.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:478\n+#, tcl-format\n+msgid \"Resetting '%s' to '%s' will lose the following commits:\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:500\n+msgid \"Recovering lost commits may not be easy.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:505\n+#, tcl-format\n+msgid \"Reset '%s'?\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:510 lib/merge.tcl:164\n+msgid \"Visualize\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:578\n+#, tcl-format\n+msgid \"\"\n+\"Failed to set current branch.\\n\"\n+\"\\n\"\n+\"This working directory is only partially switched.  We successfully updated \"\n+\"your files, but failed to update an internal Git file.\\n\"\n+\"\\n\"\n+\"This should not have occurred.  %s will now close and give up.\"\n+msgstr \"\"\n+\n+#: lib/choose_rev.tcl:53\n+msgid \"This Detached Checkout\"\n+msgstr \"\"\n+\n+#: lib/choose_rev.tcl:60\n+msgid \"Revision Expression:\"\n+msgstr \"\"\n+\n+#: lib/choose_rev.tcl:74\n+msgid \"Local Branch\"\n+msgstr \"\"\n+\n+#: lib/choose_rev.tcl:79\n+msgid \"Tracking Branch\"\n+msgstr \"\"\n+\n+#: lib/choose_rev.tcl:84\n+msgid \"Tag\"\n+msgstr \"\"\n+\n+#: lib/choose_rev.tcl:317\n+#, tcl-format\n+msgid \"Invalid revision: %s\"\n+msgstr \"\"\n+\n+#: lib/choose_rev.tcl:338\n+msgid \"No revision selected.\"\n+msgstr \"\"\n+\n+#: lib/choose_rev.tcl:346\n+msgid \"Revision expression is empty.\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:9\n+msgid \"\"\n+\"There is nothing to amend.\\n\"\n+\"\\n\"\n+\"You are about to create the initial commit.  There is no commit before this \"\n+\"to amend.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:18\n+msgid \"\"\n+\"Cannot amend while merging.\\n\"\n+\"\\n\"\n+\"You are currently in the middle of a merge that has not been fully \"\n+\"completed.  You cannot amend the prior commit unless you first abort the \"\n+\"current merge activity.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:49\n+msgid \"Error loading commit data for amend:\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:76\n+msgid \"Unable to obtain your identity:\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:81\n+msgid \"Invalid GIT_COMMITTER_IDENT:\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:133\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before another commit can be created.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:154\n+#, tcl-format\n+msgid \"\"\n+\"Unmerged files cannot be committed.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.  You must resolve them and stage the file \"\n+\"before committing.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:162\n+#, tcl-format\n+msgid \"\"\n+\"Unknown file state %s detected.\\n\"\n+\"\\n\"\n+\"File %s cannot be committed by this program.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:170\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"You must stage at least 1 file before you can commit.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:183\n+msgid \"\"\n+\"Please supply a commit message.\\n\"\n+\"\\n\"\n+\"A good commit message has the following format:\\n\"\n+\"\\n\"\n+\"- First line: Describe in one sentance what you did.\\n\"\n+\"- Second line: Blank\\n\"\n+\"- Remaining lines: Describe why this change is good.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:257\n+msgid \"write-tree failed:\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:279\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"No files were modified by this commit and it was not a merge commit.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:286\n+msgid \"No changes to commit.\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:317\n+msgid \"commit-tree failed:\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:339\n+msgid \"update-ref failed:\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:430\n+#, tcl-format\n+msgid \"Created commit %s: %s\"\n+msgstr \"\"\n+\n+#: lib/console.tcl:55\n+msgid \"Working... please wait...\"\n+msgstr \"\"\n+\n+#: lib/console.tcl:184\n+msgid \"Success\"\n+msgstr \"\"\n+\n+#: lib/console.tcl:194\n+msgid \"Error: Command Failed\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:43\n+msgid \"Number of loose objects\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:44\n+msgid \"Disk space used by loose objects\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:45\n+msgid \"Number of packed objects\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:46\n+msgid \"Number of packs\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:47\n+msgid \"Disk space used by packed objects\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:48\n+msgid \"Packed objects waiting for pruning\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:49\n+msgid \"Garbage files\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:72\n+msgid \"Compressing the object database\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:83\n+msgid \"Verifying the object database with fsck-objects\"\n+msgstr \"\"\n+\n+#: lib/diff.tcl:42\n+#, tcl-format\n+msgid \"\"\n+\"No differences detected.\\n\"\n+\"\\n\"\n+\"%s has no changes.\\n\"\n+\"\\n\"\n+\"The modification date of this file was updated by another application, but \"\n+\"the content within the file was not changed.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started to find other files which may have \"\n+\"the same state.\"\n+msgstr \"\"\n+\n+#: lib/diff.tcl:97\n+msgid \"Error loading file:\"\n+msgstr \"\"\n+\n+#: lib/diff.tcl:162\n+msgid \"Error loading diff:\"\n+msgstr \"\"\n+\n+#: lib/diff.tcl:278\n+msgid \"Failed to unstage selected hunk.\"\n+msgstr \"\"\n+\n+#: lib/diff.tcl:285\n+msgid \"Failed to stage selected hunk.\"\n+msgstr \"\"\n+\n+#: lib/error.tcl:12 lib/error.tcl:102\n+msgid \"error\"\n+msgstr \"\"\n+\n+#: lib/error.tcl:28\n+msgid \"warning\"\n+msgstr \"\"\n+\n+#: lib/error.tcl:81\n+msgid \"You must correct the above errors before committing.\"\n+msgstr \"\"\n+\n+#: lib/index.tcl:364\n+#, tcl-format\n+msgid \"Revert changes in file %s?\"\n+msgstr \"\"\n+\n+#: lib/index.tcl:366\n+#, tcl-format\n+msgid \"Revert changes in these %i files?\"\n+msgstr \"\"\n+\n+#: lib/index.tcl:372\n+msgid \"Any unstaged changes will be permanently lost by the revert.\"\n+msgstr \"\"\n+\n+#: lib/index.tcl:375\n+msgid \"Do Nothing\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:13\n+msgid \"\"\n+\"Cannot merge while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit before starting any type of merge.\\n\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:27\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before a merge can be performed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:44\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a conflicted merge.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.\\n\"\n+\"\\n\"\n+\"You must resolve them, stage the file, and commit to complete the current \"\n+\"merge.  Only then can you begin another merge.\\n\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:54\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a change.\\n\"\n+\"\\n\"\n+\"File %s is modified.\\n\"\n+\"\\n\"\n+\"You should complete the current commit before starting a merge.  Doing so \"\n+\"will help you abort a failed merge, should the need arise.\\n\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:106\n+#, tcl-format\n+msgid \"%s of %s\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:119\n+#, tcl-format\n+msgid \"Merging %s and %s\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:131\n+msgid \"Merge completed successfully.\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:133\n+msgid \"Merge failed.  Conflict resolution is required.\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:158\n+#, tcl-format\n+msgid \"Merge Into %s\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:177\n+msgid \"Revision To Merge\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:212\n+msgid \"\"\n+\"Cannot abort while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit.\\n\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:222\n+msgid \"\"\n+\"Abort merge?\\n\"\n+\"\\n\"\n+\"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\\n\"\n+\"\\n\"\n+\"Continue with aborting the current merge?\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:228\n+msgid \"\"\n+\"Reset changes?\\n\"\n+\"\\n\"\n+\"Resetting the changes will cause *ALL* uncommitted changes to be lost.\\n\"\n+\"\\n\"\n+\"Continue with resetting the current changes?\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:239\n+msgid \"Aborting\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:266\n+msgid \"Abort failed.\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:268\n+msgid \"Abort completed.  Ready.\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:77\n+msgid \"git-gui - a graphical user interface for Git.\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:164\n+msgid \"Restore Defaults\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:168\n+msgid \"Save\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:178\n+#, tcl-format\n+msgid \"%s Repository\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:179\n+msgid \"Global (All Repositories)\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:185\n+msgid \"User Name\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:186\n+msgid \"Email Address\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:188\n+msgid \"Summarize Merge Commits\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:189\n+msgid \"Merge Verbosity\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:190\n+msgid \"Show Diffstat After Merge\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:192\n+msgid \"Trust File Modification Timestamps\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:193\n+msgid \"Prune Tracking Branches During Fetch\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:194\n+msgid \"Match Tracking Branches\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:195\n+msgid \"Number of Diff Context Lines\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:196\n+msgid \"New Branch Name Template\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:305\n+msgid \"Failed to completely save options:\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34\n+msgid \"Delete Remote Branch\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:47\n+msgid \"From Repository\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118\n+msgid \"Remote:\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133\n+msgid \"Arbitrary URL:\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:84\n+msgid \"Branches\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:109\n+msgid \"Delete Only If\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:111\n+msgid \"Merged Into:\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:119\n+msgid \"Always (Do not perform merge checks)\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:152\n+msgid \"A branch is required for 'Merged Into'.\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:189\n+#, tcl-format\n+msgid \"\"\n+\"One or more of the merge tests failed because you have not fetched the \"\n+\"necessary commits.  Try fetching from %s first.\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:207\n+msgid \"Please select one or more branches to delete.\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:216\n+msgid \"\"\n+\"Recovering deleted branches is difficult.\\n\"\n+\"\\n\"\n+\"Delete the selected branches?\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:226\n+#, tcl-format\n+msgid \"Deleting branches from %s\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:286\n+msgid \"No repository selected.\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:291\n+#, tcl-format\n+msgid \"Scanning %s...\"\n+msgstr \"\"\n+\n+#: lib/remote.tcl:162\n+#, tcl-format\n+msgid \"Fetch from %s...\"\n+msgstr \"\"\n+\n+#: lib/remote.tcl:172\n+#, tcl-format\n+msgid \"Prune from %s...\"\n+msgstr \"\"\n+\n+#: lib/remote.tcl:206\n+#, tcl-format\n+msgid \"Push to %s...\"\n+msgstr \"\"\n+\n+#: lib/shortcut.tcl:26 lib/shortcut.tcl:74\n+msgid \"Cannot write script:\"\n+msgstr \"\"\n+\n+#: lib/shortcut.tcl:149\n+msgid \"Cannot write icon:\"\n+msgstr \"\"\n+\n+#: lib/status_bar.tcl:58\n+#, tcl-format\n+msgid \"%s ... %i of %i %s (%2i%%)\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:7\n+#, tcl-format\n+msgid \"Fetching new changes from %s\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:19\n+#, tcl-format\n+msgid \"Pruning tracking branches deleted from %s\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:26\n+#, tcl-format\n+msgid \"Pushing changes to %s\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:68\n+#, tcl-format\n+msgid \"Pushing %s %s to %s\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:84\n+msgid \"Push Branches\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:98\n+msgid \"Source Branches\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:115\n+msgid \"Destination Repository\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:153\n+msgid \"Transfer Options\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:155\n+msgid \"Use thin pack (for slow network connections)\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:159\n+msgid \"Include tags\"\n+msgstr \"\"\n-- \n1.5.3.2.g46909\n"},{"id":"52223","messageId":"Pine.LNX.4.64.0709021731370.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 05/15] Ignore po/*.msg","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:31:48Z","receivedAt":"2007-09-02T16:31:48Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n po/.gitignore |    2 ++\n 1 files changed, 2 insertions(+), 0 deletions(-)\n create mode 100644 po/.gitignore\n\ndiff --git a/po/.gitignore b/po/.gitignore\nnew file mode 100644\nindex 0000000..a89cf44\n--- /dev/null\n+++ b/po/.gitignore\n@@ -0,0 +1,2 @@\n+*.msg\n+*~\n-- \n1.5.3.2.g46909\n"},{"id":"52224","messageId":"Pine.LNX.4.64.0709021731560.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 06/15] Add glossary that can be converted into a po file for each language.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:32:04Z","receivedAt":"2007-09-02T16:32:04Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nFrom: Christian Stimming <stimming@tuhh.de>\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n po/glossary/Makefile             |    9 +++++++\n po/glossary/git-gui-glossary.txt |   34 ++++++++++++++++++++++++++\n po/glossary/txt-to-pot.sh        |   48 ++++++++++++++++++++++++++++++++++++++\n 3 files changed, 91 insertions(+), 0 deletions(-)\n create mode 100644 po/glossary/Makefile\n create mode 100644 po/glossary/git-gui-glossary.txt\n create mode 100755 po/glossary/txt-to-pot.sh\n\ndiff --git a/po/glossary/Makefile b/po/glossary/Makefile\nnew file mode 100644\nindex 0000000..749aa2e\n--- /dev/null\n+++ b/po/glossary/Makefile\n@@ -0,0 +1,9 @@\n+PO_TEMPLATE = git-gui-glossary.pot\n+\n+ALL_POFILES = $(wildcard *.po)\n+\n+$(PO_TEMPLATE): $(subst .pot,.txt,$(PO_TEMPLATE))\n+\t./txt-to-pot.sh $< > $@\n+\n+update-po:: git-gui-glossary.pot\n+\t$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )\ndiff --git a/po/glossary/git-gui-glossary.txt b/po/glossary/git-gui-glossary.txt\nnew file mode 100644\nindex 0000000..bb55aa8\n--- /dev/null\n+++ b/po/glossary/git-gui-glossary.txt\n@@ -0,0 +1,34 @@\n+\"English Term (Dear translator: This file will never be visible to the user!)\"\t\"English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)\"\n+\"amend\"\t\"\"\n+\"annotate\"\t\"\"\n+\"branch [noun]\"\t\"A 'branch' is an active line of development.\"\n+\"branch [verb]\"\t\"\"\n+\"checkout [noun]\"\t\"\"\n+\"checkout [verb]\"\t\"The action of updating the working tree to a revision which was stored in the object database.\"\n+\"commit [noun]\"\t\"A single point in the git history.\"\n+\"commit [verb]\"\t\"The action of storing a new snapshot of the project's state in the git history.\"\n+\"diff [noun]\"\t\"\"\n+\"diff [verb]\"\t\"\"\n+\"fast forward merge\"\t\"A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have.\"\n+\"fetch\"\t\"Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too.\"\n+\"index (in git-gui: staging area)\"\t\"A collection of files. The index is a stored version of your working tree.\"\n+\"merge [noun]\"\t\"A successful merge results in the creation of a new commit representing the result of the merge.\"\n+\"merge [verb]\"\t\"To bring the contents of another branch into the current branch.\"\n+\"message\"\t\"\"\n+\"pull\"\t\"Pulling a branch means to fetch it and merge it.\"\n+\"push\"\t\"Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)\"\n+\"redo\"\t\"\"\n+\"repository\"\t\"A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)\"\n+\"reset\"\t\"\"\n+\"revert\"\t\"\"\n+\"revision\"\t\"A particular state of files and directories which was stored in the object database.\"\n+\"sign off\"\t\"\"\n+\"staging area\"\t\"\"\n+\"status\"\t\"\"\n+\"tag [noun]\"\t\"A ref pointing to a tag or commit object\"\n+\"tag [verb]\"\t\"\"\n+\"tracking branch\"\t\"A regular git branch that is used to follow changes from another repository.\"\n+\"undo\"\t\"\"\n+\"update\"\t\"\"\n+\"verify\"\t\"\"\n+\"working copy, working tree\"\t\"The tree of actual checked out files.\"\ndiff --git a/po/glossary/txt-to-pot.sh b/po/glossary/txt-to-pot.sh\nnew file mode 100755\nindex 0000000..49bf7c5\n--- /dev/null\n+++ b/po/glossary/txt-to-pot.sh\n@@ -0,0 +1,48 @@\n+#!/bin/sh\n+# This is a very, _very_, simple script to convert a tab-separated\n+# .txt file into a .pot/.po.\n+# Its not clever but it took me 2 minutes to write :)\n+# Michael Twomey <michael.twomey@ireland.sun.com>\n+# 23 March 2001\n+# with slight GnuCash modifications by Christian Stimming <stimming@tuhh.de>\n+# 19 Aug 2001, 23 Jul 2007\n+\n+#check args\n+if [ $# -eq 0 ]\n+then\n+\tcat <<!\n+Usage: `basename $0` git-gui-glossary.txt > git-gui-glossary.pot\n+!\n+\texit 1;\n+fi\n+\n+GLOSSARY_CSV=\"$1\";\n+\n+if [ ! -f \"$GLOSSARY_CSV\" ]\n+then\n+\techo \"Can't find $GLOSSARY_CSV.\";\n+\texit 1;\n+fi\n+\n+cat <<!\n+# SOME DESCRIPTIVE TITLE.\n+# Copyright (C) YEAR Free Software Foundation, Inc.\n+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.\n+#\n+#, fuzzy\n+msgid \"\"\n+msgstr \"\"\n+\"Project-Id-Version: PACKAGE VERSION\\n\"\n+\"POT-Creation-Date: `date +'%Y-%m-%d %H:%M%z'`\\n\"\n+\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n+\"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n\"\n+\"Language-Team: LANGUAGE <LL@li.org>\\n\"\n+\"MIME-Version: 1.0\\n\"\n+\"Content-Type: text/plain; charset=CHARSET\\n\"\n+\"Content-Transfer-Encoding: ENCODING\\n\"\n+\n+!\n+\n+#Yes this is the most simple awk script you've ever seen :)\n+awk -F'\\t' '{if ($2 != \"\") print \"#. \"$2; print \"msgid \"$1; print \"msgstr \\\"\\\"\\n\"}' \\\n+$GLOSSARY_CSV\n-- \n1.5.3.2.g46909\n"},{"id":"52225","messageId":"Pine.LNX.4.64.0709021732380.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 07/15] Add glossary translation template into git.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:32:46Z","receivedAt":"2007-09-02T16:32:46Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nFrom: Christian Stimming <stimming@tuhh.de>\n\nThis way, it should be easier for new translators to actually find out\nabout the glossary.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n po/glossary/git-gui-glossary.pot |  152 ++++++++++++++++++++++++++++++++++++++\n 1 files changed, 152 insertions(+), 0 deletions(-)\n create mode 100644 po/glossary/git-gui-glossary.pot\n\ndiff --git a/po/glossary/git-gui-glossary.pot b/po/glossary/git-gui-glossary.pot\nnew file mode 100644\nindex 0000000..c955b46\n--- /dev/null\n+++ b/po/glossary/git-gui-glossary.pot\n@@ -0,0 +1,152 @@\n+# SOME DESCRIPTIVE TITLE.\n+# Copyright (C) YEAR Free Software Foundation, Inc.\n+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.\n+#\n+#, fuzzy\n+msgid \"\"\n+msgstr \"\"\n+\"Project-Id-Version: PACKAGE VERSION\\n\"\n+\"POT-Creation-Date: 2007-07-27 19:21+0200\\n\"\n+\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n+\"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n\"\n+\"Language-Team: LANGUAGE <LL@li.org>\\n\"\n+\"MIME-Version: 1.0\\n\"\n+\"Content-Type: text/plain; charset=UTF-8\\n\"\n+\"Content-Transfer-Encoding: ENCODING\\n\"\n+\n+#. \"English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)\"\n+msgid \"English Term (Dear translator: This file will never be visible to the user!)\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"amend\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"annotate\"\n+msgstr \"\"\n+\n+#. \"A 'branch' is an active line of development.\"\n+msgid \"branch [noun]\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"branch [verb]\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"checkout [noun]\"\n+msgstr \"\"\n+\n+#. \"The action of updating the working tree to a revision which was stored in the object database.\"\n+msgid \"checkout [verb]\"\n+msgstr \"\"\n+\n+#. \"A single point in the git history.\"\n+msgid \"commit [noun]\"\n+msgstr \"\"\n+\n+#. \"The action of storing a new snapshot of the project's state in the git history.\"\n+msgid \"commit [verb]\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"diff [noun]\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"diff [verb]\"\n+msgstr \"\"\n+\n+#. \"A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have.\"\n+msgid \"fast forward merge\"\n+msgstr \"\"\n+\n+#. \"Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too.\"\n+msgid \"fetch\"\n+msgstr \"\"\n+\n+#. \"A collection of files. The index is a stored version of your working tree.\"\n+msgid \"index (in git-gui: staging area)\"\n+msgstr \"\"\n+\n+#. \"A successful merge results in the creation of a new commit representing the result of the merge.\"\n+msgid \"merge [noun]\"\n+msgstr \"\"\n+\n+#. \"To bring the contents of another branch into the current branch.\"\n+msgid \"merge [verb]\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"message\"\n+msgstr \"\"\n+\n+#. \"Pulling a branch means to fetch it and merge it.\"\n+msgid \"pull\"\n+msgstr \"\"\n+\n+#. \"Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)\"\n+msgid \"push\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"redo\"\n+msgstr \"\"\n+\n+#. \"A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)\"\n+msgid \"repository\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"reset\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"revert\"\n+msgstr \"\"\n+\n+#. \"A particular state of files and directories which was stored in the object database.\"\n+msgid \"revision\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"sign off\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"staging area\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"status\"\n+msgstr \"\"\n+\n+#. \"A ref pointing to a tag or commit object\"\n+msgid \"tag [noun]\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"tag [verb]\"\n+msgstr \"\"\n+\n+#. \"A regular git branch that is used to follow changes from another repository.\"\n+msgid \"tracking branch\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"undo\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"update\"\n+msgstr \"\"\n+\n+#. \"\"\n+msgid \"verify\"\n+msgstr \"\"\n+\n+#. \"The tree of actual checked out files.\"\n+msgid \"working copy, working tree\"\n+msgstr \"\"\n+\n-- \n1.5.3.2.g46909\n"},{"id":"52227","messageId":"Pine.LNX.4.64.0709021733460.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 08/15] German translation for git-gui","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:34:03Z","receivedAt":"2007-09-02T16:34:03Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nFrom: Christian Stimming <stimming@tuhh.de>\n\nSigned-off-by: Christian Stimming <stimming@tuhh.de>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n po/de.po | 1398 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 1398 insertions(+), 0 deletions(-)\n create mode 100644 po/de.po\n\ndiff --git a/po/de.po b/po/de.po\nnew file mode 100644\nindex 0000000..7d57dd1\n--- /dev/null\n+++ b/po/de.po\n@@ -0,0 +1,1398 @@\n+# Translation of git-gui to German.\n+# Copyright (C) 2007 Shawn Pearce, et al.\n+# This file is distributed under the same license as the git package.\n+# Christian Stimming <stimming@tuhh.de>, 2007\n+#\n+msgid \"\"\n+msgstr \"\"\n+\"Project-Id-Version: git-gui\\n\"\n+\"Report-Msgid-Bugs-To: \\n\"\n+\"POT-Creation-Date: 2007-08-11 17:28+0200\\n\"\n+\"PO-Revision-Date: 2007-08-11 17:37+0200\\n\"\n+\"Last-Translator: Christian Stimming <stimming@tuhh.de>\\n\"\n+\"Language-Team: German\\n\"\n+\"MIME-Version: 1.0\\n\"\n+\"Content-Type: text/plain; charset=UTF-8\\n\"\n+\"Content-Transfer-Encoding: 8bit\\n\"\n+\n+#: git-gui.sh:531\n+msgid \"Cannot find git in PATH.\"\n+msgstr \"Git kann im PATH nicht gefunden werden.\"\n+\n+#: git-gui.sh:550\n+msgid \"Cannot parse Git version string:\"\n+msgstr \"Git Versionsangabe kann nicht erkannt werden:\"\n+\n+#: git-gui.sh:567\n+#, tcl-format\n+msgid \"\"\n+\"Git version cannot be determined.\\n\"\n+\"\\n\"\n+\"%s claims it is version '%s'.\\n\"\n+\"\\n\"\n+\"%s requires at least Git 1.5.0 or later.\\n\"\n+\"\\n\"\n+\"Assume '%s' is version 1.5.0?\\n\"\n+msgstr \"\"\n+\"Die Version von Git kann nicht bestimmt werden.\\n\"\n+\"\\n\"\n+\"»%s« behauptet, es sei Version »%s«.\\n\"\n+\"\\n\"\n+\"%s benötigt mindestens Git 1.5.0 oder höher.\\n\"\n+\"\\n\"\n+\"Soll angenommen werden, »%s« sei Version 1.5.0?\\n\"\n+\n+#: git-gui.sh:689\n+msgid \"Cannot find the git directory:\"\n+msgstr \"Git-Verzeichnis kann nicht gefunden werden:\"\n+\n+#: git-gui.sh:697\n+msgid \"Git directory not found:\"\n+msgstr \"Git-Verzeichnis nicht gefunden:\"\n+\n+#: git-gui.sh:703\n+msgid \"Cannot use funny .git directory:\"\n+msgstr \"Unerwartete Struktur des .git Verzeichnis:\"\n+\n+#: git-gui.sh:708\n+msgid \"No working directory\"\n+msgstr \"Kein Arbeitsverzeichnis\"\n+\n+#: git-gui.sh:854\n+msgid \"Refreshing file status...\"\n+msgstr \"Dateistatus aktualisieren...\"\n+\n+#: git-gui.sh:891\n+msgid \"Scanning for modified files ...\"\n+msgstr \"Nach geänderten Dateien suchen...\"\n+\n+#: git-gui.sh:1057 lib/browser.tcl:247\n+msgid \"Ready.\"\n+msgstr \"Bereit.\"\n+\n+#: git-gui.sh:1322\n+msgid \"Unmodified\"\n+msgstr \"Unverändert\"\n+\n+#: git-gui.sh:1324\n+msgid \"Modified, not staged\"\n+msgstr \"Verändert, nicht bereitgestellt\"\n+\n+#: git-gui.sh:1325 git-gui.sh:1330\n+msgid \"Staged for commit\"\n+msgstr \"Bereitgestellt zur Übertragung\"\n+\n+#: git-gui.sh:1326 git-gui.sh:1331\n+msgid \"Portions staged for commit\"\n+msgstr \"Teilweise bereitgestellt zur Übertragung\"\n+\n+#: git-gui.sh:1327 git-gui.sh:1332\n+msgid \"Staged for commit, missing\"\n+msgstr \"Bereitgestellt zur Übertragung, fehlend\"\n+\n+#: git-gui.sh:1329\n+msgid \"Untracked, not staged\"\n+msgstr \"Nicht unter Versionskontrolle, nicht bereitgestellt\"\n+\n+#: git-gui.sh:1334\n+msgid \"Missing\"\n+msgstr \"Fehlend\"\n+\n+#: git-gui.sh:1335\n+msgid \"Staged for removal\"\n+msgstr \"Bereitgestellt zum Löschen\"\n+\n+#: git-gui.sh:1336\n+msgid \"Staged for removal, still present\"\n+msgstr \"Bereitgestellt zum Löschen, trotzdem vorhanden\"\n+\n+#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341\n+msgid \"Requires merge resolution\"\n+msgstr \"Konfliktauflösung nötig\"\n+\n+#: git-gui.sh:1383\n+msgid \"Starting gitk... please wait...\"\n+msgstr \"Gitk wird gestartet... bitte warten.\"\n+\n+#: git-gui.sh:1392\n+#, tcl-format\n+msgid \"\"\n+\"Unable to start gitk:\\n\"\n+\"\\n\"\n+\"%s does not exist\"\n+msgstr \"\"\n+\"Gitk kann nicht gestartet werden:\\n\"\n+\"\\n\"\n+\"%s existiert nicht\"\n+\n+#: git-gui.sh:1609\n+#, tcl-format\n+msgid \"Invalid font specified in gui.%s:\"\n+msgstr \"Ungültige Zeichensatz-Angabe in gui.%s:\"\n+\n+#: git-gui.sh:1634\n+msgid \"Main Font\"\n+msgstr \"Programmschriftart\"\n+\n+#: git-gui.sh:1635\n+msgid \"Diff/Console Font\"\n+msgstr \"Vergleich-Schriftart\"\n+\n+#: git-gui.sh:1649\n+msgid \"Repository\"\n+msgstr \"Projektarchiv\"\n+\n+#: git-gui.sh:1650\n+msgid \"Edit\"\n+msgstr \"Bearbeiten\"\n+\n+#: git-gui.sh:1652\n+msgid \"Branch\"\n+msgstr \"Zweig\"\n+\n+#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152\n+msgid \"Commit\"\n+msgstr \"Übertragen\"\n+\n+#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168\n+msgid \"Merge\"\n+msgstr \"Zusammenführen\"\n+\n+#: git-gui.sh:1659\n+msgid \"Fetch\"\n+msgstr \"Anfordern\"\n+\n+#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172\n+msgid \"Push\"\n+msgstr \"Ausliefern\"\n+\n+#: git-gui.sh:1669\n+msgid \"Browse Current Branch's Files\"\n+msgstr \"Aktuellen Zweig durchblättern\"\n+\n+#: git-gui.sh:1673\n+msgid \"Browse Branch Files...\"\n+msgstr \"Einen Zweig durchblättern...\"\n+\n+#: git-gui.sh:1678\n+msgid \"Visualize Current Branch's History\"\n+msgstr \"Aktuellen Zweig darstellen\"\n+\n+#: git-gui.sh:1682\n+msgid \"Visualize All Branch History\"\n+msgstr \"Alle Zweige darstellen\"\n+\n+#: git-gui.sh:1689\n+#, tcl-format\n+msgid \"Browse %s's Files\"\n+msgstr \"Zweig »%s« durchblättern\"\n+\n+#: git-gui.sh:1691\n+#, tcl-format\n+msgid \"Visualize %s's History\"\n+msgstr \"Historie von »%s« darstellen\"\n+\n+#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67\n+msgid \"Database Statistics\"\n+msgstr \"Datenbankstatistik\"\n+\n+#: git-gui.sh:1699 lib/database.tcl:34\n+msgid \"Compress Database\"\n+msgstr \"Datenbank komprimieren\"\n+\n+#: git-gui.sh:1702\n+msgid \"Verify Database\"\n+msgstr \"Datenbank überprüfen\"\n+\n+#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9\n+#: lib/shortcut.tcl:45 lib/shortcut.tcl:84\n+msgid \"Create Desktop Icon\"\n+msgstr \"Desktop-Icon erstellen\"\n+\n+#: git-gui.sh:1722\n+msgid \"Quit\"\n+msgstr \"Beenden\"\n+\n+#: git-gui.sh:1729\n+msgid \"Undo\"\n+msgstr \"Rückgängig\"\n+\n+#: git-gui.sh:1732\n+msgid \"Redo\"\n+msgstr \"Wiederholen\"\n+\n+#: git-gui.sh:1736 git-gui.sh:2222\n+msgid \"Cut\"\n+msgstr \"Ausschneiden\"\n+\n+#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368\n+#: lib/console.tcl:69\n+msgid \"Copy\"\n+msgstr \"Kopieren\"\n+\n+#: git-gui.sh:1742 git-gui.sh:2228\n+msgid \"Paste\"\n+msgstr \"Einfügen\"\n+\n+#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26\n+#: lib/remote_branch_delete.tcl:38\n+msgid \"Delete\"\n+msgstr \"Löschen\"\n+\n+#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71\n+msgid \"Select All\"\n+msgstr \"Alle auswählen\"\n+\n+#: git-gui.sh:1758\n+msgid \"Create...\"\n+msgstr \"Erstellen...\"\n+\n+#: git-gui.sh:1764\n+msgid \"Checkout...\"\n+msgstr \"Auschecken...\"\n+\n+#: git-gui.sh:1770\n+msgid \"Rename...\"\n+msgstr \"Umbenennen...\"\n+\n+#: git-gui.sh:1775 git-gui.sh:1873\n+msgid \"Delete...\"\n+msgstr \"Löschen...\"\n+\n+#: git-gui.sh:1780\n+msgid \"Reset...\"\n+msgstr \"Zurücksetzen...\"\n+\n+#: git-gui.sh:1792 git-gui.sh:2169\n+msgid \"New Commit\"\n+msgstr \"Neu übertragen\"\n+\n+#: git-gui.sh:1800 git-gui.sh:2176\n+msgid \"Amend Last Commit\"\n+msgstr \"Letzte Übertragung nachbessern\"\n+\n+#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99\n+msgid \"Rescan\"\n+msgstr \"Neu laden\"\n+\n+#: git-gui.sh:1815\n+msgid \"Stage To Commit\"\n+msgstr \"Zur Übertragung bereitstellen\"\n+\n+#: git-gui.sh:1820\n+msgid \"Stage Changed Files To Commit\"\n+msgstr \"Geänderte Dateien zur Übertragung bereitstellen\"\n+\n+#: git-gui.sh:1826\n+msgid \"Unstage From Commit\"\n+msgstr \"Aus der Bereitstellung herausnehmen\"\n+\n+#: git-gui.sh:1831 lib/index.tcl:376\n+msgid \"Revert Changes\"\n+msgstr \"Änderungen revidieren\"\n+\n+#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246\n+msgid \"Sign Off\"\n+msgstr \"Abzeichnen\"\n+\n+#: git-gui.sh:1853\n+msgid \"Local Merge...\"\n+msgstr \"Lokales Zusammenführen...\"\n+\n+#: git-gui.sh:1858\n+msgid \"Abort Merge...\"\n+msgstr \"Zusammenführen abbrechen...\"\n+\n+#: git-gui.sh:1870\n+msgid \"Push...\"\n+msgstr \"Ausliefern...\"\n+\n+#: git-gui.sh:1880\n+msgid \"Apple\"\n+msgstr \"Apple\"\n+\n+#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65\n+#, tcl-format\n+msgid \"About %s\"\n+msgstr \"Über %s\"\n+\n+#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414\n+msgid \"Options...\"\n+msgstr \"Optionen...\"\n+\n+#: git-gui.sh:1897\n+msgid \"Help\"\n+msgstr \"Hilfe\"\n+\n+#: git-gui.sh:1938\n+msgid \"Online Documentation\"\n+msgstr \"Online-Dokumentation\"\n+\n+#: git-gui.sh:2054\n+msgid \"Current Branch:\"\n+msgstr \"Aktueller Zweig:\"\n+\n+#: git-gui.sh:2075\n+msgid \"Staged Changes (Will Be Committed)\"\n+msgstr \"Bereitgestellte Änderungen (werden übertragen)\"\n+\n+#: git-gui.sh:2095\n+msgid \"Unstaged Changes (Will Not Be Committed)\"\n+msgstr \"Nicht bereitgestellte Änderungen (werden nicht übertragen)\"\n+\n+#: git-gui.sh:2142\n+msgid \"Stage Changed\"\n+msgstr \"Geänderte bereitstellen\"\n+\n+#: git-gui.sh:2188\n+msgid \"Initial Commit Message:\"\n+msgstr \"Erstmalige Übertragungsmeldung\"\n+\n+#: git-gui.sh:2189\n+msgid \"Amended Commit Message:\"\n+msgstr \"Übertragungsmeldung mit Nachbesserung:\"\n+\n+#: git-gui.sh:2190\n+msgid \"Amended Initial Commit Message:\"\n+msgstr \"Erstmalige Übertragungsmeldung mit Nachbesserung:\"\n+\n+#: git-gui.sh:2191\n+msgid \"Amended Merge Commit Message:\"\n+msgstr \"Zusammenführungs-Übertragungsmeldung mit Nachbesserung\"\n+\n+#: git-gui.sh:2192\n+msgid \"Merge Commit Message:\"\n+msgstr \"Übertragungsmeldung Zusammenführung:\"\n+\n+#: git-gui.sh:2193\n+msgid \"Commit Message:\"\n+msgstr \"Übertragungsmeldung:\"\n+\n+#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73\n+msgid \"Copy All\"\n+msgstr \"Alle kopieren\"\n+\n+#: git-gui.sh:2262 lib/blame.tcl:104\n+msgid \"File:\"\n+msgstr \"Datei:\"\n+\n+#: git-gui.sh:2364\n+msgid \"Refresh\"\n+msgstr \"Aktualisieren\"\n+\n+#: git-gui.sh:2385\n+msgid \"Apply/Reverse Hunk\"\n+msgstr \"Änderung anwenden/umkehren\"\n+\n+#: git-gui.sh:2391\n+msgid \"Decrease Font Size\"\n+msgstr \"Schriftgröße verkleinern\"\n+\n+#: git-gui.sh:2395\n+msgid \"Increase Font Size\"\n+msgstr \"Schriftgröße vergrößern\"\n+\n+#: git-gui.sh:2400\n+msgid \"Show Less Context\"\n+msgstr \"Weniger Kontext anzeigen\"\n+\n+#: git-gui.sh:2407\n+msgid \"Show More Context\"\n+msgstr \"Mehr Kontext anzeigen\"\n+\n+#: git-gui.sh:2422\n+msgid \"Unstage Hunk From Commit\"\n+msgstr \"Aus der Bereitstellung herausnehmen\"\n+\n+#: git-gui.sh:2426 git-gui.sh:2430\n+msgid \"Stage Hunk For Commit\"\n+msgstr \"In die Bereitstellung hinzufügen\"\n+\n+#: git-gui.sh:2440\n+msgid \"Initializing...\"\n+msgstr \"Initialisieren...\"\n+\n+#: lib/blame.tcl:77\n+msgid \"File Viewer\"\n+msgstr \"Datei-Browser\"\n+\n+#: lib/blame.tcl:81\n+msgid \"Commit:\"\n+msgstr \"Übertragung:\"\n+\n+#: lib/blame.tcl:249\n+msgid \"Copy Commit\"\n+msgstr \"Übertragung kopieren\"\n+\n+#: lib/blame.tcl:369\n+#, tcl-format\n+msgid \"Reading %s...\"\n+msgstr \"%s lesen...\"\n+\n+#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19\n+msgid \"Checkout Branch\"\n+msgstr \"Zweig auschecken\"\n+\n+#: lib/branch_checkout.tcl:23\n+msgid \"Checkout\"\n+msgstr \"Auschecken\"\n+\n+#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35\n+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:283\n+#: lib/checkout_op.tcl:522 lib/merge.tcl:172 lib/option.tcl:172\n+#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92\n+msgid \"Cancel\"\n+msgstr \"Abbrechen\"\n+\n+#: lib/branch_checkout.tcl:32 lib/browser.tcl:288\n+msgid \"Revision\"\n+msgstr \"Version\"\n+\n+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159\n+#: lib/option.tcl:274\n+msgid \"Options\"\n+msgstr \"Optionen\"\n+\n+#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92\n+msgid \"Fetch Tracking Branch\"\n+msgstr \"Übernahmezweig anfordern\"\n+\n+#: lib/branch_checkout.tcl:44\n+msgid \"Detach From Local Branch\"\n+msgstr \"Verbindung zu lokalem Zweig lösen\"\n+\n+#: lib/branch_create.tcl:22\n+msgid \"Create Branch\"\n+msgstr \"Zweig erstellen\"\n+\n+#: lib/branch_create.tcl:27\n+msgid \"Create New Branch\"\n+msgstr \"Neuen Zweig erstellen\"\n+\n+#: lib/branch_create.tcl:31\n+msgid \"Create\"\n+msgstr \"Erstellen\"\n+\n+#: lib/branch_create.tcl:40\n+msgid \"Branch Name\"\n+msgstr \"Zweigname\"\n+\n+#: lib/branch_create.tcl:43\n+msgid \"Name:\"\n+msgstr \"Name:\"\n+\n+#: lib/branch_create.tcl:58\n+msgid \"Match Tracking Branch Name\"\n+msgstr \"Passend zu Übernahmezweig-Name\"\n+\n+#: lib/branch_create.tcl:66\n+msgid \"Starting Revision\"\n+msgstr \"Anfangsversion\"\n+\n+#: lib/branch_create.tcl:72\n+msgid \"Update Existing Branch:\"\n+msgstr \"Existierenden Zweig aktualisieren:\"\n+\n+#: lib/branch_create.tcl:75\n+msgid \"No\"\n+msgstr \"Nein\"\n+\n+#: lib/branch_create.tcl:80\n+msgid \"Fast Forward Only\"\n+msgstr \"Nur Schnellzusammenführung\"\n+\n+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514\n+msgid \"Reset\"\n+msgstr \"Zurücksetzen\"\n+\n+#: lib/branch_create.tcl:97\n+msgid \"Checkout After Creation\"\n+msgstr \"Auschecken nach Erstellen\"\n+\n+#: lib/branch_create.tcl:131\n+msgid \"Please select a tracking branch.\"\n+msgstr \"Bitte wählen Sie einen Übernahmezweig.\"\n+\n+#: lib/branch_create.tcl:140\n+#, tcl-format\n+msgid \"Tracking branch %s is not a branch in the remote repository.\"\n+msgstr \"Übernahmezweig »%s« ist kein Zweig im Projektarchiv der Gegenseite.\"\n+\n+#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86\n+msgid \"Please supply a branch name.\"\n+msgstr \"Bitte geben Sie einen Zweignamen an.\"\n+\n+#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106\n+#, tcl-format\n+msgid \"'%s' is not an acceptable branch name.\"\n+msgstr \"»%s« ist kein zulässiger Zweigname.\"\n+\n+#: lib/branch_delete.tcl:15\n+msgid \"Delete Branch\"\n+msgstr \"Zweig löschen\"\n+\n+#: lib/branch_delete.tcl:20\n+msgid \"Delete Local Branch\"\n+msgstr \"Lokalen Zweig löschen\"\n+\n+#: lib/branch_delete.tcl:37\n+msgid \"Local Branches\"\n+msgstr \"Lokale Zweige\"\n+\n+#: lib/branch_delete.tcl:52\n+msgid \"Delete Only If Merged Into\"\n+msgstr \"Nur löschen, wenn darin zusammengeführt\"\n+\n+#: lib/branch_delete.tcl:54\n+msgid \"Always (Do not perform merge test.)\"\n+msgstr \"Immer (ohne Zusammenführungstest)\"\n+\n+#: lib/branch_delete.tcl:103\n+#, tcl-format\n+msgid \"The following branches are not completely merged into %s:\"\n+msgstr \"Folgende Zweige sind noch nicht mit »%s« zusammengeführt:\"\n+\n+#: lib/branch_delete.tcl:115\n+msgid \"\"\n+\"Recovering deleted branches is difficult. \\n\"\n+\"\\n\"\n+\" Delete the selected branches?\"\n+msgstr \"\"\n+\"Gelöschte Zweige können nur mit größerem Aufwand wiederhergestellt werden.\\n\"\n+\"\\n\"\n+\"Gewählte Zweige jetzt löschen?\"\n+\n+#: lib/branch_delete.tcl:141\n+#, tcl-format\n+msgid \"\"\n+\"Failed to delete branches:\\n\"\n+\"%s\"\n+msgstr \"\"\n+\"Fehler beim Löschen der Zweige:\\n\"\n+\"%s\"\n+\n+#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22\n+msgid \"Rename Branch\"\n+msgstr \"Zweig umbenennen\"\n+\n+#: lib/branch_rename.tcl:26\n+msgid \"Rename\"\n+msgstr \"Umbenennen\"\n+\n+#: lib/branch_rename.tcl:36\n+msgid \"Branch:\"\n+msgstr \"Zweig:\"\n+\n+#: lib/branch_rename.tcl:39\n+msgid \"New Name:\"\n+msgstr \"Neuer Name:\"\n+\n+#: lib/branch_rename.tcl:75\n+msgid \"Please select a branch to rename.\"\n+msgstr \"Bitte wählen Sie einen Zweig zum umbenennen.\"\n+\n+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179\n+#, tcl-format\n+msgid \"Branch '%s' already exists.\"\n+msgstr \"Zweig »%s« existiert bereits.\"\n+\n+#: lib/branch_rename.tcl:117\n+#, tcl-format\n+msgid \"Failed to rename '%s'.\"\n+msgstr \"Fehler beim Umbenennen von »%s«.\"\n+\n+#: lib/browser.tcl:17\n+msgid \"Starting...\"\n+msgstr \"Starten...\"\n+\n+#: lib/browser.tcl:26\n+msgid \"File Browser\"\n+msgstr \"Datei-Browser\"\n+\n+#: lib/browser.tcl:127 lib/browser.tcl:144\n+#, tcl-format\n+msgid \"Loading %s...\"\n+msgstr \"%s laden...\"\n+\n+#: lib/browser.tcl:188\n+msgid \"[Up To Parent]\"\n+msgstr \"[Nach oben]\"\n+\n+#: lib/browser.tcl:268 lib/browser.tcl:274\n+msgid \"Browse Branch Files\"\n+msgstr \"Dateien des Zweigs durchblättern\"\n+\n+#: lib/browser.tcl:279\n+msgid \"Browse\"\n+msgstr \"Blättern\"\n+\n+#: lib/checkout_op.tcl:79\n+#, tcl-format\n+msgid \"Fetching %s from %s\"\n+msgstr \"Änderungen »%s« von »%s« anfordern\"\n+\n+#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31\n+msgid \"Close\"\n+msgstr \"Schließen\"\n+\n+#: lib/checkout_op.tcl:169\n+#, tcl-format\n+msgid \"Branch '%s' does not exist.\"\n+msgstr \"Zweig »%s« existiert nicht.\"\n+\n+#: lib/checkout_op.tcl:206\n+#, tcl-format\n+msgid \"\"\n+\"Branch '%s' already exists.\\n\"\n+\"\\n\"\n+\"It cannot fast-forward to %s.\\n\"\n+\"A merge is required.\"\n+msgstr \"\"\n+\"Zweig »%s« existiert bereits.\\n\"\n+\"\\n\"\n+\"Zweig kann nicht mit »%s« schnellzusammengeführt werden. Reguläres \"\n+\"Zusammenführen ist notwendig.\"\n+\n+#: lib/checkout_op.tcl:220\n+#, tcl-format\n+msgid \"Merge strategy '%s' not supported.\"\n+msgstr \"Zusammenführungsmethode »%s« nicht unterstützt.\"\n+\n+#: lib/checkout_op.tcl:239\n+#, tcl-format\n+msgid \"Failed to update '%s'.\"\n+msgstr \"Aktualisieren von »%s« fehlgeschlagen.\"\n+\n+#: lib/checkout_op.tcl:251\n+msgid \"Staging area (index) is already locked.\"\n+msgstr \"Bereitstellung (»index«) ist zur Bearbeitung gesperrt (»locked«).\"\n+\n+#: lib/checkout_op.tcl:266\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before the current branch can be changed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\\n\"\n+\"\\n\"\n+\"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden \"\n+\"geändert.  Vor dem Wechseln des lokalen Zweigs muss neu geladen werden.\\n\"\n+\"\\n\"\n+\"Es wird gleich neu geladen.\\n\"\n+\n+#: lib/checkout_op.tcl:353\n+#, tcl-format\n+msgid \"Aborted checkout of '%s' (file level merging is required).\"\n+msgstr \"\"\n+\"Auschecken von »%s« abgebrochen (Zusammenführen der Dateien ist notwendig).\"\n+\n+#: lib/checkout_op.tcl:354\n+msgid \"File level merge required.\"\n+msgstr \"Zusammenführen der Dateien ist notwendig.\"\n+\n+#: lib/checkout_op.tcl:358\n+#, tcl-format\n+msgid \"Staying on branch '%s'.\"\n+msgstr \"Es wird auf Zweig »%s« verblieben.\"\n+\n+#: lib/checkout_op.tcl:429\n+msgid \"\"\n+\"You are no longer on a local branch.\\n\"\n+\"\\n\"\n+\"If you wanted to be on a branch, create one now starting from 'This Detached \"\n+\"Checkout'.\"\n+msgstr \"\"\n+\"Die Arbeitskopie ist nicht auf einem lokalen Zweig.\\n\"\n+\"\\n\"\n+\"Wenn Sie auf einem Zwei arbeiten möchten, erstellen Sie bitte jetzt einen \"\n+\"Zweig mit der Auswahl »Abgetrennte Auscheck-Version«.\"\n+\n+#: lib/checkout_op.tcl:478\n+#, tcl-format\n+msgid \"Resetting '%s' to '%s' will lose the following commits:\"\n+msgstr \"Zurücksetzen von »%s« nach »%s« wird folgende Versionen verwerfen:\"\n+\n+#: lib/checkout_op.tcl:500\n+msgid \"Recovering lost commits may not be easy.\"\n+msgstr \"\"\n+\"Verworfene Versionen können nur mit größerem Aufwand wiederhergestellt \"\n+\"werden.\"\n+\n+#: lib/checkout_op.tcl:505\n+#, tcl-format\n+msgid \"Reset '%s'?\"\n+msgstr \"»%s« zurücksetzen?\"\n+\n+#: lib/checkout_op.tcl:510 lib/merge.tcl:164\n+msgid \"Visualize\"\n+msgstr \"Darstellen\"\n+\n+#: lib/checkout_op.tcl:578\n+#, tcl-format\n+msgid \"\"\n+\"Failed to set current branch.\\n\"\n+\"\\n\"\n+\"This working directory is only partially switched.  We successfully updated \"\n+\"your files, but failed to update an internal Git file.\\n\"\n+\"\\n\"\n+\"This should not have occurred.  %s will now close and give up.\"\n+msgstr \"\"\n+\"Lokaler Zweig kann nicht gesetzt werden.\\n\"\n+\"\\n\"\n+\"Diese Arbeitskopie ist nur teilweise umgestellt. Die Dateien sind korrekt \"\n+\"aktualisiert, aber einige interne Git-Dateien konnten nicht geändert \"\n+\"werden.\\n\"\n+\"\\n\"\n+\"Dies ist ein interner Programmfehler von %s. Programm wird jetzt abgebrochen.\"\n+\n+#: lib/choose_rev.tcl:53\n+msgid \"This Detached Checkout\"\n+msgstr \"Abgetrennte Auscheck-Version\"\n+\n+#: lib/choose_rev.tcl:60\n+msgid \"Revision Expression:\"\n+msgstr \"Version Regexp-Ausdruck:\"\n+\n+#: lib/choose_rev.tcl:74\n+msgid \"Local Branch\"\n+msgstr \"Lokaler Zweig\"\n+\n+#: lib/choose_rev.tcl:79\n+msgid \"Tracking Branch\"\n+msgstr \"Übernahmezweig\"\n+\n+#: lib/choose_rev.tcl:84\n+msgid \"Tag\"\n+msgstr \"Markierung\"\n+\n+#: lib/choose_rev.tcl:317\n+#, tcl-format\n+msgid \"Invalid revision: %s\"\n+msgstr \"Ungültige Version: %s\"\n+\n+#: lib/choose_rev.tcl:338\n+msgid \"No revision selected.\"\n+msgstr \"Keine Version ausgewählt.\"\n+\n+#: lib/choose_rev.tcl:346\n+msgid \"Revision expression is empty.\"\n+msgstr \"Versions-Ausdruck ist leer.\"\n+\n+#: lib/commit.tcl:9\n+msgid \"\"\n+\"There is nothing to amend.\\n\"\n+\"\\n\"\n+\"You are about to create the initial commit.  There is no commit before this \"\n+\"to amend.\\n\"\n+msgstr \"\"\n+\"Keine Version zur Nachbesserung vorhanden.\\n\"\n+\"\\n\"\n+\"Sie sind dabei, die erste Version zu übertragen. Es gibt keine existierende \"\n+\"Version, die Sie nachbessern könnten.\\n\"\n+\n+#: lib/commit.tcl:18\n+msgid \"\"\n+\"Cannot amend while merging.\\n\"\n+\"\\n\"\n+\"You are currently in the middle of a merge that has not been fully \"\n+\"completed.  You cannot amend the prior commit unless you first abort the \"\n+\"current merge activity.\\n\"\n+msgstr \"\"\n+\"Nachbesserung währen Zusammenführung nicht möglich.\\n\"\n+\"\\n\"\n+\"Sie haben das Zusammenführen von Versionen angefangen, aber noch nicht \"\n+\"beendet. Sie können keine vorige Übertragung nachbessern, solange eine \"\n+\"unfertige Zusammenführung existiert. Dazu müssen Sie die Zusammenführung \"\n+\"beenden oder abbrechen.\\n\"\n+\n+#: lib/commit.tcl:49\n+msgid \"Error loading commit data for amend:\"\n+msgstr \"Fehler beim Laden der Versionsdaten für Nachbessern:\"\n+\n+#: lib/commit.tcl:76\n+msgid \"Unable to obtain your identity:\"\n+msgstr \"Benutzername konnte nicht bestimmt werden:\"\n+\n+#: lib/commit.tcl:81\n+msgid \"Invalid GIT_COMMITTER_IDENT:\"\n+msgstr \"Ungültiger Wert von GIT_COMMITTER_INDENT:\"\n+\n+#: lib/commit.tcl:133\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before another commit can be created.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\\n\"\n+\"\\n\"\n+\"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden \"\n+\"geändert.  Vor einer neuen Übertragung muss neu geladen werden.\\n\"\n+\"\\n\"\n+\"Es wird gleich neu geladen.\\n\"\n+\n+#: lib/commit.tcl:154\n+#, tcl-format\n+msgid \"\"\n+\"Unmerged files cannot be committed.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.  You must resolve them and stage the file \"\n+\"before committing.\\n\"\n+msgstr \"\"\n+\"Nicht zusammengeführte Dateien können nicht übertragen werden.\\n\"\n+\"\\n\"\n+\"Die Datei %s hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie \"\n+\"müssen diese Konflikte auflösen, bevor Sie übertragen können.\\n\"\n+\n+#: lib/commit.tcl:162\n+#, tcl-format\n+msgid \"\"\n+\"Unknown file state %s detected.\\n\"\n+\"\\n\"\n+\"File %s cannot be committed by this program.\\n\"\n+msgstr \"\"\n+\"Unbekannter Dateizustand »%s«.\\n\"\n+\"\\n\"\n+\"Datei »%s« kann nicht übertragen werden.\\n\"\n+\n+#: lib/commit.tcl:170\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"You must stage at least 1 file before you can commit.\\n\"\n+msgstr \"\"\n+\"Keine Änderungen vorhanden, die übertragen werden könnten.\\n\"\n+\"\\n\"\n+\"Sie müssen mindestens eine Datei bereitstellen, bevor Sie übertragen \"\n+\"können.\\n\"\n+\n+#: lib/commit.tcl:183\n+msgid \"\"\n+\"Please supply a commit message.\\n\"\n+\"\\n\"\n+\"A good commit message has the following format:\\n\"\n+\"\\n\"\n+\"- First line: Describe in one sentance what you did.\\n\"\n+\"- Second line: Blank\\n\"\n+\"- Remaining lines: Describe why this change is good.\\n\"\n+msgstr \"\"\n+\"Bitte geben Sie eine Übertragungsmeldung ein.\\n\"\n+\"\\n\"\n+\"Eine gute Übertragungsmeldung enthält folgende Abschnitte:\\n\"\n+\"\\n\"\n+\"- Erste Zeile: Eine Zusammenfassung, was man gemacht hat.\\n\"\n+\"\\n\"\n+\"- Zweite Zeile: Leerzeile\\n\"\n+\"\\n\"\n+\"- Rest der Meldung: Eine ausführliche Beschreibung, warum diese Änderung \"\n+\"hilfreich ist.\\n\"\n+\n+#: lib/commit.tcl:257\n+msgid \"write-tree failed:\"\n+msgstr \"write-tree fehlgeschlagen:\"\n+\n+#: lib/commit.tcl:279\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"No files were modified by this commit and it was not a merge commit.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"Keine Änderungen zu übertragen.\\n\"\n+\"\\n\"\n+\"Es gibt keine geänderte Datei bei dieser Übertragung und es wurde auch \"\n+\"nichts zusammengeführt.\\n\"\n+\"\\n\"\n+\"Das Arbeitsverzeichnis wird daher jetzt neu geladen.\\n\"\n+\n+#: lib/commit.tcl:286\n+msgid \"No changes to commit.\"\n+msgstr \"Keine Änderungen, die übertragen werden können.\"\n+\n+#: lib/commit.tcl:317\n+msgid \"commit-tree failed:\"\n+msgstr \"commit-tree fehlgeschlagen:\"\n+\n+#: lib/commit.tcl:339\n+msgid \"update-ref failed:\"\n+msgstr \"update-ref fehlgeschlagen:\"\n+\n+#: lib/commit.tcl:430\n+#, tcl-format\n+msgid \"Created commit %s: %s\"\n+msgstr \"Version %s übertragen: %s\"\n+\n+#: lib/console.tcl:55\n+msgid \"Working... please wait...\"\n+msgstr \"Verarbeitung. Bitte warten...\"\n+\n+#: lib/console.tcl:184\n+msgid \"Success\"\n+msgstr \"Erfolgreich\"\n+\n+#: lib/console.tcl:194\n+msgid \"Error: Command Failed\"\n+msgstr \"Fehler: Kommando fehlgeschlagen\"\n+\n+#: lib/database.tcl:43\n+msgid \"Number of loose objects\"\n+msgstr \"Anzahl unverknüpfter Objekte\"\n+\n+#: lib/database.tcl:44\n+msgid \"Disk space used by loose objects\"\n+msgstr \"Festplattenplatz von unverknüpften Objekten\"\n+\n+#: lib/database.tcl:45\n+msgid \"Number of packed objects\"\n+msgstr \"Anzahl komprimierter Objekte\"\n+\n+#: lib/database.tcl:46\n+msgid \"Number of packs\"\n+msgstr \"Anzahl Komprimierungseinheiten\"\n+\n+#: lib/database.tcl:47\n+msgid \"Disk space used by packed objects\"\n+msgstr \"Festplattenplatz von komprimierten Objekten\"\n+\n+#: lib/database.tcl:48\n+msgid \"Packed objects waiting for pruning\"\n+msgstr \"Komprimierte Objekte, die zum Löschen vorgesehen sind\"\n+\n+#: lib/database.tcl:49\n+msgid \"Garbage files\"\n+msgstr \"Dateien im Mülleimer\"\n+\n+#: lib/database.tcl:72\n+msgid \"Compressing the object database\"\n+msgstr \"Objektdatenbank komprimieren\"\n+\n+#: lib/database.tcl:83\n+msgid \"Verifying the object database with fsck-objects\"\n+msgstr \"Die Objektdatenbank durch »fsck-objects« überprüfen lassen\"\n+\n+#: lib/diff.tcl:42\n+#, tcl-format\n+msgid \"\"\n+\"No differences detected.\\n\"\n+\"\\n\"\n+\"%s has no changes.\\n\"\n+\"\\n\"\n+\"The modification date of this file was updated by another application, but \"\n+\"the content within the file was not changed.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started to find other files which may have \"\n+\"the same state.\"\n+msgstr \"\"\n+\"Keine Änderungen feststellbar.\\n\"\n+\"\\n\"\n+\"»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei \"\n+\"von einem anderen Programm modifiziert, aber der Inhalt der Datei ist \"\n+\"unverändert.\\n\"\n+\"\\n\"\n+\"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen \"\n+\"Dateien zu prüfen.\"\n+\n+#: lib/diff.tcl:97\n+msgid \"Error loading file:\"\n+msgstr \"Fehler beim Laden der Datei:\"\n+\n+#: lib/diff.tcl:162\n+msgid \"Error loading diff:\"\n+msgstr \"Fehler beim Laden des Vergleichs:\"\n+\n+#: lib/diff.tcl:278\n+msgid \"Failed to unstage selected hunk.\"\n+msgstr \"Fehler beim Herausnehmen der gewählten Dateien aus der Bereitstellung.\"\n+\n+#: lib/diff.tcl:285\n+msgid \"Failed to stage selected hunk.\"\n+msgstr \"Fehler beim Bereitstellen der gewählten Dateien.\"\n+\n+#: lib/error.tcl:12 lib/error.tcl:102\n+msgid \"error\"\n+msgstr \"Fehler\"\n+\n+#: lib/error.tcl:28\n+msgid \"warning\"\n+msgstr \"Warnung\"\n+\n+#: lib/error.tcl:81\n+msgid \"You must correct the above errors before committing.\"\n+msgstr \"\"\n+\"Sie müssen die obigen Fehler zuerst beheben, bevor Sie übertragen können.\"\n+\n+#: lib/index.tcl:364\n+#, tcl-format\n+msgid \"Revert changes in file %s?\"\n+msgstr \"Änderungen in Datei »%s« revidieren?\"\n+\n+#: lib/index.tcl:366\n+#, tcl-format\n+msgid \"Revert changes in these %i files?\"\n+msgstr \"Änderungen in den gewählten %i Dateien revidieren?\"\n+\n+#: lib/index.tcl:372\n+msgid \"Any unstaged changes will be permanently lost by the revert.\"\n+msgstr \"\"\n+\"Alle nicht bereitgestellten Änderungen werden beim Revidieren verloren gehen.\"\n+\n+#: lib/index.tcl:375\n+msgid \"Do Nothing\"\n+msgstr \"Nichts tun\"\n+\n+#: lib/merge.tcl:13\n+msgid \"\"\n+\"Cannot merge while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit before starting any type of merge.\\n\"\n+msgstr \"\"\n+\"Zusammenführen kann nicht gleichzeitig mit Nachbessern durchgeführt werden.\\n\"\n+\"\\n\"\n+\"Sie müssen zuerst die Nachbesserungs-Übertragung abschließen, bevor Sie \"\n+\"zusammenführen können.\\n\"\n+\n+#: lib/merge.tcl:27\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before a merge can be performed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\\n\"\n+\"\\n\"\n+\"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden \"\n+\"geändert.  Vor einem Zusammenführen muss neu geladen werden.\\n\"\n+\"\\n\"\n+\"Es wird gleich neu geladen.\\n\"\n+\n+#: lib/merge.tcl:44\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a conflicted merge.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.\\n\"\n+\"\\n\"\n+\"You must resolve them, stage the file, and commit to complete the current \"\n+\"merge.  Only then can you begin another merge.\\n\"\n+msgstr \"\"\n+\"Zusammenführung mit Konflikten.\\n\"\n+\"\\n\"\n+\"Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese \"\n+\"Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder \"\n+\"bereitstellen und übertragen, um die Zusammenführung abzuschließen. Erst \"\n+\"danach kann eine neue Zusammenführung begonnen werden.\\n\"\n+\n+#: lib/merge.tcl:54\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a change.\\n\"\n+\"\\n\"\n+\"File %s is modified.\\n\"\n+\"\\n\"\n+\"You should complete the current commit before starting a merge.  Doing so \"\n+\"will help you abort a failed merge, should the need arise.\\n\"\n+msgstr \"\"\n+\"Es liegen Änderungen vor.\\n\"\n+\"\\n\"\n+\"Die Datei »%s« wurde geändert.  Sie sollten zuerst die bereitgestellte \"\n+\"Übertragung abschließen, bevor Sie eine Zusammenführung beginnen.  Mit \"\n+\"dieser Reihenfolge können Sie mögliche Konflikte beim Zusammenführen \"\n+\"wesentlich einfacher beheben oder abbrechen.\\n\"\n+\n+#: lib/merge.tcl:106\n+#, tcl-format\n+msgid \"%s of %s\"\n+msgstr \"%s von %s\"\n+\n+#: lib/merge.tcl:119\n+#, tcl-format\n+msgid \"Merging %s and %s\"\n+msgstr \"Zusammenführen von %s und %s\"\n+\n+#: lib/merge.tcl:131\n+msgid \"Merge completed successfully.\"\n+msgstr \"Zusammenführen erfolgreich abgeschlossen.\"\n+\n+#: lib/merge.tcl:133\n+msgid \"Merge failed.  Conflict resolution is required.\"\n+msgstr \"Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig.\"\n+\n+#: lib/merge.tcl:158\n+#, tcl-format\n+msgid \"Merge Into %s\"\n+msgstr \"Zusammenführen in %s\"\n+\n+#: lib/merge.tcl:177\n+msgid \"Revision To Merge\"\n+msgstr \"Zusammenzuführende Version\"\n+\n+#: lib/merge.tcl:212\n+msgid \"\"\n+\"Cannot abort while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit.\\n\"\n+msgstr \"\"\n+\"Abbruch der Nachbesserung ist nicht möglich.\\n\"\n+\"\\n\"\n+\"Sie müssen die Nachbesserung der Übertragung abschließen.\\n\"\n+\n+#: lib/merge.tcl:222\n+msgid \"\"\n+\"Abort merge?\\n\"\n+\"\\n\"\n+\"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\\n\"\n+\"\\n\"\n+\"Continue with aborting the current merge?\"\n+msgstr \"\"\n+\"Zusammenführen abbrechen?\\n\"\n+\"\\n\"\n+\"Wenn Sie abbrechen, gehen alle noch nicht übertragenen Änderungen verloren.\\n\"\n+\"\\n\"\n+\"Zusammenführen jetzt abbrechen?\"\n+\n+#: lib/merge.tcl:228\n+msgid \"\"\n+\"Reset changes?\\n\"\n+\"\\n\"\n+\"Resetting the changes will cause *ALL* uncommitted changes to be lost.\\n\"\n+\"\\n\"\n+\"Continue with resetting the current changes?\"\n+msgstr \"\"\n+\"Änderungen zurücksetzen?\\n\"\n+\"\\n\"\n+\"Wenn Sie zurücksetzen, gehen alle noch nicht übertragenen Änderungen \"\n+\"verloren.\\n\"\n+\"\\n\"\n+\"Änderungen jetzt zurücksetzen?\"\n+\n+#: lib/merge.tcl:239\n+msgid \"Aborting\"\n+msgstr \"Abbruch\"\n+\n+#: lib/merge.tcl:266\n+msgid \"Abort failed.\"\n+msgstr \"Abbruch fehlgeschlagen.\"\n+\n+#: lib/merge.tcl:268\n+msgid \"Abort completed.  Ready.\"\n+msgstr \"Abbruch durchgeführt. Bereit.\"\n+\n+#: lib/option.tcl:77\n+msgid \"git-gui - a graphical user interface for Git.\"\n+msgstr \"git-gui - eine grafische Oberfläche für Git.\"\n+\n+#: lib/option.tcl:164\n+msgid \"Restore Defaults\"\n+msgstr \"Voreinstellungen wiederherstellen\"\n+\n+#: lib/option.tcl:168\n+msgid \"Save\"\n+msgstr \"Speichern\"\n+\n+#: lib/option.tcl:178\n+#, tcl-format\n+msgid \"%s Repository\"\n+msgstr \"Projektarchiv %s\"\n+\n+#: lib/option.tcl:179\n+msgid \"Global (All Repositories)\"\n+msgstr \"Global (Alle Projektarchive)\"\n+\n+#: lib/option.tcl:185\n+msgid \"User Name\"\n+msgstr \"Benutzername\"\n+\n+#: lib/option.tcl:186\n+msgid \"Email Address\"\n+msgstr \"E-Mail-Adresse\"\n+\n+#: lib/option.tcl:188\n+msgid \"Summarize Merge Commits\"\n+msgstr \"Zusammenführungs-Übertragungen zusammenfassen\"\n+\n+#: lib/option.tcl:189\n+msgid \"Merge Verbosity\"\n+msgstr \"Ausführlichkeit der Zusammenführen-Meldungen\"\n+\n+#: lib/option.tcl:190\n+msgid \"Show Diffstat After Merge\"\n+msgstr \"Vergleichsstatistik nach Zusammenführen anzeigen\"\n+\n+#: lib/option.tcl:192\n+msgid \"Trust File Modification Timestamps\"\n+msgstr \"Auf Dateiänderungsdatum verlassen\"\n+\n+#: lib/option.tcl:193\n+msgid \"Prune Tracking Branches During Fetch\"\n+msgstr \"Übernahmezweige löschen während Anforderung\"\n+\n+#: lib/option.tcl:194\n+msgid \"Match Tracking Branches\"\n+msgstr \"Passend zu Übernahmezweig\"\n+\n+#: lib/option.tcl:195\n+msgid \"Number of Diff Context Lines\"\n+msgstr \"Anzahl der Kontextzeilen beim Vergleich\"\n+\n+#: lib/option.tcl:196\n+msgid \"New Branch Name Template\"\n+msgstr \"Namensvorschlag für neue Zweige\"\n+\n+#: lib/option.tcl:305\n+msgid \"Failed to completely save options:\"\n+msgstr \"Optionen konnten nicht gespeichert werden:\"\n+\n+#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34\n+msgid \"Delete Remote Branch\"\n+msgstr \"Zweig im Projektarchiv der Gegenseite löschen\"\n+\n+#: lib/remote_branch_delete.tcl:47\n+msgid \"From Repository\"\n+msgstr \"Von Projektarchiv\"\n+\n+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118\n+msgid \"Remote:\"\n+msgstr \"Gegenseite:\"\n+\n+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133\n+msgid \"Arbitrary URL:\"\n+msgstr \"Kommunikation mit URL:\"\n+\n+#: lib/remote_branch_delete.tcl:84\n+msgid \"Branches\"\n+msgstr \"Zweige\"\n+\n+#: lib/remote_branch_delete.tcl:109\n+msgid \"Delete Only If\"\n+msgstr \"Löschen, falls\"\n+\n+#: lib/remote_branch_delete.tcl:111\n+msgid \"Merged Into:\"\n+msgstr \"Zusammenführen mit:\"\n+\n+#: lib/remote_branch_delete.tcl:119\n+msgid \"Always (Do not perform merge checks)\"\n+msgstr \"Immer (Keine Zusammenführungsprüfung)\"\n+\n+#: lib/remote_branch_delete.tcl:152\n+msgid \"A branch is required for 'Merged Into'.\"\n+msgstr \"Für »Zusammenführen mit« muss ein Zweig angegeben werden.\"\n+\n+#: lib/remote_branch_delete.tcl:189\n+#, tcl-format\n+msgid \"\"\n+\"One or more of the merge tests failed because you have not fetched the \"\n+\"necessary commits.  Try fetching from %s first.\"\n+msgstr \"\"\n+\"Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die \"\n+\"notwendigen Versionen vorher angefordert haben.  Sie sollten versuchen, \"\n+\"zuerst von »%s« anzufordern.\"\n+\n+#: lib/remote_branch_delete.tcl:207\n+msgid \"Please select one or more branches to delete.\"\n+msgstr \"Bitte wählen Sie mindestens einen Zweig, der gelöscht werden soll.\"\n+\n+#: lib/remote_branch_delete.tcl:216\n+msgid \"\"\n+\"Recovering deleted branches is difficult.\\n\"\n+\"\\n\"\n+\"Delete the selected branches?\"\n+msgstr \"\"\n+\"Das Wiederherstellen von gelöschten Zweigen ist nur mit größerem Aufwand \"\n+\"möglich.\\n\"\n+\"\\n\"\n+\"Sollen die ausgewählten Zweige gelöscht werden?\"\n+\n+#: lib/remote_branch_delete.tcl:226\n+#, tcl-format\n+msgid \"Deleting branches from %s\"\n+msgstr \"Zweige auf »%s« werden gelöscht\"\n+\n+#: lib/remote_branch_delete.tcl:286\n+msgid \"No repository selected.\"\n+msgstr \"Kein Projektarchiv ausgewählt.\"\n+\n+#: lib/remote_branch_delete.tcl:291\n+#, tcl-format\n+msgid \"Scanning %s...\"\n+msgstr \"%s laden...\"\n+\n+#: lib/remote.tcl:162\n+#, tcl-format\n+msgid \"Fetch from %s...\"\n+msgstr \"Von »%s« anfordern...\"\n+\n+#: lib/remote.tcl:172\n+#, tcl-format\n+msgid \"Prune from %s...\"\n+msgstr \"Löschen von »%s«...\"\n+\n+#: lib/remote.tcl:206\n+#, tcl-format\n+msgid \"Push to %s...\"\n+msgstr \"Nach %s ausliefern...\"\n+\n+#: lib/shortcut.tcl:26 lib/shortcut.tcl:74\n+msgid \"Cannot write script:\"\n+msgstr \"Fehler beim Schreiben des Scripts:\"\n+\n+#: lib/shortcut.tcl:149\n+msgid \"Cannot write icon:\"\n+msgstr \"Fehler beim Erstellen des Icons:\"\n+\n+#: lib/status_bar.tcl:58\n+#, tcl-format\n+msgid \"%s ... %i of %i %s (%2i%%)\"\n+msgstr \"%s ... %i von %i %s (%2i%%)\"\n+\n+#: lib/transport.tcl:7\n+#, tcl-format\n+msgid \"Fetching new changes from %s\"\n+msgstr \"Neue Änderungen von »%s« holen\"\n+\n+#: lib/transport.tcl:19\n+#, tcl-format\n+msgid \"Pruning tracking branches deleted from %s\"\n+msgstr \"Übernahmezweige löschen, die in »%s« gelöscht wurden\"\n+\n+#: lib/transport.tcl:26\n+#, tcl-format\n+msgid \"Pushing changes to %s\"\n+msgstr \"Änderungen nach %s ausliefern\"\n+\n+#: lib/transport.tcl:68\n+#, tcl-format\n+msgid \"Pushing %s %s to %s\"\n+msgstr \"%s %s nach %s ausliefern\"\n+\n+#: lib/transport.tcl:84\n+msgid \"Push Branches\"\n+msgstr \"Zweige ausliefern\"\n+\n+#: lib/transport.tcl:98\n+msgid \"Source Branches\"\n+msgstr \"Herkunftszweige\"\n+\n+#: lib/transport.tcl:115\n+msgid \"Destination Repository\"\n+msgstr \"Ziel-Projektarchiv\"\n+\n+#: lib/transport.tcl:153\n+msgid \"Transfer Options\"\n+msgstr \"Netzwerk-Einstellungen\"\n+\n+#: lib/transport.tcl:155\n+msgid \"Use thin pack (for slow network connections)\"\n+msgstr \"Kompaktes Datenformat benutzen (für langsame Netzverbindungen)\"\n+\n+#: lib/transport.tcl:159\n+msgid \"Include tags\"\n+msgstr \"Mit Markierungen übertragen\"\n-- \n1.5.3.2.g46909\n\n"},{"id":"52228","messageId":"Pine.LNX.4.64.0709021734370.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 09/15] Initial Chinese translation for git-gui","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:34:48Z","receivedAt":"2007-09-02T16:34:48Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nFrom: Xudong Guan <xudong.guan@gmail.com>\n\nSimplified Chinese, in UTF-8 encoding.\n\nSigned-off-by: Xudong Guan <xudong.guan@gmail.com>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n po/zh_cn.po | 1284 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 1284 insertions(+), 0 deletions(-)\n create mode 100644 po/zh_cn.po\n\ndiff --git a/po/zh_cn.po b/po/zh_cn.po\nnew file mode 100644\nindex 0000000..45eb5b5\n--- /dev/null\n+++ b/po/zh_cn.po\n@@ -0,0 +1,1284 @@\n+# Translation of git-gui to Chinese\n+# Copyright (C) 2007 Shawn Pearce\n+# This file is distributed under the same license as the git-gui package.\n+# Xudong Guan <xudong.guan@gmail.com>, 2007.\n+#\n+#, fuzzy\n+msgid \"\"\n+msgstr \"\"\n+\"Project-Id-Version: git-gui\\n\"\n+\"Report-Msgid-Bugs-To: \\n\"\n+\"POT-Creation-Date: 2007-07-27 19:33+0200\\n\"\n+\"PO-Revision-Date: 2007-07-21 01:23-0700\\n\"\n+\"Last-Translator: Xudong Guan <xudong.guan@gmail.com>\\n\"\n+\"Language-Team: Chinese\\n\"\n+\"MIME-Version: 1.0\\n\"\n+\"Content-Type: text/plain; charset=UTF-8\\n\"\n+\"Content-Transfer-Encoding: 8bit\\n\"\n+\n+#: git-gui.sh:531\n+msgid \"Cannot find git in PATH.\"\n+msgstr \"\"\n+\n+#: git-gui.sh:550\n+msgid \"Cannot parse Git version string:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:567\n+#, tcl-format\n+msgid \"\"\n+\"Git version cannot be determined.\\n\"\n+\"\\n\"\n+\"%s claims it is version '%s'.\\n\"\n+\"\\n\"\n+\"%s requires at least Git 1.5.0 or later.\\n\"\n+\"\\n\"\n+\"Assume '%s' is version 1.5.0?\\n\"\n+msgstr \"\"\n+\n+#: git-gui.sh:689\n+msgid \"Cannot find the git directory:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:697\n+msgid \"Git directory not found:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:703\n+msgid \"Cannot use funny .git directory:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:708\n+msgid \"No working directory\"\n+msgstr \"\"\n+\n+#: git-gui.sh:853\n+msgid \"Refreshing file status...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:886\n+msgid \"Scanning for modified files ...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1052 lib/browser.tcl:233\n+#, fuzzy\n+msgid \"Ready.\"\n+msgstr \"重做\"\n+\n+#: git-gui.sh:1343\n+msgid \"Unmodified\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1345\n+msgid \"Modified, not staged\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1346 git-gui.sh:1351\n+#, fuzzy\n+msgid \"Staged for commit\"\n+msgstr \"从本次提交移除\"\n+\n+#: git-gui.sh:1347 git-gui.sh:1352\n+#, fuzzy\n+msgid \"Portions staged for commit\"\n+msgstr \"从本次提交移除\"\n+\n+#: git-gui.sh:1348 git-gui.sh:1353\n+msgid \"Staged for commit, missing\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1350\n+msgid \"Untracked, not staged\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1355\n+msgid \"Missing\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1356\n+msgid \"Staged for removal\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1357\n+msgid \"Staged for removal, still present\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1359 git-gui.sh:1360 git-gui.sh:1361 git-gui.sh:1362\n+msgid \"Requires merge resolution\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1404\n+msgid \"Starting gitk... please wait...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1413\n+#, tcl-format\n+msgid \"\"\n+\"Unable to start gitk:\\n\"\n+\"\\n\"\n+\"%s does not exist\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1630\n+#, tcl-format\n+msgid \"Invalid font specified in gui.%s:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1655\n+msgid \"Main Font\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1656\n+msgid \"Diff/Console Font\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1670\n+msgid \"Repository\"\n+msgstr \"版本树\"\n+\n+#: git-gui.sh:1671\n+msgid \"Edit\"\n+msgstr \"编辑\"\n+\n+#: git-gui.sh:1673\n+msgid \"Branch\"\n+msgstr \"分支\"\n+\n+#: git-gui.sh:1676 git-gui.sh:1854 git-gui.sh:2193\n+msgid \"Commit\"\n+msgstr \"提交\"\n+\n+#: git-gui.sh:1679 lib/merge.tcl:96 lib/merge.tcl:157 lib/merge.tcl:173\n+msgid \"Merge\"\n+msgstr \"合并\"\n+\n+#: git-gui.sh:1680\n+msgid \"Fetch\"\n+msgstr \"导入\"\n+\n+#: git-gui.sh:1681 git-gui.sh:2199 lib/transport.tcl:88 lib/transport.tcl:172\n+msgid \"Push\"\n+msgstr \"上传\"\n+\n+#: git-gui.sh:1690\n+msgid \"Browse Current Branch's Files\"\n+msgstr \"浏览当前分支文件\"\n+\n+#: git-gui.sh:1692\n+#, fuzzy, tcl-format\n+msgid \"Browse %s's Files\"\n+msgstr \"浏览当前分支文件\"\n+\n+#: git-gui.sh:1694\n+#, fuzzy\n+msgid \"Browse Branch Files...\"\n+msgstr \"浏览当前分支文件\"\n+\n+#: git-gui.sh:1699\n+msgid \"Visualize Current Branch's History\"\n+msgstr \"调用gitk显示当前分支\"\n+\n+#: git-gui.sh:1701\n+#, fuzzy, tcl-format\n+msgid \"Visualize %s's History\"\n+msgstr \"调用gitk显示所有分支\"\n+\n+#: git-gui.sh:1703\n+msgid \"Visualize All Branch History\"\n+msgstr \"调用gitk显示所有分支\"\n+\n+#: git-gui.sh:1708 lib/database.tcl:27 lib/database.tcl:67\n+msgid \"Database Statistics\"\n+msgstr \"数据库统计数据\"\n+\n+#: git-gui.sh:1711 lib/database.tcl:34\n+msgid \"Compress Database\"\n+msgstr \"压缩数据库\"\n+\n+#: git-gui.sh:1714\n+msgid \"Verify Database\"\n+msgstr \"验证数据库\"\n+\n+#: git-gui.sh:1721 git-gui.sh:1725 git-gui.sh:1729 lib/shortcut.tcl:9\n+#: lib/shortcut.tcl:45 lib/shortcut.tcl:84\n+msgid \"Create Desktop Icon\"\n+msgstr \"创建桌面图标\"\n+\n+#: git-gui.sh:1734\n+msgid \"Quit\"\n+msgstr \"退出\"\n+\n+#: git-gui.sh:1741\n+msgid \"Undo\"\n+msgstr \"撤销\"\n+\n+#: git-gui.sh:1744\n+msgid \"Redo\"\n+msgstr \"重做\"\n+\n+#: git-gui.sh:1748 git-gui.sh:2263\n+msgid \"Cut\"\n+msgstr \"剪切\"\n+\n+#: git-gui.sh:1751 git-gui.sh:2266 git-gui.sh:2337 git-gui.sh:2409\n+#: lib/console.tcl:69\n+msgid \"Copy\"\n+msgstr \"复制\"\n+\n+#: git-gui.sh:1754 git-gui.sh:2269\n+msgid \"Paste\"\n+msgstr \"粘贴\"\n+\n+#: git-gui.sh:1757 git-gui.sh:2272 lib/branch_delete.tcl:26\n+#: lib/remote_branch_delete.tcl:38\n+msgid \"Delete\"\n+msgstr \"删除\"\n+\n+#: git-gui.sh:1761 git-gui.sh:2276 git-gui.sh:2413 lib/console.tcl:71\n+msgid \"Select All\"\n+msgstr \"全选\"\n+\n+#: git-gui.sh:1770\n+msgid \"Create...\"\n+msgstr \"新建...\"\n+\n+#: git-gui.sh:1776\n+msgid \"Checkout...\"\n+msgstr \"切换...\"\n+\n+#: git-gui.sh:1782\n+msgid \"Rename...\"\n+msgstr \"改名...\"\n+\n+#: git-gui.sh:1787 git-gui.sh:1885\n+msgid \"Delete...\"\n+msgstr \"删除...\"\n+\n+#: git-gui.sh:1792\n+msgid \"Reset...\"\n+msgstr \"重置所有修动...\"\n+\n+#: git-gui.sh:1804 git-gui.sh:2210\n+msgid \"New Commit\"\n+msgstr \"新提交\"\n+\n+#: git-gui.sh:1812 git-gui.sh:2217\n+msgid \"Amend Last Commit\"\n+msgstr \"修订上次提交\"\n+\n+#: git-gui.sh:1821 git-gui.sh:2177 lib/remote_branch_delete.tcl:99\n+msgid \"Rescan\"\n+msgstr \"重新扫描\"\n+\n+#: git-gui.sh:1827\n+msgid \"Add To Commit\"\n+msgstr \"添加到本次提交\"\n+\n+#: git-gui.sh:1832\n+msgid \"Add Existing To Commit\"\n+msgstr \"添加默认修改文件\"\n+\n+#: git-gui.sh:1838\n+msgid \"Unstage From Commit\"\n+msgstr \"从本次提交移除\"\n+\n+#: git-gui.sh:1843 lib/index.tcl:376\n+msgid \"Revert Changes\"\n+msgstr \"恢复修改\"\n+\n+#: git-gui.sh:1850 git-gui.sh:2189 git-gui.sh:2287\n+msgid \"Sign Off\"\n+msgstr \"签名\"\n+\n+#: git-gui.sh:1865\n+msgid \"Local Merge...\"\n+msgstr \"本地合并...\"\n+\n+#: git-gui.sh:1870\n+msgid \"Abort Merge...\"\n+msgstr \"取消合并...\"\n+\n+#: git-gui.sh:1882\n+msgid \"Push...\"\n+msgstr \"上传...\"\n+\n+#: git-gui.sh:1892\n+msgid \"Apple\"\n+msgstr \"苹果\"\n+\n+#: git-gui.sh:1895 git-gui.sh:1942 lib/option.tcl:65\n+#, tcl-format\n+msgid \"About %s\"\n+msgstr \"关于%s\"\n+\n+#: git-gui.sh:1897 git-gui.sh:1903 git-gui.sh:2455\n+msgid \"Options...\"\n+msgstr \"选项...\"\n+\n+#: git-gui.sh:1917\n+msgid \"Running miga...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1938\n+msgid \"Help\"\n+msgstr \"帮助\"\n+\n+#: git-gui.sh:1979\n+msgid \"Online Documentation\"\n+msgstr \"在线文档\"\n+\n+#: git-gui.sh:2095\n+msgid \"Current Branch:\"\n+msgstr \"当前分支:\"\n+\n+#: git-gui.sh:2116\n+msgid \"Staged Changes (Will Be Committed)\"\n+msgstr \"将被提交的修改\"\n+\n+#: git-gui.sh:2136\n+msgid \"Unstaged Changes (Will Not Be Committed)\"\n+msgstr \"不被提交的修改\"\n+\n+#: git-gui.sh:2183\n+msgid \"Add Existing\"\n+msgstr \"添加默认修改文件\"\n+\n+#: git-gui.sh:2229\n+msgid \"Initial Commit Message:\"\n+msgstr \"初始提交描述:\"\n+\n+#: git-gui.sh:2230\n+msgid \"Amended Commit Message:\"\n+msgstr \"修订提交描述:\"\n+\n+#: git-gui.sh:2231\n+msgid \"Amended Initial Commit Message:\"\n+msgstr \"修订初始提交描述:\"\n+\n+#: git-gui.sh:2232\n+msgid \"Amended Merge Commit Message:\"\n+msgstr \"修订合并提交描述:\"\n+\n+#: git-gui.sh:2233\n+msgid \"Merge Commit Message:\"\n+msgstr \"合并提交描述:\"\n+\n+#: git-gui.sh:2234\n+msgid \"Commit Message:\"\n+msgstr \"提交描述:\"\n+\n+#: git-gui.sh:2279 git-gui.sh:2417 lib/console.tcl:73\n+msgid \"Copy All\"\n+msgstr \"全部复制\"\n+\n+#: git-gui.sh:2303 lib/blame.tcl:104\n+msgid \"File:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2405\n+msgid \"Refresh\"\n+msgstr \"刷新\"\n+\n+#: git-gui.sh:2426\n+msgid \"Apply/Reverse Hunk\"\n+msgstr \"应用/撤消此修改块\"\n+\n+#: git-gui.sh:2432\n+msgid \"Decrease Font Size\"\n+msgstr \"缩小字体\"\n+\n+#: git-gui.sh:2436\n+msgid \"Increase Font Size\"\n+msgstr \"放大字体\"\n+\n+#: git-gui.sh:2441\n+msgid \"Show Less Context\"\n+msgstr \"显示更多diff上下文\"\n+\n+#: git-gui.sh:2448\n+msgid \"Show More Context\"\n+msgstr \"显示更少diff上下文\"\n+\n+#: git-gui.sh:2461\n+#, fuzzy\n+msgid \"Unstage Hunk From Commit\"\n+msgstr \"从本次提交移除\"\n+\n+#: git-gui.sh:2463\n+#, fuzzy\n+msgid \"Stage Hunk For Commit\"\n+msgstr \"从本次提交移除\"\n+\n+#: git-gui.sh:2473\n+msgid \"Initializing...\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:77\n+msgid \"File Viewer\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:81\n+#, fuzzy\n+msgid \"Commit:\"\n+msgstr \"提交\"\n+\n+#: lib/blame.tcl:249\n+#, fuzzy\n+msgid \"Copy Commit\"\n+msgstr \"提交\"\n+\n+#: lib/blame.tcl:369\n+#, tcl-format\n+msgid \"Reading %s...\"\n+msgstr \"\"\n+\n+#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19\n+#, fuzzy\n+msgid \"Checkout Branch\"\n+msgstr \"当前分支:\"\n+\n+#: lib/branch_checkout.tcl:23\n+#, fuzzy\n+msgid \"Checkout\"\n+msgstr \"切换...\"\n+\n+#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35\n+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:269\n+#: lib/checkout_op.tcl:519 lib/merge.tcl:176 lib/option.tcl:172\n+#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92\n+msgid \"Cancel\"\n+msgstr \"\"\n+\n+#: lib/branch_checkout.tcl:32 lib/browser.tcl:274\n+msgid \"Revision\"\n+msgstr \"\"\n+\n+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159\n+#: lib/option.tcl:274\n+#, fuzzy\n+msgid \"Options\"\n+msgstr \"选项...\"\n+\n+#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92\n+msgid \"Fetch Tracking Branch\"\n+msgstr \"\"\n+\n+#: lib/branch_checkout.tcl:44\n+msgid \"Detach From Local Branch\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:22\n+#, fuzzy\n+msgid \"Create Branch\"\n+msgstr \"当前分支:\"\n+\n+#: lib/branch_create.tcl:27\n+#, fuzzy\n+msgid \"Create New Branch\"\n+msgstr \"当前分支:\"\n+\n+#: lib/branch_create.tcl:31\n+#, fuzzy\n+msgid \"Create\"\n+msgstr \"新建...\"\n+\n+#: lib/branch_create.tcl:40\n+#, fuzzy\n+msgid \"Branch Name\"\n+msgstr \"分支\"\n+\n+#: lib/branch_create.tcl:43\n+msgid \"Name:\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:58\n+msgid \"Match Tracking Branch Name\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:66\n+msgid \"Starting Revision\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:72\n+msgid \"Update Existing Branch:\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:75\n+msgid \"No\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:80\n+msgid \"Fast Forward Only\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:511\n+#, fuzzy\n+msgid \"Reset\"\n+msgstr \"重置所有修动...\"\n+\n+#: lib/branch_create.tcl:97\n+msgid \"Checkout After Creation\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:131\n+msgid \"Please select a tracking branch.\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:140\n+#, tcl-format\n+msgid \"Tracking branch %s is not a branch in the remote repository.\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86\n+msgid \"Please supply a branch name.\"\n+msgstr \"\"\n+\n+#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106\n+#, tcl-format\n+msgid \"'%s' is not an acceptable branch name.\"\n+msgstr \"\"\n+\n+#: lib/branch_delete.tcl:15\n+#, fuzzy\n+msgid \"Delete Branch\"\n+msgstr \"当前分支:\"\n+\n+#: lib/branch_delete.tcl:20\n+msgid \"Delete Local Branch\"\n+msgstr \"\"\n+\n+#: lib/branch_delete.tcl:37\n+#, fuzzy\n+msgid \"Local Branches\"\n+msgstr \"分支\"\n+\n+#: lib/branch_delete.tcl:52\n+msgid \"Delete Only If Merged Into\"\n+msgstr \"\"\n+\n+#: lib/branch_delete.tcl:54\n+msgid \"Always (Do not perform merge test.)\"\n+msgstr \"\"\n+\n+#: lib/branch_delete.tcl:103\n+#, tcl-format\n+msgid \"The following branches are not completely merged into %s:\"\n+msgstr \"\"\n+\n+#: lib/branch_delete.tcl:115\n+msgid \"\"\n+\"Recovering deleted branches is difficult. \\n\"\n+\"\\n\"\n+\" Delete the selected branches?\"\n+msgstr \"\"\n+\n+#: lib/branch_delete.tcl:141\n+#, tcl-format\n+msgid \"\"\n+\"Failed to delete branches:\\n\"\n+\"%s\"\n+msgstr \"\"\n+\n+#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22\n+#, fuzzy\n+msgid \"Rename Branch\"\n+msgstr \"当前分支:\"\n+\n+#: lib/branch_rename.tcl:26\n+#, fuzzy\n+msgid \"Rename\"\n+msgstr \"改名...\"\n+\n+#: lib/branch_rename.tcl:36\n+#, fuzzy\n+msgid \"Branch:\"\n+msgstr \"分支\"\n+\n+#: lib/branch_rename.tcl:39\n+msgid \"New Name:\"\n+msgstr \"\"\n+\n+#: lib/branch_rename.tcl:75\n+msgid \"Please select a branch to rename.\"\n+msgstr \"\"\n+\n+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179\n+#, tcl-format\n+msgid \"Branch '%s' already exists.\"\n+msgstr \"\"\n+\n+#: lib/branch_rename.tcl:117\n+#, tcl-format\n+msgid \"Failed to rename '%s'.\"\n+msgstr \"\"\n+\n+#: lib/browser.tcl:10\n+msgid \"Starting...\"\n+msgstr \"\"\n+\n+#: lib/browser.tcl:19\n+msgid \"File Browser\"\n+msgstr \"\"\n+\n+#: lib/browser.tcl:120 lib/browser.tcl:137\n+#, tcl-format\n+msgid \"Loading %s...\"\n+msgstr \"\"\n+\n+#: lib/browser.tcl:254 lib/browser.tcl:260\n+#, fuzzy\n+msgid \"Browse Branch Files\"\n+msgstr \"浏览当前分支文件\"\n+\n+#: lib/browser.tcl:265\n+msgid \"Browse\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:79\n+#, tcl-format\n+msgid \"Fetching %s from %s\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31\n+msgid \"Close\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:169\n+#, tcl-format\n+msgid \"Branch '%s' does not exist.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:205\n+#, tcl-format\n+msgid \"\"\n+\"Branch '%s' already exists.\\n\"\n+\"\\n\"\n+\"It cannot fast-forward to %s.\\n\"\n+\"A merge is required.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:219\n+#, tcl-format\n+msgid \"Merge strategy '%s' not supported.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:238\n+#, tcl-format\n+msgid \"Failed to update '%s'.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:250\n+msgid \"Index is already locked.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:265\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before the current branch can be changed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:352\n+#, tcl-format\n+msgid \"Aborted checkout of '%s' (file level merging is required).\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:353\n+msgid \"File level merge required.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:357\n+#, tcl-format\n+msgid \"Staying on branch '%s'.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:426\n+msgid \"\"\n+\"You are no longer on a local branch.\\n\"\n+\"\\n\"\n+\"If you wanted to be on a branch, create one now starting from 'This Detached \"\n+\"Checkout'.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:475\n+#, tcl-format\n+msgid \"Resetting '%s' to '%s' will lose the following commits:\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:497\n+msgid \"Recovering lost commits may not be easy.\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:502\n+#, tcl-format\n+msgid \"Reset '%s'?\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:507 lib/merge.tcl:171\n+msgid \"Visualize\"\n+msgstr \"\"\n+\n+#: lib/checkout_op.tcl:575\n+#, tcl-format\n+msgid \"\"\n+\"Failed to set current branch.\\n\"\n+\"\\n\"\n+\"This working directory is only partially switched.  We successfully updated \"\n+\"your files, but failed to update an internal Git file.\\n\"\n+\"\\n\"\n+\"This should not have occurred.  %s will now close and give up.\"\n+msgstr \"\"\n+\n+#: lib/choose_rev.tcl:35\n+msgid \"This Detached Checkout\"\n+msgstr \"\"\n+\n+#: lib/choose_rev.tcl:42\n+msgid \"Revision Expression:\"\n+msgstr \"\"\n+\n+#: lib/choose_rev.tcl:56\n+#, fuzzy\n+msgid \"Local Branch\"\n+msgstr \"分支\"\n+\n+#: lib/choose_rev.tcl:61\n+#, fuzzy\n+msgid \"Tracking Branch\"\n+msgstr \"当前分支:\"\n+\n+#: lib/choose_rev.tcl:66\n+msgid \"Tag\"\n+msgstr \"\"\n+\n+#: lib/choose_rev.tcl:227\n+#, tcl-format\n+msgid \"Invalid revision: %s\"\n+msgstr \"\"\n+\n+#: lib/choose_rev.tcl:248\n+msgid \"No revision selected.\"\n+msgstr \"\"\n+\n+#: lib/choose_rev.tcl:256\n+msgid \"Revision expression is empty.\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:9\n+msgid \"\"\n+\"There is nothing to amend.\\n\"\n+\"\\n\"\n+\"You are about to create the initial commit.  There is no commit before this \"\n+\"to amend.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:18\n+msgid \"\"\n+\"Cannot amend while merging.\\n\"\n+\"\\n\"\n+\"You are currently in the middle of a merge that has not been fully \"\n+\"completed.  You cannot amend the prior commit unless you first abort the \"\n+\"current merge activity.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:49\n+msgid \"Error loading commit data for amend:\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:76\n+msgid \"Unable to obtain your identity:\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:81\n+msgid \"Invalid GIT_COMMITTER_IDENT:\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:133\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before another commit can be created.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:154\n+#, tcl-format\n+msgid \"\"\n+\"Unmerged files cannot be committed.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.  You must resolve them and add the file before \"\n+\"committing.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:162\n+#, tcl-format\n+msgid \"\"\n+\"Unknown file state %s detected.\\n\"\n+\"\\n\"\n+\"File %s cannot be committed by this program.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:170\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"You must add at least 1 file before you can commit.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:183\n+msgid \"\"\n+\"Please supply a commit message.\\n\"\n+\"\\n\"\n+\"A good commit message has the following format:\\n\"\n+\"\\n\"\n+\"- First line: Describe in one sentance what you did.\\n\"\n+\"- Second line: Blank\\n\"\n+\"- Remaining lines: Describe why this change is good.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:257\n+msgid \"write-tree failed:\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:279\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"No files were modified by this commit and it was not a merge commit.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:286\n+msgid \"No changes to commit.\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:317\n+msgid \"commit-tree failed:\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:339\n+msgid \"update-ref failed:\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:430\n+#, tcl-format\n+msgid \"Created commit %s: %s\"\n+msgstr \"\"\n+\n+#: lib/console.tcl:55\n+msgid \"Working... please wait...\"\n+msgstr \"\"\n+\n+#: lib/console.tcl:184\n+msgid \"Success\"\n+msgstr \"\"\n+\n+#: lib/console.tcl:194\n+msgid \"Error: Command Failed\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:43\n+msgid \"Number of loose objects\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:44\n+msgid \"Disk space used by loose objects\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:45\n+msgid \"Number of packed objects\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:46\n+msgid \"Number of packs\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:47\n+msgid \"Disk space used by packed objects\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:48\n+msgid \"Packed objects waiting for pruning\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:49\n+msgid \"Garbage files\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:72\n+#, fuzzy\n+msgid \"Compressing the object database\"\n+msgstr \"压缩数据库\"\n+\n+#: lib/database.tcl:83\n+msgid \"Verifying the object database with fsck-objects\"\n+msgstr \"\"\n+\n+#: lib/diff.tcl:42\n+#, tcl-format\n+msgid \"\"\n+\"No differences detected.\\n\"\n+\"\\n\"\n+\"%s has no changes.\\n\"\n+\"\\n\"\n+\"The modification date of this file was updated by another application, but \"\n+\"the content within the file was not changed.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started to find other files which may have \"\n+\"the same state.\"\n+msgstr \"\"\n+\n+#: lib/diff.tcl:97\n+msgid \"Error loading file:\"\n+msgstr \"\"\n+\n+#: lib/diff.tcl:162\n+msgid \"Error loading diff:\"\n+msgstr \"\"\n+\n+#: lib/diff.tcl:278\n+msgid \"Failed to unstage selected hunk.\"\n+msgstr \"\"\n+\n+#: lib/diff.tcl:285\n+msgid \"Failed to stage selected hunk.\"\n+msgstr \"\"\n+\n+#: lib/error.tcl:12 lib/error.tcl:102\n+msgid \"error\"\n+msgstr \"\"\n+\n+#: lib/error.tcl:28\n+msgid \"warning\"\n+msgstr \"\"\n+\n+#: lib/error.tcl:81\n+msgid \"You must correct the above errors before committing.\"\n+msgstr \"\"\n+\n+#: lib/index.tcl:364\n+#, fuzzy, tcl-format\n+msgid \"Revert changes in file %s?\"\n+msgstr \"恢复修改\"\n+\n+#: lib/index.tcl:366\n+#, tcl-format\n+msgid \"Revert changes in these %i files?\"\n+msgstr \"\"\n+\n+#: lib/index.tcl:372\n+msgid \"Any unadded changes will be permanently lost by the revert.\"\n+msgstr \"\"\n+\n+#: lib/index.tcl:375\n+msgid \"Do Nothing\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:14\n+msgid \"\"\n+\"Cannot merge while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit before starting any type of merge.\\n\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:28\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before a merge can be performed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:45\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a conflicted merge.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.\\n\"\n+\"\\n\"\n+\"You must resolve them, add the file, and commit to complete the current \"\n+\"merge.  Only then can you begin another merge.\\n\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:55\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a change.\\n\"\n+\"\\n\"\n+\"File %s is modified.\\n\"\n+\"\\n\"\n+\"You should complete the current commit before starting a merge.  Doing so \"\n+\"will help you abort a failed merge, should the need arise.\\n\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:94\n+#, tcl-format\n+msgid \"Merging %s and %s\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:106\n+msgid \"Merge completed successfully.\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:108\n+msgid \"Merge failed.  Conflict resolution is required.\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:166\n+#, tcl-format\n+msgid \"Merge Into %s\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:181 lib/transport.tcl:98\n+#, fuzzy\n+msgid \"Source Branches\"\n+msgstr \"当前分支:\"\n+\n+#: lib/merge.tcl:240\n+msgid \"\"\n+\"Cannot abort while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit.\\n\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:250\n+msgid \"\"\n+\"Abort merge?\\n\"\n+\"\\n\"\n+\"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\\n\"\n+\"\\n\"\n+\"Continue with aborting the current merge?\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:256\n+msgid \"\"\n+\"Abort commit?\\n\"\n+\"\\n\"\n+\"Aborting the current commit will cause *ALL* uncommitted changes to be \"\n+\"lost.\\n\"\n+\"\\n\"\n+\"Continue with aborting the current commit?\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:267\n+msgid \"Aborting... please wait...\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:290\n+msgid \"Abort completed.  Ready.\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:77\n+msgid \"git-gui - a graphical user interface for Git.\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:164\n+msgid \"Restore Defaults\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:168\n+msgid \"Save\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:178\n+#, fuzzy, tcl-format\n+msgid \"%s Repository\"\n+msgstr \"版本树\"\n+\n+#: lib/option.tcl:179\n+msgid \"Global (All Repositories)\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:185\n+msgid \"User Name\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:186\n+msgid \"Email Address\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:188\n+#, fuzzy\n+msgid \"Summarize Merge Commits\"\n+msgstr \"修订合并提交描述:\"\n+\n+#: lib/option.tcl:189\n+msgid \"Merge Verbosity\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:190\n+msgid \"Show Diffstat After Merge\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:192\n+msgid \"Trust File Modification Timestamps\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:193\n+msgid \"Prune Tracking Branches During Fetch\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:194\n+msgid \"Match Tracking Branches\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:195\n+msgid \"Number of Diff Context Lines\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:196\n+msgid \"New Branch Name Template\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:305\n+msgid \"Failed to completely save options:\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34\n+msgid \"Delete Remote Branch\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:47\n+#, fuzzy\n+msgid \"From Repository\"\n+msgstr \"版本树\"\n+\n+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118\n+msgid \"Remote:\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133\n+msgid \"Arbitrary URL:\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:84\n+#, fuzzy\n+msgid \"Branches\"\n+msgstr \"分支\"\n+\n+#: lib/remote_branch_delete.tcl:109\n+#, fuzzy\n+msgid \"Delete Only If\"\n+msgstr \"删除\"\n+\n+#: lib/remote_branch_delete.tcl:111\n+msgid \"Merged Into:\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:119\n+msgid \"Always (Do not perform merge checks)\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:152\n+msgid \"A branch is required for 'Merged Into'.\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:189\n+#, tcl-format\n+msgid \"\"\n+\"One or more of the merge tests failed because you have not fetched the \"\n+\"necessary commits.  Try fetching from %s first.\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:207\n+msgid \"Please select one or more branches to delete.\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:216\n+msgid \"\"\n+\"Recovering deleted branches is difficult.\\n\"\n+\"\\n\"\n+\"Delete the selected branches?\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:226\n+#, tcl-format\n+msgid \"Deleting branches from %s\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:286\n+msgid \"No repository selected.\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:291\n+#, tcl-format\n+msgid \"Scanning %s...\"\n+msgstr \"\"\n+\n+#: lib/remote.tcl:156\n+#, tcl-format\n+msgid \"Fetch from %s...\"\n+msgstr \"\"\n+\n+#: lib/remote.tcl:166\n+#, tcl-format\n+msgid \"Prune from %s...\"\n+msgstr \"\"\n+\n+#: lib/remote.tcl:200\n+#, fuzzy, tcl-format\n+msgid \"Push to %s...\"\n+msgstr \"上传...\"\n+\n+#: lib/shortcut.tcl:26 lib/shortcut.tcl:74\n+msgid \"Cannot write script:\"\n+msgstr \"\"\n+\n+#: lib/shortcut.tcl:149\n+msgid \"Cannot write icon:\"\n+msgstr \"\"\n+\n+#: lib/status_bar.tcl:58\n+#, tcl-format\n+msgid \"%s ... %i of %i %s (%2i%%)\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:7\n+#, tcl-format\n+msgid \"Fetching new changes from %s\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:19\n+#, tcl-format\n+msgid \"Pruning tracking branches deleted from %s\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:26\n+#, tcl-format\n+msgid \"Pushing changes to %s\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:68\n+#, tcl-format\n+msgid \"Pushing %s %s to %s\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:84\n+#, fuzzy\n+msgid \"Push Branches\"\n+msgstr \"分支\"\n+\n+#: lib/transport.tcl:115\n+#, fuzzy\n+msgid \"Destination Repository\"\n+msgstr \"版本树\"\n+\n+#: lib/transport.tcl:153\n+msgid \"Transfer Options\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:155\n+msgid \"Use thin pack (for slow network connections)\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:159\n+msgid \"Include tags\"\n+msgstr \"\"\n-- \n1.5.3.2.g46909\n\n"},{"id":"52229","messageId":"Pine.LNX.4.64.0709021735210.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 10/15] Japanese translation of git-gui","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:35:33Z","receivedAt":"2007-09-02T16:35:33Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nFrom: =?utf-8?q?=E3=81=97=E3=82=89=E3=81=84=E3=81=97=E3=81=AA=E3=81=AA=E3=81=93?= <nanako3@bluebottle.com>\n\n[jes: Also includes work from Junio Hamano]\n\nSigned-off-by: しらいしななこ <nanako3@bluebottle.com>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n po/ja.po | 1381 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 1381 insertions(+), 0 deletions(-)\n create mode 100644 po/ja.po\n\ndiff --git a/po/ja.po b/po/ja.po\nnew file mode 100644\nindex 0000000..1713908\n--- /dev/null\n+++ b/po/ja.po\n@@ -0,0 +1,1381 @@\n+# Translation of git-gui to Japanese\n+# Copyright (C) 2007 Shawn Pearce\n+# This file is distributed under the same license as the git-gui package.\n+# しらいし ななこ <nanako3@bluebottle.com>, 2007.\n+#\n+#, fuzzy\n+msgid \"\"\n+msgstr \"\"\n+\"Project-Id-Version: git-gui\\n\"\n+\"Report-Msgid-Bugs-To: \\n\"\n+\"POT-Creation-Date: 2007-08-11 17:28+0200\\n\"\n+\"PO-Revision-Date: 2007-08-14 18:49+0900\\n\"\n+\"Last-Translator: しらいし ななこ <nanako3@bluebottle.com>\\n\"\n+\"Language-Team: Japanese\\n\"\n+\"MIME-Version: 1.0\\n\"\n+\"Content-Type: text/plain; charset=UTF-8\\n\"\n+\"Content-Transfer-Encoding: 8bit\\n\"\n+\n+#: git-gui.sh:531\n+msgid \"Cannot find git in PATH.\"\n+msgstr \"PATH 中に git が見つかりません\"\n+\n+#: git-gui.sh:550\n+msgid \"Cannot parse Git version string:\"\n+msgstr \"Git バージョン名が理解できません:\"\n+\n+#: git-gui.sh:567\n+#, tcl-format\n+msgid \"\"\n+\"Git version cannot be determined.\\n\"\n+\"\\n\"\n+\"%s claims it is version '%s'.\\n\"\n+\"\\n\"\n+\"%s requires at least Git 1.5.0 or later.\\n\"\n+\"\\n\"\n+\"Assume '%s' is version 1.5.0?\\n\"\n+msgstr \"\"\n+\"Git のバージョンが確認できません。\\n\"\n+\"\\n\"\n+\"%s はバージョン '%s' とのことです。\\n\"\n+\"\\n\"\n+\"%s は最低でも 1.5.0 かそれ以降の Git が必要です\\n\"\n+\"\\n\"\n+\"'%s' はバージョン 1.5.0 と思って良いですか？\\n\"\n+\n+#: git-gui.sh:689\n+msgid \"Cannot find the git directory:\"\n+msgstr \"git ディレクトリが見つかりません:\"\n+\n+#: git-gui.sh:697\n+msgid \"Git directory not found:\"\n+msgstr \"Git ディレクトリが見つかりません:\"\n+\n+#: git-gui.sh:703\n+msgid \"Cannot use funny .git directory:\"\n+msgstr \"変な .git ディレクトリは使えません\"\n+\n+#: git-gui.sh:708\n+msgid \"No working directory\"\n+msgstr \"作業ディレクトリがありません\"\n+\n+#: git-gui.sh:854\n+msgid \"Refreshing file status...\"\n+msgstr \"ファイル状態を更新しています…\"\n+\n+#: git-gui.sh:891\n+msgid \"Scanning for modified files ...\"\n+msgstr \"変更されたファイルをスキャンしています…\"\n+\n+#: git-gui.sh:1057 lib/browser.tcl:247\n+msgid \"Ready.\"\n+msgstr \"準備完了\"\n+\n+#: git-gui.sh:1322\n+msgid \"Unmodified\"\n+msgstr \"変更無し\"\n+\n+#: git-gui.sh:1324\n+msgid \"Modified, not staged\"\n+msgstr \"変更あり、コミット未予定\"\n+\n+#: git-gui.sh:1325 git-gui.sh:1330\n+msgid \"Staged for commit\"\n+msgstr \"コミット予定済\"\n+\n+#: git-gui.sh:1326 git-gui.sh:1331\n+msgid \"Portions staged for commit\"\n+msgstr \"部分的にコミット予定済\"\n+\n+#: git-gui.sh:1327 git-gui.sh:1332\n+msgid \"Staged for commit, missing\"\n+msgstr \"コミット予定済、ファイル無し\"\n+\n+#: git-gui.sh:1329\n+msgid \"Untracked, not staged\"\n+msgstr \"管理外、コミット未予定\"\n+\n+#: git-gui.sh:1334\n+msgid \"Missing\"\n+msgstr \"ファイル無し\"\n+\n+#: git-gui.sh:1335\n+msgid \"Staged for removal\"\n+msgstr \"削除予定済\"\n+\n+#: git-gui.sh:1336\n+msgid \"Staged for removal, still present\"\n+msgstr \"削除予定済、ファイル未削除\"\n+\n+#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341\n+msgid \"Requires merge resolution\"\n+msgstr \"要マージ解決\"\n+\n+#: git-gui.sh:1383\n+msgid \"Starting gitk... please wait...\"\n+msgstr \"gitk を起動中…お待ち下さい…\"\n+\n+#: git-gui.sh:1392\n+#, tcl-format\n+msgid \"\"\n+\"Unable to start gitk:\\n\"\n+\"\\n\"\n+\"%s does not exist\"\n+msgstr \"\"\n+\"gitk を起動できません:\\n\"\n+\"\\n\"\n+\"%s がありません\"\n+\n+#: git-gui.sh:1609\n+#, tcl-format\n+msgid \"Invalid font specified in gui.%s:\"\n+msgstr \"gui.%s に無効なフォントが指定されています:\"\n+\n+#: git-gui.sh:1634\n+msgid \"Main Font\"\n+msgstr \"主フォント\"\n+\n+#: git-gui.sh:1635\n+msgid \"Diff/Console Font\"\n+msgstr \"diff/コンソール・フォント\"\n+\n+#: git-gui.sh:1649\n+msgid \"Repository\"\n+msgstr \"リポジトリ\"\n+\n+#: git-gui.sh:1650\n+msgid \"Edit\"\n+msgstr \"編集\"\n+\n+#: git-gui.sh:1652\n+msgid \"Branch\"\n+msgstr \"ブランチ\"\n+\n+#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152\n+msgid \"Commit\"\n+msgstr \"コミット\"\n+\n+#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168\n+msgid \"Merge\"\n+msgstr \"マージ\"\n+\n+#: git-gui.sh:1659\n+msgid \"Fetch\"\n+msgstr \"フェッチ\"\n+\n+#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172\n+msgid \"Push\"\n+msgstr \"プッシュ\"\n+\n+#: git-gui.sh:1669\n+msgid \"Browse Current Branch's Files\"\n+msgstr \"現在のブランチのファイルを見る\"\n+\n+#: git-gui.sh:1673\n+msgid \"Browse Branch Files...\"\n+msgstr \"ブランチのファイルを見る…\"\n+\n+#: git-gui.sh:1678\n+msgid \"Visualize Current Branch's History\"\n+msgstr \"現在のブランチの履歴を見る\"\n+\n+#: git-gui.sh:1682\n+msgid \"Visualize All Branch History\"\n+msgstr \"全てのブランチの履歴を見る\"\n+\n+#: git-gui.sh:1689\n+#, tcl-format\n+msgid \"Browse %s's Files\"\n+msgstr \"ブランチ %s のファイルを見る\"\n+\n+#: git-gui.sh:1691\n+#, tcl-format\n+msgid \"Visualize %s's History\"\n+msgstr \"ブランチ %s の履歴を見る\"\n+\n+#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67\n+msgid \"Database Statistics\"\n+msgstr \"データベース統計\"\n+\n+#: git-gui.sh:1699 lib/database.tcl:34\n+msgid \"Compress Database\"\n+msgstr \"データベース圧縮\"\n+\n+#: git-gui.sh:1702\n+msgid \"Verify Database\"\n+msgstr \"データベース検証\"\n+\n+#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9\n+#: lib/shortcut.tcl:45 lib/shortcut.tcl:84\n+msgid \"Create Desktop Icon\"\n+msgstr \"デスクトップ・アイコンを作る\"\n+\n+#: git-gui.sh:1722\n+msgid \"Quit\"\n+msgstr \"終了\"\n+\n+#: git-gui.sh:1729\n+msgid \"Undo\"\n+msgstr \"元に戻す\"\n+\n+#: git-gui.sh:1732\n+msgid \"Redo\"\n+msgstr \"やり直し\"\n+\n+#: git-gui.sh:1736 git-gui.sh:2222\n+msgid \"Cut\"\n+msgstr \"切り取り\"\n+\n+#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368\n+#: lib/console.tcl:69\n+msgid \"Copy\"\n+msgstr \"コピー\"\n+\n+#: git-gui.sh:1742 git-gui.sh:2228\n+msgid \"Paste\"\n+msgstr \"貼り付け\"\n+\n+#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26\n+#: lib/remote_branch_delete.tcl:38\n+msgid \"Delete\"\n+msgstr \"削除\"\n+\n+#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71\n+msgid \"Select All\"\n+msgstr \"全て選択\"\n+\n+#: git-gui.sh:1758\n+msgid \"Create...\"\n+msgstr \"作成…\"\n+\n+#: git-gui.sh:1764\n+msgid \"Checkout...\"\n+msgstr \"チェックアウト\"\n+\n+#: git-gui.sh:1770\n+msgid \"Rename...\"\n+msgstr \"名前変更…\"\n+\n+#: git-gui.sh:1775 git-gui.sh:1873\n+msgid \"Delete...\"\n+msgstr \"削除…\"\n+\n+#: git-gui.sh:1780\n+msgid \"Reset...\"\n+msgstr \"リセット…\"\n+\n+#: git-gui.sh:1792 git-gui.sh:2169\n+msgid \"New Commit\"\n+msgstr \"新規コミット\"\n+\n+#: git-gui.sh:1800 git-gui.sh:2176\n+msgid \"Amend Last Commit\"\n+msgstr \"最新コミットを訂正\"\n+\n+#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99\n+msgid \"Rescan\"\n+msgstr \"再スキャン\"\n+\n+#: git-gui.sh:1815\n+msgid \"Stage To Commit\"\n+msgstr \"コミット予定する\"\n+\n+#: git-gui.sh:1820\n+msgid \"Stage Changed Files To Commit\"\n+msgstr \"変更されたファイルをコミット予定\"\n+\n+#: git-gui.sh:1826\n+msgid \"Unstage From Commit\"\n+msgstr \"コミットから降ろす\"\n+\n+#: git-gui.sh:1831 lib/index.tcl:376\n+msgid \"Revert Changes\"\n+msgstr \"変更を元に戻す\"\n+\n+#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246\n+msgid \"Sign Off\"\n+msgstr \"署名\"\n+\n+#: git-gui.sh:1853\n+msgid \"Local Merge...\"\n+msgstr \"ローカル・マージ…\"\n+\n+#: git-gui.sh:1858\n+msgid \"Abort Merge...\"\n+msgstr \"マージ中止…\"\n+\n+#: git-gui.sh:1870\n+msgid \"Push...\"\n+msgstr \"プッシュ…\"\n+\n+#: git-gui.sh:1880\n+msgid \"Apple\"\n+msgstr \"りんご\"\n+\n+#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65\n+#, tcl-format\n+msgid \"About %s\"\n+msgstr \"%s について\"\n+\n+#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414\n+msgid \"Options...\"\n+msgstr \"オプション…\"\n+\n+#: git-gui.sh:1897\n+msgid \"Help\"\n+msgstr \"ヘルプ\"\n+\n+#: git-gui.sh:1938\n+msgid \"Online Documentation\"\n+msgstr \"オンライン・ドキュメント\"\n+\n+#: git-gui.sh:2054\n+msgid \"Current Branch:\"\n+msgstr \"現在のブランチ\"\n+\n+#: git-gui.sh:2075\n+msgid \"Staged Changes (Will Be Committed)\"\n+msgstr \"ステージングされた（コミット予定済の）変更\"\n+\n+#: git-gui.sh:2095\n+msgid \"Unstaged Changes (Will Not Be Committed)\"\n+msgstr \"ステージングされていない（コミット未予定の）変更\"\n+\n+#: git-gui.sh:2142\n+msgid \"Stage Changed\"\n+msgstr \"変更をコミット予定に入れる\"\n+\n+#: git-gui.sh:2188\n+msgid \"Initial Commit Message:\"\n+msgstr \"最初のコミットメッセージ:\"\n+\n+#: git-gui.sh:2189\n+msgid \"Amended Commit Message:\"\n+msgstr \"訂正したコミットメッセージ:\"\n+\n+#: git-gui.sh:2190\n+msgid \"Amended Initial Commit Message:\"\n+msgstr \"訂正した最初のコミットメッセージ:\"\n+\n+#: git-gui.sh:2191\n+msgid \"Amended Merge Commit Message:\"\n+msgstr \"訂正したマージコミットメッセージ:\"\n+\n+#: git-gui.sh:2192\n+msgid \"Merge Commit Message:\"\n+msgstr \"マージコミットメッセージ:\"\n+\n+#: git-gui.sh:2193\n+msgid \"Commit Message:\"\n+msgstr \"コミットメッセージ:\"\n+\n+#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73\n+msgid \"Copy All\"\n+msgstr \"全てコピー\"\n+\n+#: git-gui.sh:2262 lib/blame.tcl:104\n+msgid \"File:\"\n+msgstr \"ファイル:\"\n+\n+#: git-gui.sh:2364\n+msgid \"Refresh\"\n+msgstr \"再読み込み\"\n+\n+#: git-gui.sh:2385\n+msgid \"Apply/Reverse Hunk\"\n+msgstr \"パッチを適用/取り消す\"\n+\n+#: git-gui.sh:2391\n+msgid \"Decrease Font Size\"\n+msgstr \"フォントを小さく\"\n+\n+#: git-gui.sh:2395\n+msgid \"Increase Font Size\"\n+msgstr \"フォントを大きく\"\n+\n+#: git-gui.sh:2400\n+msgid \"Show Less Context\"\n+msgstr \"文脈を少なく\"\n+\n+#: git-gui.sh:2407\n+msgid \"Show More Context\"\n+msgstr \"文脈を多く\"\n+\n+#: git-gui.sh:2422\n+msgid \"Unstage Hunk From Commit\"\n+msgstr \"パッチをコミット予定から外す\"\n+\n+#: git-gui.sh:2426 git-gui.sh:2430\n+msgid \"Stage Hunk For Commit\"\n+msgstr \"パッチをコミット予定に加える\"\n+\n+#: git-gui.sh:2440\n+msgid \"Initializing...\"\n+msgstr \"初期化しています…\"\n+\n+#: lib/blame.tcl:77\n+msgid \"File Viewer\"\n+msgstr \"ファイルピューワ\"\n+\n+#: lib/blame.tcl:81\n+msgid \"Commit:\"\n+msgstr \"コミット:\"\n+\n+#: lib/blame.tcl:249\n+msgid \"Copy Commit\"\n+msgstr \"コミットをコピー\"\n+\n+#: lib/blame.tcl:369\n+#, tcl-format\n+msgid \"Reading %s...\"\n+msgstr \"%s を読んでいます…\"\n+\n+#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19\n+msgid \"Checkout Branch\"\n+msgstr \"ブランチをチェックアウト\"\n+\n+#: lib/branch_checkout.tcl:23\n+msgid \"Checkout\"\n+msgstr \"チェックアウト\"\n+\n+#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35\n+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:283\n+#: lib/checkout_op.tcl:522 lib/merge.tcl:172 lib/option.tcl:172\n+#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92\n+msgid \"Cancel\"\n+msgstr \"中止\"\n+\n+#: lib/branch_checkout.tcl:32 lib/browser.tcl:288\n+msgid \"Revision\"\n+msgstr \"リビジョン\"\n+\n+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159\n+#: lib/option.tcl:274\n+msgid \"Options\"\n+msgstr \"オプション\"\n+\n+#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92\n+msgid \"Fetch Tracking Branch\"\n+msgstr \"トラッキング・ブランチをフェッチ\"\n+\n+#: lib/branch_checkout.tcl:44\n+msgid \"Detach From Local Branch\"\n+msgstr \"ローカル・ブランチから削除\"\n+\n+#: lib/branch_create.tcl:22\n+msgid \"Create Branch\"\n+msgstr \"ブランチを作成\"\n+\n+#: lib/branch_create.tcl:27\n+msgid \"Create New Branch\"\n+msgstr \"ブランチを新規作成\"\n+\n+#: lib/branch_create.tcl:31\n+msgid \"Create\"\n+msgstr \"作成\"\n+\n+#: lib/branch_create.tcl:40\n+msgid \"Branch Name\"\n+msgstr \"ブランチ名\"\n+\n+#: lib/branch_create.tcl:43\n+msgid \"Name:\"\n+msgstr \"名前:\"\n+\n+#: lib/branch_create.tcl:58\n+msgid \"Match Tracking Branch Name\"\n+msgstr \"トラッキング・ブランチ名を合わせる\"\n+\n+#: lib/branch_create.tcl:66\n+msgid \"Starting Revision\"\n+msgstr \"初期リビジョン\"\n+\n+#: lib/branch_create.tcl:72\n+msgid \"Update Existing Branch:\"\n+msgstr \"既存のブランチを更新:\"\n+\n+#: lib/branch_create.tcl:75\n+msgid \"No\"\n+msgstr \"いいえ\"\n+\n+#: lib/branch_create.tcl:80\n+msgid \"Fast Forward Only\"\n+msgstr \"早送りのみ\"\n+\n+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514\n+msgid \"Reset\"\n+msgstr \"リセット\"\n+\n+#: lib/branch_create.tcl:97\n+msgid \"Checkout After Creation\"\n+msgstr \"作成してすぐチェックアウト\"\n+\n+#: lib/branch_create.tcl:131\n+msgid \"Please select a tracking branch.\"\n+msgstr \"トラッキング・ブランチを選択して下さい。\"\n+\n+#: lib/branch_create.tcl:140\n+#, tcl-format\n+msgid \"Tracking branch %s is not a branch in the remote repository.\"\n+msgstr \"トラッキング・ブランチ %s は遠隔リポジトリのブランチではありません。\"\n+\n+#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86\n+msgid \"Please supply a branch name.\"\n+msgstr \"ブランチ名を指定して下さい。\"\n+\n+#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106\n+#, tcl-format\n+msgid \"'%s' is not an acceptable branch name.\"\n+msgstr \"'%s' はブランチ名に使えません。\"\n+\n+#: lib/branch_delete.tcl:15\n+msgid \"Delete Branch\"\n+msgstr \"ブランチ削除\"\n+\n+#: lib/branch_delete.tcl:20\n+msgid \"Delete Local Branch\"\n+msgstr \"ローカル・ブランチを削除\"\n+\n+#: lib/branch_delete.tcl:37\n+msgid \"Local Branches\"\n+msgstr \"ローカル・ブランチ\"\n+\n+#: lib/branch_delete.tcl:52\n+msgid \"Delete Only If Merged Into\"\n+msgstr \"マージ済みの時のみ削除\"\n+\n+#: lib/branch_delete.tcl:54\n+msgid \"Always (Do not perform merge test.)\"\n+msgstr \"無条件(マージテストしない)\"\n+\n+#: lib/branch_delete.tcl:103\n+#, tcl-format\n+msgid \"The following branches are not completely merged into %s:\"\n+msgstr \"以下のブランチは %s に完全にマージされていません:\"\n+\n+#: lib/branch_delete.tcl:115\n+msgid \"\"\n+\"Recovering deleted branches is difficult. \\n\"\n+\"\\n\"\n+\" Delete the selected branches?\"\n+msgstr \"\"\n+\"ブランチを削除すると元に戻すのは困難です。 \\n\"\n+\"\\n\"\n+\" 選択したブランチを削除しますか？\"\n+\n+#: lib/branch_delete.tcl:141\n+#, tcl-format\n+msgid \"\"\n+\"Failed to delete branches:\\n\"\n+\"%s\"\n+msgstr \"\"\n+\"以下のブランチを削除できません:\\n\"\n+\"%s\"\n+\n+#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22\n+msgid \"Rename Branch\"\n+msgstr \"ブランチの名前変更\"\n+\n+#: lib/branch_rename.tcl:26\n+msgid \"Rename\"\n+msgstr \"名前変更\"\n+\n+#: lib/branch_rename.tcl:36\n+msgid \"Branch:\"\n+msgstr \"ブランチ:\"\n+\n+#: lib/branch_rename.tcl:39\n+msgid \"New Name:\"\n+msgstr \"新しい名前:\"\n+\n+#: lib/branch_rename.tcl:75\n+msgid \"Please select a branch to rename.\"\n+msgstr \"名前を変更するブランチを選んで下さい。\"\n+\n+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179\n+#, tcl-format\n+msgid \"Branch '%s' already exists.\"\n+msgstr \"'%s'というブランチは既に存在します。\"\n+\n+#: lib/branch_rename.tcl:117\n+#, tcl-format\n+msgid \"Failed to rename '%s'.\"\n+msgstr \"'%s'の名前変更に失敗しました。\"\n+\n+#: lib/browser.tcl:17\n+msgid \"Starting...\"\n+msgstr \"起動中…\"\n+\n+#: lib/browser.tcl:26\n+msgid \"File Browser\"\n+msgstr \"ファイル・ブラウザ\"\n+\n+#: lib/browser.tcl:127 lib/browser.tcl:144\n+#, tcl-format\n+msgid \"Loading %s...\"\n+msgstr \"%s をロード中…\"\n+\n+#: lib/browser.tcl:188\n+msgid \"[Up To Parent]\"\n+msgstr \"[上位フォルダへ]\"\n+\n+#: lib/browser.tcl:268 lib/browser.tcl:274\n+msgid \"Browse Branch Files\"\n+msgstr \"現在のブランチのファイルを見る\"\n+\n+#: lib/browser.tcl:279\n+msgid \"Browse\"\n+msgstr \"ブラウズ\"\n+\n+#: lib/checkout_op.tcl:79\n+#, tcl-format\n+msgid \"Fetching %s from %s\"\n+msgstr \"%s から %s をフェッチしています\"\n+\n+#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31\n+msgid \"Close\"\n+msgstr \"閉じる\"\n+\n+#: lib/checkout_op.tcl:169\n+#, tcl-format\n+msgid \"Branch '%s' does not exist.\"\n+msgstr \"ブランチ'%s'は存在しません。\"\n+\n+#: lib/checkout_op.tcl:206\n+#, tcl-format\n+msgid \"\"\n+\"Branch '%s' already exists.\\n\"\n+\"\\n\"\n+\"It cannot fast-forward to %s.\\n\"\n+\"A merge is required.\"\n+msgstr \"\"\n+\"ブランチ '%s' は既に存在します。\\n\"\n+\"\\n\"\n+\"%s に早送りできません。\\n\"\n+\"マージが必要です。\"\n+\n+#: lib/checkout_op.tcl:220\n+#, tcl-format\n+msgid \"Merge strategy '%s' not supported.\"\n+msgstr \"'%s' マージ戦略はサポートされていません。\"\n+\n+#: lib/checkout_op.tcl:239\n+#, tcl-format\n+msgid \"Failed to update '%s'.\"\n+msgstr \"'%s' の更新に失敗しました。\"\n+\n+#: lib/checkout_op.tcl:251\n+msgid \"Staging area (index) is already locked.\"\n+msgstr \"インデックスは既にロックされています。\"\n+\n+#: lib/checkout_op.tcl:266\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before the current branch can be changed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"最後にスキャンした状態はリポジトリの状態と合致しません。\\n\"\n+\"\\n\"\n+\"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。現在\"\n+\"のブランチを変更する前に、再スキャンが必要です。\\n\"\n+\"\\n\"\n+\"自動的に再スキャンを開始します。\\n\"\n+\n+#: lib/checkout_op.tcl:353\n+#, tcl-format\n+msgid \"Aborted checkout of '%s' (file level merging is required).\"\n+msgstr \"'%s' のチェックアウトを中止しました（ファイル毎のマージが必要です）。\"\n+\n+#: lib/checkout_op.tcl:354\n+msgid \"File level merge required.\"\n+msgstr \"ファイル毎のマージが必要です。\"\n+\n+#: lib/checkout_op.tcl:358\n+#, tcl-format\n+msgid \"Staying on branch '%s'.\"\n+msgstr \"ブランチ '%s' に滞まります。\"\n+\n+#: lib/checkout_op.tcl:429\n+msgid \"\"\n+\"You are no longer on a local branch.\\n\"\n+\"\\n\"\n+\"If you wanted to be on a branch, create one now starting from 'This Detached \"\n+\"Checkout'.\"\n+msgstr \"\"\n+\"ローカル・ブランチから離れます。\\n\"\n+\"\\n\"\n+\"ブランチ上に滞まりたいときは、この「分離されたチェックアウト」から新規ブラン\"\n+\"チを開始してください。\"\n+\n+#: lib/checkout_op.tcl:478\n+#, tcl-format\n+msgid \"Resetting '%s' to '%s' will lose the following commits:\"\n+msgstr \"'%s' を '%s' にリセットすると、以下のコミットが失なわれます:\"\n+\n+#: lib/checkout_op.tcl:500\n+msgid \"Recovering lost commits may not be easy.\"\n+msgstr \"失なわれたコミットを回復するのは簡単ではありません。\"\n+\n+#: lib/checkout_op.tcl:505\n+#, tcl-format\n+msgid \"Reset '%s'?\"\n+msgstr \"'%s' をリセットしますか？\"\n+\n+#: lib/checkout_op.tcl:510 lib/merge.tcl:164\n+msgid \"Visualize\"\n+msgstr \"可視化\"\n+\n+#: lib/checkout_op.tcl:578\n+#, tcl-format\n+msgid \"\"\n+\"Failed to set current branch.\\n\"\n+\"\\n\"\n+\"This working directory is only partially switched.  We successfully updated \"\n+\"your files, but failed to update an internal Git file.\\n\"\n+\"\\n\"\n+\"This should not have occurred.  %s will now close and give up.\"\n+msgstr \"\"\n+\"現在のブランチを設定できません。\\n\"\n+\"\\n\"\n+\"作業ディレクトリは部分的にしか切り替わっていません。ファイルの更新には成功し\"\n+\"ましたが、 Git の内部データを更新できませんでした。\\n\"\n+\"起こるはずのないエラーです。あきらめて %s を終了します。\"\n+\n+#: lib/choose_rev.tcl:53\n+msgid \"This Detached Checkout\"\n+msgstr \"分離されたチェックアウト\"\n+\n+#: lib/choose_rev.tcl:60\n+msgid \"Revision Expression:\"\n+msgstr \"リビジョン式:\"\n+\n+#: lib/choose_rev.tcl:74\n+msgid \"Local Branch\"\n+msgstr \"ローカル・ブランチ\"\n+\n+#: lib/choose_rev.tcl:79\n+msgid \"Tracking Branch\"\n+msgstr \"トラッキング・ブランチ\"\n+\n+#: lib/choose_rev.tcl:84\n+msgid \"Tag\"\n+msgstr \"タグ\"\n+\n+#: lib/choose_rev.tcl:317\n+#, tcl-format\n+msgid \"Invalid revision: %s\"\n+msgstr \"無効なリビジョン: %s\"\n+\n+#: lib/choose_rev.tcl:338\n+msgid \"No revision selected.\"\n+msgstr \"リビジョンが未選択です。\"\n+\n+#: lib/choose_rev.tcl:346\n+msgid \"Revision expression is empty.\"\n+msgstr \"リビジョン式が空です。\"\n+\n+#: lib/commit.tcl:9\n+msgid \"\"\n+\"There is nothing to amend.\\n\"\n+\"\\n\"\n+\"You are about to create the initial commit.  There is no commit before this \"\n+\"to amend.\\n\"\n+msgstr \"\"\n+\"訂正するコミットがそもそもありません。\\n\"\n+\"\\n\"\n+\"これから作るのは最初のコミットです。その前にはまだ訂正するようなコミットはあ\"\n+\"りません。\\n\"\n+\n+#: lib/commit.tcl:18\n+msgid \"\"\n+\"Cannot amend while merging.\\n\"\n+\"\\n\"\n+\"You are currently in the middle of a merge that has not been fully \"\n+\"completed.  You cannot amend the prior commit unless you first abort the \"\n+\"current merge activity.\\n\"\n+msgstr \"\"\n+\"マージ中にコミットの訂正はできません。\\n\"\n+\"\\n\"\n+\"現在はまだマージの途中です。先にこのマージを中止しないと、前のコミットの訂正\"\n+\"はできません\\n\"\n+\n+#: lib/commit.tcl:49\n+msgid \"Error loading commit data for amend:\"\n+msgstr \"訂正するコミットのデータを読めません:\"\n+\n+#: lib/commit.tcl:76\n+msgid \"Unable to obtain your identity:\"\n+msgstr \"ユーザの正体を確認できません:\"\n+\n+#: lib/commit.tcl:81\n+msgid \"Invalid GIT_COMMITTER_IDENT:\"\n+msgstr \"GIT_COMMITTER_IDENT が無効です:\"\n+\n+#: lib/commit.tcl:133\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before another commit can be created.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"最後にスキャンした状態はリポジトリの状態と合致しません。\\n\"\n+\"\\n\"\n+\"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。新し\"\n+\"くコミットする前に、再スキャンが必要です。\\n\"\n+\"\\n\"\n+\"自動的に再スキャンを開始します。\\n\"\n+\n+#: lib/commit.tcl:154\n+#, tcl-format\n+msgid \"\"\n+\"Unmerged files cannot be committed.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.  You must resolve them and stage the file \"\n+\"before committing.\\n\"\n+msgstr \"\"\n+\"マージしていないファイルはコミットできません。\\n\"\n+\"\\n\"\n+\"ファイル %s にはマージ衝突が残っています。まず解決してコミット予定に加える必\"\n+\"要があります。\\n\"\n+\n+#: lib/commit.tcl:162\n+#, tcl-format\n+msgid \"\"\n+\"Unknown file state %s detected.\\n\"\n+\"\\n\"\n+\"File %s cannot be committed by this program.\\n\"\n+msgstr \"\"\n+\"不明なファイル状態 %s です。\\n\"\n+\"\\n\"\n+\"ファイル %s は本プログラムではコミットできません。\\n\"\n+\n+#: lib/commit.tcl:170\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"You must stage at least 1 file before you can commit.\\n\"\n+msgstr \"\"\n+\"コミットする変更がありません。\\n\"\n+\"\\n\"\n+\"最低一つの変更をコミット予定に加えてからコミットして下さい。\\n\"\n+\n+#: lib/commit.tcl:183\n+msgid \"\"\n+\"Please supply a commit message.\\n\"\n+\"\\n\"\n+\"A good commit message has the following format:\\n\"\n+\"\\n\"\n+\"- First line: Describe in one sentance what you did.\\n\"\n+\"- Second line: Blank\\n\"\n+\"- Remaining lines: Describe why this change is good.\\n\"\n+msgstr \"\"\n+\"コミット・メッセージを入力して下さい。\\n\"\n+\"\\n\"\n+\"正しいコミット・メッセージは:\\n\"\n+\"\\n\"\n+\"- 第１行: 何をしたか、を１行で要約。\\n\"\n+\"- 第２行: 空白\\n\"\n+\"- 残りの行: なぜ、この変更が良い変更か、の説明。\\n\"\n+\n+#: lib/commit.tcl:257\n+msgid \"write-tree failed:\"\n+msgstr \"write-tree が失敗しました:\"\n+\n+#: lib/commit.tcl:279\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"No files were modified by this commit and it was not a merge commit.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"コミットする変更がありません。\\n\"\n+\"\\n\"\n+\"マージでなく、また、一つも変更点がありません。\\n\"\n+\"\\n\"\n+\"自動的に再スキャンを開始します。\\n\"\n+\n+#: lib/commit.tcl:286\n+msgid \"No changes to commit.\"\n+msgstr \"コミットする変更がありません。\"\n+\n+#: lib/commit.tcl:317\n+msgid \"commit-tree failed:\"\n+msgstr \"commit-tree が失敗しました:\"\n+\n+#: lib/commit.tcl:339\n+msgid \"update-ref failed:\"\n+msgstr \"update-ref が失敗しました:\"\n+\n+#: lib/commit.tcl:430\n+#, tcl-format\n+msgid \"Created commit %s: %s\"\n+msgstr \"コミット %s を作成しました: %s\"\n+\n+#: lib/console.tcl:55\n+msgid \"Working... please wait...\"\n+msgstr \"実行中…お待ち下さい…\"\n+\n+#: lib/console.tcl:184\n+msgid \"Success\"\n+msgstr \"成功\"\n+\n+#: lib/console.tcl:194\n+msgid \"Error: Command Failed\"\n+msgstr \"エラー: コマンドが失敗しました\"\n+\n+#: lib/database.tcl:43\n+msgid \"Number of loose objects\"\n+msgstr \"ばらばらなオブジェクトの数\"\n+\n+#: lib/database.tcl:44\n+msgid \"Disk space used by loose objects\"\n+msgstr \"ばらばらなオブジェクトの使用するディスク量\"\n+\n+#: lib/database.tcl:45\n+msgid \"Number of packed objects\"\n+msgstr \"パックされたオブジェクトの数\"\n+\n+#: lib/database.tcl:46\n+msgid \"Number of packs\"\n+msgstr \"パックの数\"\n+\n+#: lib/database.tcl:47\n+msgid \"Disk space used by packed objects\"\n+msgstr \"パックされたオブジェクトの使用するディスク量\"\n+\n+#: lib/database.tcl:48\n+msgid \"Packed objects waiting for pruning\"\n+msgstr \"パックに存在するので捨てて良いオブジェクトの数\"\n+\n+#: lib/database.tcl:49\n+msgid \"Garbage files\"\n+msgstr \"ゴミファイル\"\n+\n+#: lib/database.tcl:72\n+msgid \"Compressing the object database\"\n+msgstr \"データベース圧縮\"\n+\n+#: lib/database.tcl:83\n+msgid \"Verifying the object database with fsck-objects\"\n+msgstr \"fsck-objects でオブジェクト・データベースを検証しています\"\n+\n+#: lib/diff.tcl:42\n+#, tcl-format\n+msgid \"\"\n+\"No differences detected.\\n\"\n+\"\\n\"\n+\"%s has no changes.\\n\"\n+\"\\n\"\n+\"The modification date of this file was updated by another application, but \"\n+\"the content within the file was not changed.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started to find other files which may have \"\n+\"the same state.\"\n+msgstr \"\"\n+\"変更がありません。\\n\"\n+\"\\n\"\n+\"%s には変更がありません。\\n\"\n+\"\\n\"\n+\"このファイルの変更時刻は他のアプリケーションによって更新されていますがファイ\"\n+\"ル内容には変更がありません。\\n\"\n+\"\\n\"\n+\"同様な状態のファイルを探すために、自動的に再スキャンを開始します。\"\n+\n+#: lib/diff.tcl:97\n+msgid \"Error loading file:\"\n+msgstr \"ファイルを読む際のエラーです:\"\n+\n+#: lib/diff.tcl:162\n+msgid \"Error loading diff:\"\n+msgstr \"diff を読む際のエラーです:\"\n+\n+#: lib/diff.tcl:278\n+msgid \"Failed to unstage selected hunk.\"\n+msgstr \"選択されたパッチをコミット予定から外せません。\"\n+\n+#: lib/diff.tcl:285\n+msgid \"Failed to stage selected hunk.\"\n+msgstr \"選択されたパッチをコミット予定に加えられません。\"\n+\n+#: lib/error.tcl:12 lib/error.tcl:102\n+msgid \"error\"\n+msgstr \"エラー\"\n+\n+#: lib/error.tcl:28\n+msgid \"warning\"\n+msgstr \"警告\"\n+\n+#: lib/error.tcl:81\n+msgid \"You must correct the above errors before committing.\"\n+msgstr \"コミットする前に、以上のエラーを修正して下さい\"\n+\n+#: lib/index.tcl:364\n+#, tcl-format\n+msgid \"Revert changes in file %s?\"\n+msgstr \"ファイル %s にした変更を元に戻しますか？\"\n+\n+#: lib/index.tcl:366\n+#, tcl-format\n+msgid \"Revert changes in these %i files?\"\n+msgstr \"これら %i 個のファイルにした変更を元に戻しますか？\"\n+\n+#: lib/index.tcl:372\n+msgid \"Any unstaged changes will be permanently lost by the revert.\"\n+msgstr \"変更を元に戻すとコミット予定していない変更は全て失われます。\"\n+\n+#: lib/index.tcl:375\n+msgid \"Do Nothing\"\n+msgstr \"何もしない\"\n+\n+#: lib/merge.tcl:13\n+msgid \"\"\n+\"Cannot merge while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit before starting any type of merge.\\n\"\n+msgstr \"\"\n+\"訂正中にはマージできません。\\n\"\n+\"\\n\"\n+\"訂正処理を完了するまでは新たにマージを開始できません。\\n\"\n+\n+#: lib/merge.tcl:27\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before a merge can be performed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"最後にスキャンした状態はリポジトリの状態と合致しません。\\n\"\n+\"\\n\"\n+\"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。マー\"\n+\"ジを開始する前に、再スキャンが必要です。\\n\"\n+\"\\n\"\n+\"自動的に再スキャンを開始します。\\n\"\n+\n+#: lib/merge.tcl:44\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a conflicted merge.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.\\n\"\n+\"\\n\"\n+\"You must resolve them, stage the file, and commit to complete the current \"\n+\"merge.  Only then can you begin another merge.\\n\"\n+msgstr \"\"\n+\"衝突のあったマージの途中です。\\n\"\n+\"\\n\"\n+\"ファイル %s にはマージ中の衝突が残っています。\\n\"\n+\"\\n\"\n+\"このファイルの衝突を解決し、コミット予定に加えて、コミットすることでマージを\"\n+\"完了します。そうやって始めて、新たなマージを開始できるようになります。\\n\"\n+\n+#: lib/merge.tcl:54\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a change.\\n\"\n+\"\\n\"\n+\"File %s is modified.\\n\"\n+\"\\n\"\n+\"You should complete the current commit before starting a merge.  Doing so \"\n+\"will help you abort a failed merge, should the need arise.\\n\"\n+msgstr \"\"\n+\"変更の途中です。\\n\"\n+\"\\n\"\n+\"ファイル %s は変更中です。\\n\"\n+\"\\n\"\n+\"現在のコミットを完了してからマージを開始して下さい。そうする方がマージに失敗\"\n+\"したときの回復が楽です。\\n\"\n+\n+#: lib/merge.tcl:106\n+#, tcl-format\n+msgid \"%s of %s\"\n+msgstr \"%s の %s ブランチ\"\n+\n+#: lib/merge.tcl:119\n+#, tcl-format\n+msgid \"Merging %s and %s\"\n+msgstr \"%s と %s をマージします\"\n+\n+#: lib/merge.tcl:131\n+msgid \"Merge completed successfully.\"\n+msgstr \"マージが完了しました\"\n+\n+#: lib/merge.tcl:133\n+msgid \"Merge failed.  Conflict resolution is required.\"\n+msgstr \"マージが失敗しました。衝突の解決が必要です。\"\n+\n+#: lib/merge.tcl:158\n+#, tcl-format\n+msgid \"Merge Into %s\"\n+msgstr \"%s にマージ\"\n+\n+#: lib/merge.tcl:177\n+msgid \"Revision To Merge\"\n+msgstr \"マージするリビジョン\"\n+\n+#: lib/merge.tcl:212\n+msgid \"\"\n+\"Cannot abort while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit.\\n\"\n+msgstr \"\"\n+\"訂正中には中止できません。\\n\"\n+\"\\n\"\n+\"まず今のコミット訂正を完了させて下さい。\\n\"\n+\n+#: lib/merge.tcl:222\n+msgid \"\"\n+\"Abort merge?\\n\"\n+\"\\n\"\n+\"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\\n\"\n+\"\\n\"\n+\"Continue with aborting the current merge?\"\n+msgstr \"\"\n+\"マージを中断しますか？\\n\"\n+\"\\n\"\n+\"現在のマージを中断すると、コミットしていない全ての変更が失われます。\\n\"\n+\"\\n\"\n+\"マージを中断してよろしいですか？\"\n+\n+#: lib/merge.tcl:228\n+msgid \"\"\n+\"Reset changes?\\n\"\n+\"\\n\"\n+\"Resetting the changes will cause *ALL* uncommitted changes to be lost.\\n\"\n+\"\\n\"\n+\"Continue with resetting the current changes?\"\n+msgstr \"\"\n+\"変更点をリセットしますか？\\n\"\n+\"\\n\"\n+\"変更点をリセットすると、コミットしていない全ての変更が失われます。\\n\"\n+\"\\n\"\n+\"リセットしてよろしいですか？\"\n+\n+#: lib/merge.tcl:239\n+msgid \"Aborting\"\n+msgstr \"中断しています\"\n+\n+#: lib/merge.tcl:266\n+msgid \"Abort failed.\"\n+msgstr \"中断に失敗しました。\"\n+\n+#: lib/merge.tcl:268\n+msgid \"Abort completed.  Ready.\"\n+msgstr \"中断完了。\"\n+\n+#: lib/option.tcl:77\n+msgid \"git-gui - a graphical user interface for Git.\"\n+msgstr \"Git のグラフィカルUI git-gui\"\n+\n+#: lib/option.tcl:164\n+msgid \"Restore Defaults\"\n+msgstr \"既定値に戻す\"\n+\n+#: lib/option.tcl:168\n+msgid \"Save\"\n+msgstr \"保存\"\n+\n+#: lib/option.tcl:178\n+#, tcl-format\n+msgid \"%s Repository\"\n+msgstr \"%s リポジトリ\"\n+\n+#: lib/option.tcl:179\n+msgid \"Global (All Repositories)\"\n+msgstr \"大域（全てのリポジトリ）\"\n+\n+#: lib/option.tcl:185\n+msgid \"User Name\"\n+msgstr \"ユーザ名\"\n+\n+#: lib/option.tcl:186\n+msgid \"Email Address\"\n+msgstr \"電子メールアドレス\"\n+\n+#: lib/option.tcl:188\n+msgid \"Summarize Merge Commits\"\n+msgstr \"マージコミットの要約\"\n+\n+#: lib/option.tcl:189\n+msgid \"Merge Verbosity\"\n+msgstr \"マージの冗長度\"\n+\n+#: lib/option.tcl:190\n+msgid \"Show Diffstat After Merge\"\n+msgstr \"マージ後に diffstat を表示\"\n+\n+#: lib/option.tcl:192\n+msgid \"Trust File Modification Timestamps\"\n+msgstr \"ファイル変更時刻を信頼する\"\n+\n+#: lib/option.tcl:193\n+msgid \"Prune Tracking Branches During Fetch\"\n+msgstr \"フェッチ中にトラッキングブランチを刈る\"\n+\n+#: lib/option.tcl:194\n+msgid \"Match Tracking Branches\"\n+msgstr \"トラッキングブランチを合わせる\"\n+\n+#: lib/option.tcl:195\n+msgid \"Number of Diff Context Lines\"\n+msgstr \"diff の文脈行数\"\n+\n+#: lib/option.tcl:196\n+msgid \"New Branch Name Template\"\n+msgstr \"新しいブランチ名のテンプレート\"\n+\n+#: lib/option.tcl:305\n+msgid \"Failed to completely save options:\"\n+msgstr \"完全にオプションを保存できません:\"\n+\n+#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34\n+msgid \"Delete Remote Branch\"\n+msgstr \"リモート・ブランチを削除\"\n+\n+#: lib/remote_branch_delete.tcl:47\n+msgid \"From Repository\"\n+msgstr \"元のリポジトリ\"\n+\n+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118\n+msgid \"Remote:\"\n+msgstr \"リモート:\"\n+\n+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133\n+msgid \"Arbitrary URL:\"\n+msgstr \"任意の URL:\"\n+\n+#: lib/remote_branch_delete.tcl:84\n+msgid \"Branches\"\n+msgstr \"ブランチ\"\n+\n+#: lib/remote_branch_delete.tcl:109\n+msgid \"Delete Only If\"\n+msgstr \"条件付で削除\"\n+\n+#: lib/remote_branch_delete.tcl:111\n+msgid \"Merged Into:\"\n+msgstr \"マージ先:\"\n+\n+#: lib/remote_branch_delete.tcl:119\n+msgid \"Always (Do not perform merge checks)\"\n+msgstr \"無条件（マージ検査をしない）\"\n+\n+#: lib/remote_branch_delete.tcl:152\n+msgid \"A branch is required for 'Merged Into'.\"\n+msgstr \"'マージ先' にはブランチが必要です。\"\n+\n+#: lib/remote_branch_delete.tcl:189\n+#, tcl-format\n+msgid \"\"\n+\"One or more of the merge tests failed because you have not fetched the \"\n+\"necessary commits.  Try fetching from %s first.\"\n+msgstr \"\"\n+\"必要なコミットが不足しているために、マージ検査が失敗しました。まず %s から\"\n+\"フェッチして下さい。\"\n+\n+#: lib/remote_branch_delete.tcl:207\n+msgid \"Please select one or more branches to delete.\"\n+msgstr \"削除するブランチを選択して下さい。\"\n+\n+#: lib/remote_branch_delete.tcl:216\n+msgid \"\"\n+\"Recovering deleted branches is difficult.\\n\"\n+\"\\n\"\n+\"Delete the selected branches?\"\n+msgstr \"\"\n+\"削除したブランチを回復するのは困難です。\\n\"\n+\"\\n\"\n+\"選択したブランチを削除して良いですか？\"\n+\n+#: lib/remote_branch_delete.tcl:226\n+#, tcl-format\n+msgid \"Deleting branches from %s\"\n+msgstr \"%s からブランチを削除しています。\"\n+\n+#: lib/remote_branch_delete.tcl:286\n+msgid \"No repository selected.\"\n+msgstr \"リポジトリが選択されていません。\"\n+\n+#: lib/remote_branch_delete.tcl:291\n+#, tcl-format\n+msgid \"Scanning %s...\"\n+msgstr \"%s をスキャンしています…\"\n+\n+#: lib/remote.tcl:162\n+#, tcl-format\n+msgid \"Fetch from %s...\"\n+msgstr \"%s からフェッチ…\"\n+\n+#: lib/remote.tcl:172\n+#, tcl-format\n+msgid \"Prune from %s...\"\n+msgstr \"%s から刈る…\"\n+\n+#: lib/remote.tcl:206\n+#, tcl-format\n+msgid \"Push to %s...\"\n+msgstr \"%s へプッシュ…\"\n+\n+#: lib/shortcut.tcl:26 lib/shortcut.tcl:74\n+msgid \"Cannot write script:\"\n+msgstr \"スクリプトが書けません:\"\n+\n+#: lib/shortcut.tcl:149\n+msgid \"Cannot write icon:\"\n+msgstr \"アイコンが書けません:\"\n+\n+#: lib/status_bar.tcl:58\n+#, tcl-format\n+msgid \"%s ... %i of %i %s (%2i%%)\"\n+msgstr \"%1$s ... %3$i %4$s 中の %$2i (%5$2i%%)\"\n+\n+#: lib/transport.tcl:7\n+#, tcl-format\n+msgid \"Fetching new changes from %s\"\n+msgstr \"%s から新しい変更をフェッチしています\"\n+\n+#: lib/transport.tcl:19\n+#, tcl-format\n+msgid \"Pruning tracking branches deleted from %s\"\n+msgstr \"%s から削除されたトラッキング・ブランチを刈っています\"\n+\n+#: lib/transport.tcl:26\n+#, tcl-format\n+msgid \"Pushing changes to %s\"\n+msgstr \"%s へ変更をプッシュしています\"\n+\n+#: lib/transport.tcl:68\n+#, tcl-format\n+msgid \"Pushing %s %s to %s\"\n+msgstr \"%3$s へ %1$s %2$s をプッシュしています\"\n+\n+#: lib/transport.tcl:84\n+msgid \"Push Branches\"\n+msgstr \"ブランチをプッシュ\"\n+\n+#: lib/transport.tcl:98\n+msgid \"Source Branches\"\n+msgstr \"元のブランチ\"\n+\n+#: lib/transport.tcl:115\n+msgid \"Destination Repository\"\n+msgstr \"送り先リポジトリ\"\n+\n+#: lib/transport.tcl:153\n+msgid \"Transfer Options\"\n+msgstr \"通信オプション\"\n+\n+#: lib/transport.tcl:155\n+msgid \"Use thin pack (for slow network connections)\"\n+msgstr \"Thin Pack を使う（遅いネットワーク接続）\"\n+\n+#: lib/transport.tcl:159\n+msgid \"Include tags\"\n+msgstr \"タグを含める\"\n-- \n1.5.3.2.g46909\n\n"},{"id":"52230","messageId":"Pine.LNX.4.64.0709021735400.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 11/15] Italian translation of git-gui","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:35:50Z","receivedAt":"2007-09-02T16:35:50Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nFrom: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n\n[jes: includes patches from Michele Ballabio]\n\nSigned-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n po/it.po | 1393 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 1393 insertions(+), 0 deletions(-)\n create mode 100644 po/it.po\n\ndiff --git a/po/it.po b/po/it.po\nnew file mode 100644\nindex 0000000..17a5c21\n--- /dev/null\n+++ b/po/it.po\n@@ -0,0 +1,1393 @@\n+# Translation of git-gui to Italian\n+# Copyright (C) 2007 Shawn Pearce\n+# This file is distributed under the same license as the git-gui package.\n+# Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>, 2007\n+# Michele Ballabio <barra_cuda@katamail.com>, 2007.\n+# \n+# \n+msgid \"\"\n+msgstr \"\"\n+\"Project-Id-Version: git-gui\\n\"\n+\"Report-Msgid-Bugs-To: \\n\"\n+\"POT-Creation-Date: 2007-08-11 17:28+0200\\n\"\n+\"PO-Revision-Date: 2007-08-09 00:27+0200\\n\"\n+\"Last-Translator: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\\n\"\n+\"Language-Team: Italian <tp@lists.linux.it>\\n\"\n+\"MIME-Version: 1.0\\n\"\n+\"Content-Type: text/plain; charset=UTF-8\\n\"\n+\"Content-Transfer-Encoding: 8bit\"\n+\n+#: git-gui.sh:531\n+msgid \"Cannot find git in PATH.\"\n+msgstr \"Impossibile trovare git nel PATH\"\n+\n+#: git-gui.sh:550\n+msgid \"Cannot parse Git version string:\"\n+msgstr \"Impossibile determinare la versione di Git:\"\n+\n+#: git-gui.sh:567\n+#, tcl-format\n+msgid \"\"\n+\"Git version cannot be determined.\\n\"\n+\"\\n\"\n+\"%s claims it is version '%s'.\\n\"\n+\"\\n\"\n+\"%s requires at least Git 1.5.0 or later.\\n\"\n+\"\\n\"\n+\"Assume '%s' is version 1.5.0?\\n\"\n+msgstr \"\"\n+\"La versione di GIT non può essere determinata.\\n\"\n+\"\\n\"\n+\"%s sostiene che la versione è '%s'.\\n\"\n+\"\\n\"\n+\"%s richiede almeno Git 1.5.0 o superiore.\\n\"\n+\"\\n\"\n+\"Assumere che '%s' sia alla versione 1.5.0?\\n\"\n+\n+#: git-gui.sh:689\n+msgid \"Cannot find the git directory:\"\n+msgstr \"Non posso trovare la directory di git:\"\n+\n+#: git-gui.sh:697\n+msgid \"Git directory not found:\"\n+msgstr \"Non trovo la directory di git: \"\n+\n+#: git-gui.sh:703\n+msgid \"Cannot use funny .git directory:\"\n+msgstr \"Impossibile usare una .git directory strana:\"\n+\n+#: git-gui.sh:708\n+msgid \"No working directory\"\n+msgstr \"Nessuna directory di lavoro\"\n+\n+#: git-gui.sh:854\n+msgid \"Refreshing file status...\"\n+msgstr \"Controllo dello stato dei file in corso...\"\n+\n+#: git-gui.sh:891\n+msgid \"Scanning for modified files ...\"\n+msgstr \"Ricerca di file modificati in corso...\"\n+\n+#: git-gui.sh:1057 lib/browser.tcl:247\n+msgid \"Ready.\"\n+msgstr \"Pronto.\"\n+\n+#: git-gui.sh:1322\n+msgid \"Unmodified\"\n+msgstr \"Non modificato\"\n+\n+#: git-gui.sh:1324\n+msgid \"Modified, not staged\"\n+msgstr \"Modificato, non pronto per il commit\"\n+\n+#: git-gui.sh:1325 git-gui.sh:1330\n+msgid \"Staged for commit\"\n+msgstr \"Pronto per il commit\"\n+\n+#: git-gui.sh:1326 git-gui.sh:1331\n+msgid \"Portions staged for commit\"\n+msgstr \"Parti pronte per il commit\"\n+\n+#: git-gui.sh:1327 git-gui.sh:1332\n+msgid \"Staged for commit, missing\"\n+msgstr \"Pronto per il commit, mancante\"\n+\n+#: git-gui.sh:1329\n+msgid \"Untracked, not staged\"\n+msgstr \"Non tracciato, non pronto per il commit\"\n+\n+#: git-gui.sh:1334\n+msgid \"Missing\"\n+msgstr \"Mancante\"\n+\n+#: git-gui.sh:1335\n+msgid \"Staged for removal\"\n+msgstr \"Pronto per la rimozione\"\n+\n+#: git-gui.sh:1336\n+msgid \"Staged for removal, still present\"\n+msgstr \"Pronto alla rimozione, ancora presente\"\n+\n+#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341\n+msgid \"Requires merge resolution\"\n+msgstr \"Richiede risoluzione dei conflitti\"\n+\n+#: git-gui.sh:1383\n+msgid \"Starting gitk... please wait...\"\n+msgstr \"Avvio di gitk... attendere...\"\n+\n+#: git-gui.sh:1392\n+#, tcl-format\n+msgid \"\"\n+\"Unable to start gitk:\\n\"\n+\"\\n\"\n+\"%s does not exist\"\n+msgstr \"\"\n+\"Impossibile avviare gitk:\\n\"\n+\"\\n\"\n+\"%s non esiste\"\n+\n+#: git-gui.sh:1609\n+#, tcl-format\n+msgid \"Invalid font specified in gui.%s:\"\n+msgstr \"Caratteri non validi specificati nella gui.%s:\"\n+\n+#: git-gui.sh:1634\n+msgid \"Main Font\"\n+msgstr \"Caratteri principali\"\n+\n+#: git-gui.sh:1635\n+msgid \"Diff/Console Font\"\n+msgstr \"Caratteri per confronti e terminale\"\n+\n+#: git-gui.sh:1649\n+msgid \"Repository\"\n+msgstr \"Archivio\"\n+\n+#: git-gui.sh:1650\n+msgid \"Edit\"\n+msgstr \"Modifica\"\n+\n+#: git-gui.sh:1652\n+msgid \"Branch\"\n+msgstr \"Ramo\"\n+\n+#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152\n+msgid \"Commit\"\n+msgstr \"Commit\"\n+\n+#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168\n+msgid \"Merge\"\n+msgstr \"Fusione (Merge)\"\n+\n+#: git-gui.sh:1659\n+msgid \"Fetch\"\n+msgstr \"Preleva (Fetch)\"\n+\n+#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172\n+msgid \"Push\"\n+msgstr \"Propaga (Push)\"\n+\n+#: git-gui.sh:1669\n+msgid \"Browse Current Branch's Files\"\n+msgstr \"Esplora i file del ramo corrente\"\n+\n+#: git-gui.sh:1673\n+msgid \"Browse Branch Files...\"\n+msgstr \"Esplora i file del ramo...\"\n+\n+#: git-gui.sh:1678\n+msgid \"Visualize Current Branch's History\"\n+msgstr \"Visualizza la cronologia del ramo corrente\"\n+\n+#: git-gui.sh:1682\n+msgid \"Visualize All Branch History\"\n+msgstr \"Visualizza la cronologia di tutti i rami\"\n+\n+#: git-gui.sh:1689\n+#, tcl-format\n+msgid \"Browse %s's Files\"\n+msgstr \"Esplora i file di %s\"\n+\n+#: git-gui.sh:1691\n+#, tcl-format\n+msgid \"Visualize %s's History\"\n+msgstr \"Visualizza la cronologia di %s\"\n+\n+#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67\n+msgid \"Database Statistics\"\n+msgstr \"Statistiche del database\"\n+\n+#: git-gui.sh:1699 lib/database.tcl:34\n+msgid \"Compress Database\"\n+msgstr \"Comprimi il database\"\n+\n+#: git-gui.sh:1702\n+msgid \"Verify Database\"\n+msgstr \"Verifica il database\"\n+\n+#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9\n+#: lib/shortcut.tcl:45 lib/shortcut.tcl:84\n+msgid \"Create Desktop Icon\"\n+msgstr \"Crea icona desktop\"\n+\n+#: git-gui.sh:1722\n+msgid \"Quit\"\n+msgstr \"Esci\"\n+\n+#: git-gui.sh:1729\n+msgid \"Undo\"\n+msgstr \"Annulla\"\n+\n+#: git-gui.sh:1732\n+msgid \"Redo\"\n+msgstr \"Ripeti\"\n+\n+#: git-gui.sh:1736 git-gui.sh:2222\n+msgid \"Cut\"\n+msgstr \"Taglia\"\n+\n+#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368\n+#: lib/console.tcl:69\n+msgid \"Copy\"\n+msgstr \"Copia\"\n+\n+#: git-gui.sh:1742 git-gui.sh:2228\n+msgid \"Paste\"\n+msgstr \"Incolla\"\n+\n+#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26\n+#: lib/remote_branch_delete.tcl:38\n+msgid \"Delete\"\n+msgstr \"Elimina\"\n+\n+#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71\n+msgid \"Select All\"\n+msgstr \"Seleziona tutto\"\n+\n+#: git-gui.sh:1758\n+msgid \"Create...\"\n+msgstr \"Crea...\"\n+\n+#: git-gui.sh:1764\n+msgid \"Checkout...\"\n+msgstr \"Checkout...\"\n+\n+#: git-gui.sh:1770\n+msgid \"Rename...\"\n+msgstr \"Rinomina\"\n+\n+#: git-gui.sh:1775 git-gui.sh:1873\n+msgid \"Delete...\"\n+msgstr \"Elimina...\"\n+\n+#: git-gui.sh:1780\n+msgid \"Reset...\"\n+msgstr \"Ripristina...\"\n+\n+#: git-gui.sh:1792 git-gui.sh:2169\n+msgid \"New Commit\"\n+msgstr \"Nuovo commit\"\n+\n+#: git-gui.sh:1800 git-gui.sh:2176\n+msgid \"Amend Last Commit\"\n+msgstr \"Correggi l'ultimo commit\"\n+\n+#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99\n+msgid \"Rescan\"\n+msgstr \"Analizza nuovamente\"\n+\n+#: git-gui.sh:1815\n+msgid \"Stage To Commit\"\n+msgstr \"Prepara per il commit\"\n+\n+#: git-gui.sh:1820\n+msgid \"Stage Changed Files To Commit\"\n+msgstr \"Prepara per il commit i file modificati\"\n+\n+#: git-gui.sh:1826\n+msgid \"Unstage From Commit\"\n+msgstr \"Non pronto per il commit\"\n+\n+#: git-gui.sh:1831 lib/index.tcl:376\n+msgid \"Revert Changes\"\n+msgstr \"Annulla modifiche\"\n+\n+#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246\n+msgid \"Sign Off\"\n+msgstr \"Sign Off\"\n+\n+#: git-gui.sh:1853\n+msgid \"Local Merge...\"\n+msgstr \"Fusione locale\"\n+\n+#: git-gui.sh:1858\n+msgid \"Abort Merge...\"\n+msgstr \"Interrompi fusione\"\n+\n+#: git-gui.sh:1870\n+msgid \"Push...\"\n+msgstr \"Propaga...\"\n+\n+#: git-gui.sh:1880\n+msgid \"Apple\"\n+msgstr \"Apple\"\n+\n+#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65\n+#, tcl-format\n+msgid \"About %s\"\n+msgstr \"Informazioni su %s\"\n+\n+#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414\n+msgid \"Options...\"\n+msgstr \"Opzioni...\"\n+\n+#: git-gui.sh:1897\n+msgid \"Help\"\n+msgstr \"Aiuto\"\n+\n+#: git-gui.sh:1938\n+msgid \"Online Documentation\"\n+msgstr \"Documentazione sul web\"\n+\n+#: git-gui.sh:2054\n+msgid \"Current Branch:\"\n+msgstr \"Ramo attuale:\"\n+\n+#: git-gui.sh:2075\n+msgid \"Staged Changes (Will Be Committed)\"\n+msgstr \"Modifiche preparate (ne verrà effettuato il commit)\"\n+\n+#: git-gui.sh:2095\n+msgid \"Unstaged Changes (Will Not Be Committed)\"\n+msgstr \"Modifiche non preparate (non ne verrà effettuato il commit)\"\n+\n+#: git-gui.sh:2142\n+msgid \"Stage Changed\"\n+msgstr \"Prepara modificati\"\n+\n+#: git-gui.sh:2188\n+msgid \"Initial Commit Message:\"\n+msgstr \"Messaggio di commit iniziale:\"\n+\n+#: git-gui.sh:2189\n+msgid \"Amended Commit Message:\"\n+msgstr \"Messaggio di commit corretto:\"\n+\n+#: git-gui.sh:2190\n+msgid \"Amended Initial Commit Message:\"\n+msgstr \"Messaggio iniziale di commit corretto:\"\n+\n+#: git-gui.sh:2191\n+msgid \"Amended Merge Commit Message:\"\n+msgstr \"Messaggio di fusione corretto:\"\n+\n+#: git-gui.sh:2192\n+msgid \"Merge Commit Message:\"\n+msgstr \"Messaggio di fusione:\"\n+\n+#: git-gui.sh:2193\n+msgid \"Commit Message:\"\n+msgstr \"Messaggio di commit:\"\n+\n+#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73\n+msgid \"Copy All\"\n+msgstr \"Copia tutto\"\n+\n+#: git-gui.sh:2262 lib/blame.tcl:104\n+msgid \"File:\"\n+msgstr \"File:\"\n+\n+#: git-gui.sh:2364\n+msgid \"Refresh\"\n+msgstr \"Rinfresca\"\n+\n+#: git-gui.sh:2385\n+msgid \"Apply/Reverse Hunk\"\n+msgstr \"Applica/Inverti sezione\"\n+\n+#: git-gui.sh:2391\n+msgid \"Decrease Font Size\"\n+msgstr \"Diminuisci dimensione caratteri\"\n+\n+#: git-gui.sh:2395\n+msgid \"Increase Font Size\"\n+msgstr \"Aumenta dimensione caratteri\"\n+\n+#: git-gui.sh:2400\n+msgid \"Show Less Context\"\n+msgstr \"Mostra meno contesto\"\n+\n+#: git-gui.sh:2407\n+msgid \"Show More Context\"\n+msgstr \"Mostra più contesto\"\n+\n+#: git-gui.sh:2422\n+msgid \"Unstage Hunk From Commit\"\n+msgstr \"Sezione non pronta per il commit\"\n+\n+#: git-gui.sh:2426 git-gui.sh:2430\n+msgid \"Stage Hunk For Commit\"\n+msgstr \"Prepara sezione per il commit\"\n+\n+#: git-gui.sh:2440\n+msgid \"Initializing...\"\n+msgstr \"Inizializzazione...\"\n+\n+#: lib/blame.tcl:77\n+msgid \"File Viewer\"\n+msgstr \"Mostra file\"\n+\n+#: lib/blame.tcl:81\n+msgid \"Commit:\"\n+msgstr \"Commit:\"\n+\n+#: lib/blame.tcl:249\n+msgid \"Copy Commit\"\n+msgstr \"Copia commit\"\n+\n+#: lib/blame.tcl:369\n+#, tcl-format\n+msgid \"Reading %s...\"\n+msgstr \"Lettura di %s...\"\n+\n+#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19\n+msgid \"Checkout Branch\"\n+msgstr \"Checkout ramo\"\n+\n+#: lib/branch_checkout.tcl:23\n+msgid \"Checkout\"\n+msgstr \"Checkout\"\n+\n+#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35\n+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:283\n+#: lib/checkout_op.tcl:522 lib/merge.tcl:172 lib/option.tcl:172\n+#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92\n+msgid \"Cancel\"\n+msgstr \"Annulla\"\n+\n+#: lib/branch_checkout.tcl:32 lib/browser.tcl:288\n+msgid \"Revision\"\n+msgstr \"Revisione\"\n+\n+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159\n+#: lib/option.tcl:274\n+msgid \"Options\"\n+msgstr \"Opzioni\"\n+\n+#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92\n+msgid \"Fetch Tracking Branch\"\n+msgstr \"Preleva ramo in 'tracking'\"\n+\n+#: lib/branch_checkout.tcl:44\n+msgid \"Detach From Local Branch\"\n+msgstr \"Stacca da ramo locale\"\n+\n+#: lib/branch_create.tcl:22\n+msgid \"Create Branch\"\n+msgstr \"Crea ramo\"\n+\n+#: lib/branch_create.tcl:27\n+msgid \"Create New Branch\"\n+msgstr \"Crea nuovo ramo\"\n+\n+#: lib/branch_create.tcl:31\n+msgid \"Create\"\n+msgstr \"Crea\"\n+\n+#: lib/branch_create.tcl:40\n+msgid \"Branch Name\"\n+msgstr \"Nome del ramo\"\n+\n+#: lib/branch_create.tcl:43\n+msgid \"Name:\"\n+msgstr \"Nome:\"\n+\n+#: lib/branch_create.tcl:58\n+msgid \"Match Tracking Branch Name\"\n+msgstr \"Appaia nome del ramo in 'tracking'\"\n+\n+#: lib/branch_create.tcl:66\n+msgid \"Starting Revision\"\n+msgstr \"Revisione iniziale\"\n+\n+#: lib/branch_create.tcl:72\n+msgid \"Update Existing Branch:\"\n+msgstr \"Aggiorna ramo esistente:\"\n+\n+#: lib/branch_create.tcl:75\n+msgid \"No\"\n+msgstr \"No\"\n+\n+#: lib/branch_create.tcl:80\n+msgid \"Fast Forward Only\"\n+msgstr \"Solo fast forward\"\n+\n+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514\n+msgid \"Reset\"\n+msgstr \"Ripristina\"\n+\n+#: lib/branch_create.tcl:97\n+msgid \"Checkout After Creation\"\n+msgstr \"Checkout dopo la creazione\"\n+\n+#: lib/branch_create.tcl:131\n+msgid \"Please select a tracking branch.\"\n+msgstr \"Scegliere un ramo in 'tracking'\"\n+\n+#: lib/branch_create.tcl:140\n+#, tcl-format\n+msgid \"Tracking branch %s is not a branch in the remote repository.\"\n+msgstr \"Il ramo in 'tracking' %s non è un ramo nell'archivio remoto.\"\n+\n+#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86\n+msgid \"Please supply a branch name.\"\n+msgstr \"Inserire un nome per il ramo.\"\n+\n+#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106\n+#, tcl-format\n+msgid \"'%s' is not an acceptable branch name.\"\n+msgstr \"'%s' non è utilizzabile come nome di ramo.\"\n+\n+#: lib/branch_delete.tcl:15\n+msgid \"Delete Branch\"\n+msgstr \"Elimina ramo\"\n+\n+#: lib/branch_delete.tcl:20\n+msgid \"Delete Local Branch\"\n+msgstr \"Elimina ramo locale\"\n+\n+#: lib/branch_delete.tcl:37\n+msgid \"Local Branches\"\n+msgstr \"Rami locali\"\n+\n+#: lib/branch_delete.tcl:52\n+msgid \"Delete Only If Merged Into\"\n+msgstr \"Cancella solo se fuso con un altro ramo\"\n+\n+#: lib/branch_delete.tcl:54\n+msgid \"Always (Do not perform merge test.)\"\n+msgstr \"Sempre (Non effettuare controlli durante la fusione).\"\n+\n+#: lib/branch_delete.tcl:103\n+#, tcl-format\n+msgid \"The following branches are not completely merged into %s:\"\n+msgstr \"I rami seguenti non sono stati fusi completamente in %s:\"\n+\n+#: lib/branch_delete.tcl:115\n+msgid \"\"\n+\"Recovering deleted branches is difficult. \\n\"\n+\"\\n\"\n+\" Delete the selected branches?\"\n+msgstr \"\"\n+\"Prelevare rami cancellati può essere complicato. \\n\"\n+\"\\n\"\n+\" Eliminare i rami selezionati?\"\n+\n+#: lib/branch_delete.tcl:141\n+#, tcl-format\n+msgid \"\"\n+\"Failed to delete branches:\\n\"\n+\"%s\"\n+msgstr \"\"\n+\"Cancellazione rami fallita:\\n\"\n+\"%s\"\n+\n+#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22\n+msgid \"Rename Branch\"\n+msgstr \"Rinomina ramo\"\n+\n+#: lib/branch_rename.tcl:26\n+msgid \"Rename\"\n+msgstr \"Rinomina\"\n+\n+#: lib/branch_rename.tcl:36\n+msgid \"Branch:\"\n+msgstr \"Ramo:\"\n+\n+#: lib/branch_rename.tcl:39\n+msgid \"New Name:\"\n+msgstr \"Nuovo Nome:\"\n+\n+#: lib/branch_rename.tcl:75\n+msgid \"Please select a branch to rename.\"\n+msgstr \"Scegliere un ramo da rinominare.\"\n+\n+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179\n+#, tcl-format\n+msgid \"Branch '%s' already exists.\"\n+msgstr \"Il ramo '%s' esiste già\"\n+\n+#: lib/branch_rename.tcl:117\n+#, tcl-format\n+msgid \"Failed to rename '%s'.\"\n+msgstr \"Cambiamento nome '%s' fallito.\"\n+\n+#: lib/browser.tcl:17\n+msgid \"Starting...\"\n+msgstr \"Avvio in corso...\"\n+\n+#: lib/browser.tcl:26\n+msgid \"File Browser\"\n+msgstr \"File browser\"\n+\n+#: lib/browser.tcl:127 lib/browser.tcl:144\n+#, tcl-format\n+msgid \"Loading %s...\"\n+msgstr \"Caricamento %s...\"\n+\n+#: lib/browser.tcl:188\n+msgid \"[Up To Parent]\"\n+msgstr \"[Directory superiore]\"\n+\n+#: lib/browser.tcl:268 lib/browser.tcl:274\n+msgid \"Browse Branch Files\"\n+msgstr \"Esplora i file del ramo\"\n+\n+#: lib/browser.tcl:279\n+msgid \"Browse\"\n+msgstr \"Sfoglia\"\n+\n+#: lib/checkout_op.tcl:79\n+#, tcl-format\n+msgid \"Fetching %s from %s\"\n+msgstr \"Recupero %s da %s\"\n+\n+#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31\n+msgid \"Close\"\n+msgstr \"Chiudi\"\n+\n+#: lib/checkout_op.tcl:169\n+#, tcl-format\n+msgid \"Branch '%s' does not exist.\"\n+msgstr \"Il ramo '%s' non esiste.\"\n+\n+#: lib/checkout_op.tcl:206\n+#, tcl-format\n+msgid \"\"\n+\"Branch '%s' already exists.\\n\"\n+\"\\n\"\n+\"It cannot fast-forward to %s.\\n\"\n+\"A merge is required.\"\n+msgstr \"Il ramo '%s' esiste già.\\n\"\n+\"\\n\"\n+\"Non può effettuare un 'fast-forward' a %s.\\n\"\n+\"E' necessaria una fusione.\"\n+\n+#: lib/checkout_op.tcl:220\n+#, tcl-format\n+msgid \"Merge strategy '%s' not supported.\"\n+msgstr \"La strategia di fusione '%s' non è supportata.\"\n+\n+#: lib/checkout_op.tcl:239\n+#, tcl-format\n+msgid \"Failed to update '%s'.\"\n+msgstr \"Aggiornamento di '%s' fallito.\"\n+\n+#: lib/checkout_op.tcl:251\n+msgid \"Staging area (index) is already locked.\"\n+msgstr \"L'area di preparazione per il commit (indice) è già bloccata.\"\n+\n+#: lib/checkout_op.tcl:266\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before the current branch can be changed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"L'ultimo stato analizzato non corrisponde allo stato del repository.\\n\"\n+\"\\n\"\n+\"Un altro programma Git ha modificato questo repository dall'ultima analisi. \"\n+\"Bisogna effettuare una nuova analisi prima di poter cambiare il ramo \"\n+\"corrente.\\n\"\n+\"\\n\"\n+\"La nuova analisi comincerà ora.\\n\"\n+\n+#: lib/checkout_op.tcl:353\n+#, tcl-format\n+msgid \"Aborted checkout of '%s' (file level merging is required).\"\n+msgstr \"Checkout di '%s' fallito (richiesta una fusione a livello file).\"\n+\n+#: lib/checkout_op.tcl:354\n+msgid \"File level merge required.\"\n+msgstr \"E' richiesta una fusione a livello file.\"\n+\n+#: lib/checkout_op.tcl:358\n+#, tcl-format\n+msgid \"Staying on branch '%s'.\"\n+msgstr \"Si rimarrà sul ramo '%s'.\"\n+\n+#: lib/checkout_op.tcl:429\n+msgid \"\"\n+\"You are no longer on a local branch.\\n\"\n+\"\\n\"\n+\"If you wanted to be on a branch, create one now starting from 'This Detached \"\n+\"Checkout'.\"\n+msgstr \"\"\n+\"Non si è più su un ramo locale\\n\"\n+\"\\n\"\n+\"Se si vuole rimanere su un ramo, crearne uno ora a partire da 'Questo checkout \"\n+\"staccato'.\"\n+\n+#: lib/checkout_op.tcl:478\n+#, tcl-format\n+msgid \"Resetting '%s' to '%s' will lose the following commits:\"\n+msgstr \"Ripristinare '%s' a '%s' comporterà la perdita dei seguenti commit:\"\n+\n+#: lib/checkout_op.tcl:500\n+msgid \"Recovering lost commits may not be easy.\"\n+msgstr \"Prelevare i commit perduti potrebbe non essere semplice.\"\n+\n+#: lib/checkout_op.tcl:505\n+#, tcl-format\n+msgid \"Reset '%s'?\"\n+msgstr \"Ripristinare '%s'?\"\n+\n+#: lib/checkout_op.tcl:510 lib/merge.tcl:164\n+msgid \"Visualize\"\n+msgstr \"Visualizza\"\n+\n+#: lib/checkout_op.tcl:578\n+#, tcl-format\n+msgid \"\"\n+\"Failed to set current branch.\\n\"\n+\"\\n\"\n+\"This working directory is only partially switched.  We successfully updated \"\n+\"your files, but failed to update an internal Git file.\\n\"\n+\"\\n\"\n+\"This should not have occurred.  %s will now close and give up.\"\n+msgstr \"\"\n+\"Preparazione ramo corrente fallita.\\n\"\n+\"\\n\"\n+\"Questa directory di lavoro è stata convertita solo parzialmente. I file \"\n+\"sono stati aggiornati correttamente, ma l'aggiornamento di un file di Git ha \"\n+\"prodotto degli errori.\\n\"\n+\"\\n\"\n+\"Questo non sarebbe dovuto succedere.  %s ora terminerà senza altre azioni.\"\n+\n+#: lib/choose_rev.tcl:53\n+msgid \"This Detached Checkout\"\n+msgstr \"Questo checkout staccato\"\n+\n+#: lib/choose_rev.tcl:60\n+msgid \"Revision Expression:\"\n+msgstr \"Espressione di revisione:\"\n+\n+#: lib/choose_rev.tcl:74\n+msgid \"Local Branch\"\n+msgstr \"Ramo locale\"\n+\n+#: lib/choose_rev.tcl:79\n+msgid \"Tracking Branch\"\n+msgstr \"Ramo in 'tracking'\"\n+\n+#: lib/choose_rev.tcl:84\n+msgid \"Tag\"\n+msgstr \"Etichetta\"\n+\n+#: lib/choose_rev.tcl:317\n+#, tcl-format\n+msgid \"Invalid revision: %s\"\n+msgstr \"Revisione non valida: %s\"\n+\n+#: lib/choose_rev.tcl:338\n+msgid \"No revision selected.\"\n+msgstr \"Nessuna revisione selezionata.\"\n+\n+#: lib/choose_rev.tcl:346\n+msgid \"Revision expression is empty.\"\n+msgstr \"L'espressione di revisione è vuota.\"\n+\n+#: lib/commit.tcl:9\n+msgid \"\"\n+\"There is nothing to amend.\\n\"\n+\"\\n\"\n+\"You are about to create the initial commit.  There is no commit before this \"\n+\"to amend.\\n\"\n+msgstr \"\"\n+\"Non c'è niente da correggere.\\n\"\n+\"\\n\"\n+\"Stai per creare il commit iniziale. Non esiste un commit precedente da \"\n+\"correggere.\\n\"\n+\n+#: lib/commit.tcl:18\n+msgid \"\"\n+\"Cannot amend while merging.\\n\"\n+\"\\n\"\n+\"You are currently in the middle of a merge that has not been fully \"\n+\"completed.  You cannot amend the prior commit unless you first abort the \"\n+\"current merge activity.\\n\"\n+msgstr \"\"\n+\"Non è possibile effettuare una correzione durante una fusione.\\n\"\n+\"\\n\"\n+\"In questo momento si sta effettuando una fusione che non è stata del tutto \"\n+\"completata. Non puoi correggere il commit precedente a meno che prima tu non \"\n+\"interrompa l'operazione di fusione in corso.\\n\"\n+\n+#: lib/commit.tcl:49\n+msgid \"Error loading commit data for amend:\"\n+msgstr \"Errore durante il caricamento dei dati da correggere:\"\n+\n+#: lib/commit.tcl:76\n+msgid \"Unable to obtain your identity:\"\n+msgstr \"Impossibile ottenere la tua identità:\"\n+\n+#: lib/commit.tcl:81\n+msgid \"Invalid GIT_COMMITTER_IDENT:\"\n+msgstr \"GIT_COMMITTER_IDENT non valida:\"\n+\n+#: lib/commit.tcl:133\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before another commit can be created.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"L'ultimo stato analizzato non corrisponde allo stato del repository.\\n\"\n+\"\\n\"\n+\"Un altro programma Git ha modificato questo repository dall'ultima analisi. \"\n+\"Bisogna effettuare una nuova analisi prima di poter creare un nuovo commit.\\n\"\n+\"\\n\"\n+\"La nuova analisi comincerà ora.\\n\"\n+\n+#: lib/commit.tcl:154\n+#, tcl-format\n+msgid \"\"\n+\"Unmerged files cannot be committed.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.  You must resolve them and stage the file \"\n+\"before committing.\\n\"\n+msgstr \"\"\n+\"Non è possibile effettuare il commit di file non sottoposti a fusione.\\n\"\n+\"\\n\"\n+\"Il file %s presenta dei conflitti. Devi risolverli e preparare il file \"\n+\"per il commit prima di effettuare questa azione.\\n\"\n+\n+#: lib/commit.tcl:162\n+#, tcl-format\n+msgid \"\"\n+\"Unknown file state %s detected.\\n\"\n+\"\\n\"\n+\"File %s cannot be committed by this program.\\n\"\n+msgstr \"\"\n+\"Stato di file %s sconosciuto.\\n\"\n+\"\\n\"\n+\"Non si può effettuare il commit del file %s con questo programma.\\n\"\n+\n+#: lib/commit.tcl:170\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"You must stage at least 1 file before you can commit.\\n\"\n+msgstr \"\"\n+\"Nessuna modifica per la quale effettuare il commit.\\n\"\n+\"\\n\"\n+\"Devi preparare per il commit almeno 1 file prima di effettuare questa operazione.\\n\"\n+\n+#: lib/commit.tcl:183\n+msgid \"\"\n+\"Please supply a commit message.\\n\"\n+\"\\n\"\n+\"A good commit message has the following format:\\n\"\n+\"\\n\"\n+\"- First line: Describe in one sentance what you did.\\n\"\n+\"- Second line: Blank\\n\"\n+\"- Remaining lines: Describe why this change is good.\\n\"\n+msgstr \"\"\n+\"Bisogna fornire un messaggio di commit.\\n\"\n+\"\\n\"\n+\"Un buon messaggio di commit ha il seguente formato:\\n\"\n+\"\\n\"\n+\"- Prima linea: descrivi in una frase ciò che hai fatto.\\n\"\n+\"- Seconda linea: vuota.\\n\"\n+\"- Terza linea: spiga a cosa serve la tua modifica.\\n\"\n+\n+#: lib/commit.tcl:257\n+msgid \"write-tree failed:\"\n+msgstr \"write-tree fallito:\"\n+\n+#: lib/commit.tcl:279\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"No files were modified by this commit and it was not a merge commit.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"Nessuna modifica pronta per il commit.\\n\"\n+\"\\n\"\n+\"Questo commit non modifica alcun file e non effettua alcuna fusione.\\n\"\n+\"\\n\"\n+\"Si procederà subito ad una nuova analisi.\\n\"\n+\n+#: lib/commit.tcl:286\n+msgid \"No changes to commit.\"\n+msgstr \"Nessuna modifica pronta per il commit.\"\n+\n+#: lib/commit.tcl:317\n+msgid \"commit-tree failed:\"\n+msgstr \"commit-tree fallito:\"\n+\n+#: lib/commit.tcl:339\n+msgid \"update-ref failed:\"\n+msgstr \"update-ref fallito:\"\n+\n+#: lib/commit.tcl:430\n+#, tcl-format\n+msgid \"Created commit %s: %s\"\n+msgstr \"Creato commit %s: %s\"\n+\n+#: lib/console.tcl:55\n+msgid \"Working... please wait...\"\n+msgstr \"Elaborazione in corso... attendere...\"\n+\n+#: lib/console.tcl:184\n+msgid \"Success\"\n+msgstr \"Successo\"\n+\n+#: lib/console.tcl:194\n+msgid \"Error: Command Failed\"\n+msgstr \"Errore: comando fallito\"\n+\n+#: lib/database.tcl:43\n+msgid \"Number of loose objects\"\n+msgstr \"Numero di oggetti slegati\"\n+\n+#: lib/database.tcl:44\n+msgid \"Disk space used by loose objects\"\n+msgstr \"Spazio su disco utilizzato da oggetti slegati\"\n+\n+#: lib/database.tcl:45\n+msgid \"Number of packed objects\"\n+msgstr \"Numero di oggetti impacchettati\"\n+\n+#: lib/database.tcl:46\n+msgid \"Number of packs\"\n+msgstr \"Numero di pacchetti\"\n+\n+#: lib/database.tcl:47\n+msgid \"Disk space used by packed objects\"\n+msgstr \"Spazio su disco utilizzato da oggetti impacchettati\"\n+\n+#: lib/database.tcl:48\n+msgid \"Packed objects waiting for pruning\"\n+msgstr \"Oggetti impacchettati che attendono la potatura\"\n+\n+#: lib/database.tcl:49\n+msgid \"Garbage files\"\n+msgstr \"File inutili\"\n+\n+#: lib/database.tcl:72\n+msgid \"Compressing the object database\"\n+msgstr \"Compressione del database in corso\"\n+\n+#: lib/database.tcl:83\n+msgid \"Verifying the object database with fsck-objects\"\n+msgstr \"Verifica dell'archivio con fsck-objects in corso\"\n+\n+#: lib/diff.tcl:42\n+#, tcl-format\n+msgid \"\"\n+\"No differences detected.\\n\"\n+\"\\n\"\n+\"%s has no changes.\\n\"\n+\"\\n\"\n+\"The modification date of this file was updated by another application, but \"\n+\"the content within the file was not changed.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started to find other files which may have \"\n+\"the same state.\"\n+msgstr \"\"\n+\"Non sono state trovate differenze.\\n\"\n+\"\\n\"\n+\"%s non ha modifiche.\\n\"\n+\"\\n\"\n+\"La data di modifica di questo file è stata cambiata da un'altra \"\n+\"applicazione, ma il contenuto del file è rimasto invariato.\\n\"\n+\"\\n\"\n+\"Si procederà automaticamente ad una nuova analisi per trovare altri file che \"\n+\"potrebbero avere lo stesso stato.\"\n+\n+#: lib/diff.tcl:97\n+msgid \"Error loading file:\"\n+msgstr \"Errore nel caricamento del file:\"\n+\n+#: lib/diff.tcl:162\n+msgid \"Error loading diff:\"\n+msgstr \"Errore nel caricamento delle differenze:\"\n+\n+#: lib/diff.tcl:278\n+msgid \"Failed to unstage selected hunk.\"\n+msgstr \"La sezione scelta è ancora pronta per il commit.\"\n+\n+#: lib/diff.tcl:285\n+msgid \"Failed to stage selected hunk.\"\n+msgstr \"La sezione scelta non è ancora pronta per il commit.\"\n+\n+#: lib/error.tcl:12 lib/error.tcl:102\n+msgid \"error\"\n+msgstr \"errore\"\n+\n+#: lib/error.tcl:28\n+msgid \"warning\"\n+msgstr \"avviso\"\n+\n+#: lib/error.tcl:81\n+msgid \"You must correct the above errors before committing.\"\n+msgstr \"Bisogna correggere gli errori suddetti prima di effettuare un commit.\"\n+\n+#: lib/index.tcl:364\n+#, tcl-format\n+msgid \"Revert changes in file %s?\"\n+msgstr \"Annullare le modifiche nel file %s?\"\n+\n+#: lib/index.tcl:366\n+#, tcl-format\n+msgid \"Revert changes in these %i files?\"\n+msgstr \"Annullare le modifiche in questi %i file?\"\n+\n+#: lib/index.tcl:372\n+msgid \"Any unstaged changes will be permanently lost by the revert.\"\n+msgstr \"Tutte le modifiche non preparate per il commit saranno perse per sempre.\"\n+\n+#: lib/index.tcl:375\n+msgid \"Do Nothing\"\n+msgstr \"Non fare niente\"\n+\n+#: lib/merge.tcl:13\n+msgid \"\"\n+\"Cannot merge while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit before starting any type of merge.\\n\"\n+msgstr \"\"\n+\"Non posso effettuare fusioni durante una correzione.\\n\"\n+\"\\n\"\n+\"Bisogna finire di correggere questo commit prima di iniziare una qualunque \"\n+\"fusione.\\n\"\n+\n+#: lib/merge.tcl:27\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before a merge can be performed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"L'ultimo stato analizzato non corrisponde allo stato del repository.\\n\"\n+\"\\n\"\n+\"Un altro programma Git ha modificato questo repository dall'ultima analisi.\"\n+\"Bisogna effettuare una nuova analisi prima di poter effettuare una fusione.\\n\"\n+\"\\n\"\n+\"La nuova analisi comincerà ora.\\n\"\n+\n+#: lib/merge.tcl:44\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a conflicted merge.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.\\n\"\n+\"\\n\"\n+\"You must resolve them, stage the file, and commit to complete the current \"\n+\"merge.  Only then can you begin another merge.\\n\"\n+msgstr \"\"\n+\"Sei nel mezzo di una fusione con conflitti.\\n\"\n+\"\\n\"\n+\"Il file %s ha dei conflitti.\\n\"\n+\"\\n\"\n+\"Bisogna risolvere i conflitti, preparare il file per il commit ed infine \"\n+\"effettuare un commit \"\n+\"per completare la fusione corrente. Solo a questo punto potrai iniziare \"\n+\"un'altra fusione.\\n\"\n+\n+#: lib/merge.tcl:54\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a change.\\n\"\n+\"\\n\"\n+\"File %s is modified.\\n\"\n+\"\\n\"\n+\"You should complete the current commit before starting a merge.  Doing so \"\n+\"will help you abort a failed merge, should the need arise.\\n\"\n+msgstr \"\"\n+\"Sei nel mezzo di una modifica.\\n\"\n+\"\\n\"\n+\"Il file %s è stato modificato.\\n\"\n+\"\\n\"\n+\"Bisogna completare il commit corrente prima di iniziare una fusione. In \"\n+\"questo modo sarà più facile interrompere una fusione non riuscita, nel caso \"\n+\"ce ne fosse bisogno.\\n\"\n+\n+#: lib/merge.tcl:106\n+#, tcl-format\n+msgid \"%s of %s\"\n+msgstr \"%s di %s\"\n+\n+#: lib/merge.tcl:119\n+#, tcl-format\n+msgid \"Merging %s and %s\"\n+msgstr \"Fusione di %s e %s in corso\"\n+\n+#: lib/merge.tcl:131\n+msgid \"Merge completed successfully.\"\n+msgstr \"Fusione completata con successo.\"\n+\n+#: lib/merge.tcl:133\n+msgid \"Merge failed.  Conflict resolution is required.\"\n+msgstr \"Fusione fallita. Bisogna risolvere i conflitti.\"\n+\n+#: lib/merge.tcl:158\n+#, tcl-format\n+msgid \"Merge Into %s\"\n+msgstr \"Fusione in %s\"\n+\n+#: lib/merge.tcl:177\n+msgid \"Revision To Merge\"\n+msgstr \"Revisione da fondere\"\n+\n+#: lib/merge.tcl:212\n+msgid \"\"\n+\"Cannot abort while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit.\\n\"\n+msgstr \"\"\n+\"Interruzione impossibile durante una correzione.\\n\"\n+\"\\n\"\n+\"Bisogna finire di correggere questo commit.\\n\"\n+\n+#: lib/merge.tcl:222\n+msgid \"\"\n+\"Abort merge?\\n\"\n+\"\\n\"\n+\"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\\n\"\n+\"\\n\"\n+\"Continue with aborting the current merge?\"\n+msgstr \"\"\n+\"Interrompere fusione?\\n\"\n+\"\\n\"\n+\"L'interruzione della fusione corrente causerà la perdita di *TUTTE* le \"\n+\"modifiche non ancora presenti nei commit.\\n\"\n+\"\\n\"\n+\"Continuare con l'interruzione della fusione corrente?\"\n+\n+#: lib/merge.tcl:228\n+msgid \"\"\n+\"Reset changes?\\n\"\n+\"\\n\"\n+\"Resetting the changes will cause *ALL* uncommitted changes to be lost.\\n\"\n+\"\\n\"\n+\"Continue with resetting the current changes?\"\n+msgstr \"\"\n+\"Annullare le modifiche?\\n\"\n+\"\\n\"\n+\"L'annullamento delle modifiche causerà la perdita di *TUTTE* le \"\n+\"modifiche non ancora presenti nei commit.\\n\"\n+\"\\n\"\n+\"Continuare con l'annullamento delle modifiche correnti?\"\n+\n+#: lib/merge.tcl:239\n+msgid \"Aborting\"\n+msgstr \"Interruzione in corso\"\n+\n+#: lib/merge.tcl:266\n+msgid \"Abort failed.\"\n+msgstr \"Interruzione fallita.\"\n+\n+#: lib/merge.tcl:268\n+msgid \"Abort completed.  Ready.\"\n+msgstr \"Interruzione completata. Pronto.\"\n+\n+#: lib/option.tcl:77\n+msgid \"git-gui - a graphical user interface for Git.\"\n+msgstr \"git-gui - un'interfaccia grafica per Git.\"\n+\n+#: lib/option.tcl:164\n+msgid \"Restore Defaults\"\n+msgstr \"Ripristina predefiniti\"\n+\n+#: lib/option.tcl:168\n+msgid \"Save\"\n+msgstr \"Salva\"\n+\n+#: lib/option.tcl:178\n+#, tcl-format\n+msgid \"%s Repository\"\n+msgstr \"%s archivio\"\n+\n+#: lib/option.tcl:179\n+msgid \"Global (All Repositories)\"\n+msgstr \"Globale (Tutti i repository)\"\n+\n+#: lib/option.tcl:185\n+msgid \"User Name\"\n+msgstr \"Nome utente\"\n+\n+#: lib/option.tcl:186\n+msgid \"Email Address\"\n+msgstr \"Indirizzo Email\"\n+\n+#: lib/option.tcl:188\n+msgid \"Summarize Merge Commits\"\n+msgstr \"Riepilogo nei commit di fusione\"\n+\n+#: lib/option.tcl:189\n+msgid \"Merge Verbosity\"\n+msgstr \"Verbosità della fusione\"\n+\n+#: lib/option.tcl:190\n+msgid \"Show Diffstat After Merge\"\n+msgstr \"Mostra statistiche delle differenze dopo la fusione\"\n+\n+#: lib/option.tcl:192\n+msgid \"Trust File Modification Timestamps\"\n+msgstr \"Fidati delle date di modifica dei file\"\n+\n+#: lib/option.tcl:193\n+msgid \"Prune Tracking Branches During Fetch\"\n+msgstr \"Effettua potatura dei rami in 'tracking' durante il recupero\"\n+\n+#: lib/option.tcl:194\n+msgid \"Match Tracking Branches\"\n+msgstr \"Appaia rami in 'tracking'\"\n+\n+#: lib/option.tcl:195\n+msgid \"Number of Diff Context Lines\"\n+msgstr \"Numero di linee di contesto nelle differenze\"\n+\n+#: lib/option.tcl:196\n+msgid \"New Branch Name Template\"\n+msgstr \"Modello per il nome di un nuovo ramo\"\n+\n+#: lib/option.tcl:305\n+msgid \"Failed to completely save options:\"\n+msgstr \"Fallimento nel salvataggio completo delle opzioni:\"\n+\n+#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34\n+msgid \"Delete Remote Branch\"\n+msgstr \"Cancella ramo remoto\"\n+\n+#: lib/remote_branch_delete.tcl:47\n+msgid \"From Repository\"\n+msgstr \"Da archivio\"\n+\n+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118\n+msgid \"Remote:\"\n+msgstr \"Remoto:\"\n+\n+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133\n+msgid \"Arbitrary URL:\"\n+msgstr \"URL arbitrario:\"\n+\n+#: lib/remote_branch_delete.tcl:84\n+msgid \"Branches\"\n+msgstr \"Rami\"\n+\n+#: lib/remote_branch_delete.tcl:109\n+msgid \"Delete Only If\"\n+msgstr \"Elimina solo se\"\n+\n+#: lib/remote_branch_delete.tcl:111\n+msgid \"Merged Into:\"\n+msgstr \"Fuso in:\"\n+\n+#: lib/remote_branch_delete.tcl:119\n+msgid \"Always (Do not perform merge checks)\"\n+msgstr \"Sempre (Non effettuare controlli durante la fusione)\"\n+\n+#: lib/remote_branch_delete.tcl:152\n+msgid \"A branch is required for 'Merged Into'.\"\n+msgstr \"Si richiede un ramo per 'Fuso in'.\"\n+\n+#: lib/remote_branch_delete.tcl:189\n+#, tcl-format\n+msgid \"\"\n+\"One or more of the merge tests failed because you have not fetched the \"\n+\"necessary commits.  Try fetching from %s first.\"\n+msgstr \"\"\n+\"Una o più verifiche di fusione sono fallite perché mancano i commit \"\n+\"necessari. Prova prima a prelevarli da %s.\"\n+\n+#: lib/remote_branch_delete.tcl:207\n+msgid \"Please select one or more branches to delete.\"\n+msgstr \"Scegliere uno o più rami da cancellare.\"\n+\n+#: lib/remote_branch_delete.tcl:216\n+msgid \"\"\n+\"Recovering deleted branches is difficult.\\n\"\n+\"\\n\"\n+\"Delete the selected branches?\"\n+msgstr \"\"\n+\"Prelevare rami cancellati è difficile.\\n\"\n+\"\\n\"\n+\"Cancellare i rami selezionati?\"\n+\n+#: lib/remote_branch_delete.tcl:226\n+#, tcl-format\n+msgid \"Deleting branches from %s\"\n+msgstr \"Cancellazione rami da %s\"\n+\n+#: lib/remote_branch_delete.tcl:286\n+msgid \"No repository selected.\"\n+msgstr \"Nessun archivio selezionato.\"\n+\n+#: lib/remote_branch_delete.tcl:291\n+#, tcl-format\n+msgid \"Scanning %s...\"\n+msgstr \"Analisi in corso %s...\"\n+\n+#: lib/remote.tcl:162\n+#, tcl-format\n+msgid \"Fetch from %s...\"\n+msgstr \"Preleva da %s...\"\n+\n+#: lib/remote.tcl:172\n+#, tcl-format\n+msgid \"Prune from %s...\"\n+msgstr \"Effettua potatura da %s...\"\n+\n+#: lib/remote.tcl:206\n+#, tcl-format\n+msgid \"Push to %s...\"\n+msgstr \"Propaga verso %s...\"\n+\n+#: lib/shortcut.tcl:26 lib/shortcut.tcl:74\n+msgid \"Cannot write script:\"\n+msgstr \"Impossibile scrivere script:\"\n+\n+#: lib/shortcut.tcl:149\n+msgid \"Cannot write icon:\"\n+msgstr \"Impossibile scrivere icona:\"\n+\n+#: lib/status_bar.tcl:58\n+#, tcl-format\n+msgid \"%s ... %i of %i %s (%2i%%)\"\n+msgstr \"%s ... %i di %i %s (%2i%%)\"\n+\n+#: lib/transport.tcl:7\n+#, tcl-format\n+msgid \"Fetching new changes from %s\"\n+msgstr \"Recupero nuove modifiche da %s\"\n+\n+#: lib/transport.tcl:19\n+#, tcl-format\n+msgid \"Pruning tracking branches deleted from %s\"\n+msgstr \"Effettua potatura dei rami in 'tracking' cancellati da %s\"\n+\n+#: lib/transport.tcl:26\n+#, tcl-format\n+msgid \"Pushing changes to %s\"\n+msgstr \"Propagazione modifiche a %s\"\n+\n+#: lib/transport.tcl:68\n+#, tcl-format\n+msgid \"Pushing %s %s to %s\"\n+msgstr \"Propagazione %s %s a %s\"\n+\n+#: lib/transport.tcl:84\n+msgid \"Push Branches\"\n+msgstr \"Propaga rami\"\n+\n+#: lib/transport.tcl:98\n+msgid \"Source Branches\"\n+msgstr \"Rami di origine\"\n+\n+#: lib/transport.tcl:115\n+msgid \"Destination Repository\"\n+msgstr \"Archivio di destinazione\"\n+\n+#: lib/transport.tcl:153\n+msgid \"Transfer Options\"\n+msgstr \"Opzioni di trasferimento\"\n+\n+#: lib/transport.tcl:155\n+msgid \"Use thin pack (for slow network connections)\"\n+msgstr \"Utilizza 'thin pack' (per connessioni lente)\"\n+\n+#: lib/transport.tcl:159\n+msgid \"Include tags\"\n+msgstr \"Includi etichette\"\n+\n-- \n1.5.3.2.g46909\n\n"},{"id":"52231","messageId":"Pine.LNX.4.64.0709021736230.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 12/15] git-gui: initial version of russian translation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:36:39Z","receivedAt":"2007-09-02T16:36:39Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nFrom: Irina Riesen <irina.riesen@gmail.com>\n\nSigned-off-by: Alex Riesen <raa.lkml@gmail.com>\nSigned-off-by: Irina Riesen <irina.riesen@gmail.com>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n po/ru.po | 1480 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 1480 insertions(+), 0 deletions(-)\n create mode 100644 po/ru.po\n\ndiff --git a/po/ru.po b/po/ru.po\nnew file mode 100644\nindex 0000000..c44d30a\n--- /dev/null\n+++ b/po/ru.po\n@@ -0,0 +1,1480 @@\n+# Translation of git-gui to russian\n+# Copyright (C) 2007 Shawn Pearce\n+# This file is distributed under the same license as the git-gui package.\n+# Irina Riesen <irina.riesen@gmail.com>, 2007.\n+#\n+msgid \"\"\n+msgstr \"\"\n+\"Project-Id-Version: git-gui\\n\"\n+\"Report-Msgid-Bugs-To: \\n\"\n+\"POT-Creation-Date: 2007-07-27 19:33+0200\\n\"\n+\"PO-Revision-Date: 2007-07-28 18:30+0200\\n\"\n+\"Last-Translator: Irina Riesen <irina.riesen@gmail.com>\\n\"\n+\"Language-Team: Russian Translation <git@vger.kernel.org>\\n\"\n+\"MIME-Version: 1.0\\n\"\n+\"Content-Type: text/plain; charset=UTF-8\\n\"\n+\"Content-Transfer-Encoding: 8bit\\n\"\n+\n+#: git-gui.sh:531\n+msgid \"Cannot find git in PATH.\"\n+msgstr \"git не найден в PATH.\"\n+\n+#: git-gui.sh:550\n+msgid \"Cannot parse Git version string:\"\n+msgstr \"\"\n+\"Невозможно распознать строку версии Git: \"\n+\n+#: git-gui.sh:567\n+#, tcl-format\n+msgid \"\"\n+\"Git version cannot be determined.\\n\"\n+\"\\n\"\n+\"%s claims it is version '%s'.\\n\"\n+\"\\n\"\n+\"%s requires at least Git 1.5.0 or later.\\n\"\n+\"\\n\"\n+\"Assume '%s' is version 1.5.0?\\n\"\n+msgstr \"\"\n+\n+#: git-gui.sh:689\n+msgid \"Cannot find the git directory:\"\n+msgstr \"Каталог Git не найден:\"\n+\n+#: git-gui.sh:697\n+msgid \"Git directory not found:\"\n+msgstr \"Каталог Git не найден:\"\n+\n+#: git-gui.sh:703\n+msgid \"Cannot use funny .git directory:\"\n+msgstr \"Каталог.git испорчен: \"\n+\n+#: git-gui.sh:708\n+msgid \"No working directory\"\n+msgstr \"Отсутствует рабочий каталог\"\n+\n+#: git-gui.sh:853\n+msgid \"Refreshing file status...\"\n+msgstr \"Обновление состояния файлов проекта...\"\n+\n+#: git-gui.sh:886\n+msgid \"Scanning for modified files ...\"\n+msgstr \"Поиск измененных файлов...\"\n+\n+#: git-gui.sh:1052 lib/browser.tcl:233\n+msgid \"Ready.\"\n+msgstr \"Готово.\"\n+\n+#: git-gui.sh:1343\n+msgid \"Unmodified\"\n+msgstr \"Не изменено\"\n+\n+#: git-gui.sh:1345\n+msgid \"Modified, not staged\"\n+msgstr \"Изменено, но не включено\"\n+\n+#: git-gui.sh:1346 git-gui.sh:1351\n+msgid \"Staged for commit\"\n+msgstr \"Подготовлено для сохранения\"\n+\n+#: git-gui.sh:1347 git-gui.sh:1352\n+msgid \"Portions staged for commit\"\n+msgstr \"Части, подготовленные для сохранения\"\n+\n+#: git-gui.sh:1348 git-gui.sh:1353\n+#, fuzzy\n+msgid \"Staged for commit, missing\"\n+msgstr \"\"\n+\"Подготовлено для сохранения, отсутствует\"\n+\n+#: git-gui.sh:1350\n+msgid \"Untracked, not staged\"\n+msgstr \"Не отслеживается, не подготовлено\"\n+\n+#: git-gui.sh:1355\n+msgid \"Missing\"\n+msgstr \"Отсутствует\"\n+\n+#: git-gui.sh:1356\n+msgid \"Staged for removal\"\n+msgstr \"Подготовлено для удаления\"\n+\n+#: git-gui.sh:1357\n+msgid \"Staged for removal, still present\"\n+msgstr \"\"\n+\"Подготовлено для удаления, но еще не \"\n+\"удалено\"\n+\n+#: git-gui.sh:1359 git-gui.sh:1360 git-gui.sh:1361 git-gui.sh:1362\n+msgid \"Requires merge resolution\"\n+msgstr \"\"\n+\"Требуется разрешение конфликта при \"\n+\"объединении\"\n+\n+#: git-gui.sh:1404\n+msgid \"Starting gitk... please wait...\"\n+msgstr \"Запускается gitk... пожалуйста, ждите...\"\n+\n+#: git-gui.sh:1413\n+#, tcl-format\n+msgid \"\"\n+\"Unable to start gitk:\\n\"\n+\"\\n\"\n+\"%s does not exist\"\n+msgstr \"\"\n+\"Не удалось запустить gitk:\\n\"\n+\"\\n\"\n+\"%s не существует\"\n+\n+#: git-gui.sh:1630\n+#, tcl-format\n+msgid \"Invalid font specified in gui.%s:\"\n+msgstr \"\"\n+\"В оболочке установлен неверный шрифт.%s:\"\n+\n+#: git-gui.sh:1655\n+msgid \"Main Font\"\n+msgstr \"Шрифт интерфейса\"\n+\n+#: git-gui.sh:1656\n+msgid \"Diff/Console Font\"\n+msgstr \"Шрифт в консоли diff\"\n+\n+#: git-gui.sh:1670\n+msgid \"Repository\"\n+msgstr \"Репозиторий\"\n+\n+#: git-gui.sh:1671\n+msgid \"Edit\"\n+msgstr \"Редактировать\"\n+\n+#: git-gui.sh:1673\n+msgid \"Branch\"\n+msgstr \"Ветвь\"\n+\n+#: git-gui.sh:1676 git-gui.sh:1854 git-gui.sh:2193\n+msgid \"Commit\"\n+msgstr \"Сохранить\"\n+\n+#: git-gui.sh:1679 lib/merge.tcl:96 lib/merge.tcl:157 lib/merge.tcl:173\n+msgid \"Merge\"\n+msgstr \"Объединить\"\n+\n+#: git-gui.sh:1680\n+msgid \"Fetch\"\n+msgstr \"Получить\"\n+\n+#: git-gui.sh:1681 git-gui.sh:2199 lib/transport.tcl:88 lib/transport.tcl:172\n+msgid \"Push\"\n+msgstr \"Отправить\"\n+\n+#: git-gui.sh:1690\n+msgid \"Browse Current Branch's Files\"\n+msgstr \"Просмотреть файлы текущей ветви\"\n+\n+#: git-gui.sh:1692\n+#, fuzzy, tcl-format\n+msgid \"Browse %s's Files\"\n+msgstr \"Показать файлы ветви\"\n+\n+#: git-gui.sh:1694\n+#, fuzzy\n+msgid \"Browse Branch Files...\"\n+msgstr \"Показать файлы ветви\"\n+\n+#: git-gui.sh:1699\n+msgid \"Visualize Current Branch's History\"\n+msgstr \"История текущей ветви наглядно\"\n+\n+#: git-gui.sh:1701\n+#, fuzzy, tcl-format\n+msgid \"Visualize %s's History\"\n+msgstr \"История всех ветвей наглядно\"\n+\n+#: git-gui.sh:1703\n+msgid \"Visualize All Branch History\"\n+msgstr \"История всех ветвей наглядно\"\n+\n+#: git-gui.sh:1708 lib/database.tcl:27 lib/database.tcl:67\n+msgid \"Database Statistics\"\n+msgstr \"Статистика базы данных\"\n+\n+#: git-gui.sh:1711 lib/database.tcl:34\n+msgid \"Compress Database\"\n+msgstr \"Сжать базу данных\"\n+\n+#: git-gui.sh:1714\n+msgid \"Verify Database\"\n+msgstr \"Проверить базу данных\"\n+\n+#: git-gui.sh:1721 git-gui.sh:1725 git-gui.sh:1729 lib/shortcut.tcl:9\n+#: lib/shortcut.tcl:45 lib/shortcut.tcl:84\n+msgid \"Create Desktop Icon\"\n+msgstr \"Создать ярлык на рабочем столе\"\n+\n+#: git-gui.sh:1734\n+msgid \"Quit\"\n+msgstr \"Выход\"\n+\n+#: git-gui.sh:1741\n+msgid \"Undo\"\n+msgstr \"Отменить\"\n+\n+#: git-gui.sh:1744\n+msgid \"Redo\"\n+msgstr \"Повторить\"\n+\n+#: git-gui.sh:1748 git-gui.sh:2263\n+msgid \"Cut\"\n+msgstr \"Вырезать\"\n+\n+#: git-gui.sh:1751 git-gui.sh:2266 git-gui.sh:2337 git-gui.sh:2409\n+#: lib/console.tcl:69\n+msgid \"Copy\"\n+msgstr \"Копировать\"\n+\n+#: git-gui.sh:1754 git-gui.sh:2269\n+msgid \"Paste\"\n+msgstr \"Вставить\"\n+\n+#: git-gui.sh:1757 git-gui.sh:2272 lib/branch_delete.tcl:26\n+#: lib/remote_branch_delete.tcl:38\n+msgid \"Delete\"\n+msgstr \"Удалить\"\n+\n+#: git-gui.sh:1761 git-gui.sh:2276 git-gui.sh:2413 lib/console.tcl:71\n+msgid \"Select All\"\n+msgstr \"Выделить все\"\n+\n+#: git-gui.sh:1770\n+msgid \"Create...\"\n+msgstr \"Создать...\"\n+\n+#: git-gui.sh:1776\n+msgid \"Checkout...\"\n+msgstr \"Перейти...\"\n+\n+#: git-gui.sh:1782\n+msgid \"Rename...\"\n+msgstr \"Переименовать...\"\n+\n+#: git-gui.sh:1787 git-gui.sh:1885\n+msgid \"Delete...\"\n+msgstr \"Удалить...\"\n+\n+#: git-gui.sh:1792\n+msgid \"Reset...\"\n+msgstr \"Сбросить...\"\n+\n+#: git-gui.sh:1804 git-gui.sh:2210\n+msgid \"New Commit\"\n+msgstr \"Новое состояние\"\n+\n+#: git-gui.sh:1812 git-gui.sh:2217\n+msgid \"Amend Last Commit\"\n+msgstr \"Исправить последнее состояние\"\n+\n+#: git-gui.sh:1821 git-gui.sh:2177 lib/remote_branch_delete.tcl:99\n+msgid \"Rescan\"\n+msgstr \"Перечитать\"\n+\n+#: git-gui.sh:1827\n+msgid \"Add To Commit\"\n+msgstr \"Подготовить к сохранению\"\n+\n+#: git-gui.sh:1832\n+msgid \"Add Existing To Commit\"\n+msgstr \"\"\n+\"Подготовить имеющиеся файлы к сохранению\"\n+\n+#: git-gui.sh:1838\n+msgid \"Unstage From Commit\"\n+msgstr \"Убрать из подготовленного\"\n+\n+#: git-gui.sh:1843 lib/index.tcl:376\n+msgid \"Revert Changes\"\n+msgstr \"Отменить изменения\"\n+\n+#: git-gui.sh:1850 git-gui.sh:2189 git-gui.sh:2287\n+msgid \"Sign Off\"\n+msgstr \"Подписать\"\n+\n+#: git-gui.sh:1865\n+msgid \"Local Merge...\"\n+msgstr \"Локальное объединение...\"\n+\n+#: git-gui.sh:1870\n+msgid \"Abort Merge...\"\n+msgstr \"Прервать объединение...\"\n+\n+#: git-gui.sh:1882\n+msgid \"Push...\"\n+msgstr \"Отправить...\"\n+\n+#: git-gui.sh:1892\n+msgid \"Apple\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1895 git-gui.sh:1942 lib/option.tcl:65\n+#, tcl-format\n+msgid \"About %s\"\n+msgstr \"О %s\"\n+\n+#: git-gui.sh:1897 git-gui.sh:1903 git-gui.sh:2455\n+msgid \"Options...\"\n+msgstr \"Настройки...\"\n+\n+#: git-gui.sh:1917\n+msgid \"Running miga...\"\n+msgstr \"\"\n+\n+#: git-gui.sh:1938\n+msgid \"Help\"\n+msgstr \"Помощь\"\n+\n+#: git-gui.sh:1979\n+msgid \"Online Documentation\"\n+msgstr \"Документация в интернете\"\n+\n+#: git-gui.sh:2095\n+msgid \"Current Branch:\"\n+msgstr \"Текущая ветвь:\"\n+\n+#: git-gui.sh:2116\n+msgid \"Staged Changes (Will Be Committed)\"\n+msgstr \"Подготовлено (будет сохранено)\"\n+\n+#: git-gui.sh:2136\n+msgid \"Unstaged Changes (Will Not Be Committed)\"\n+msgstr \"Изменено (не будет сохранено)\"\n+\n+#: git-gui.sh:2183\n+msgid \"Add Existing\"\n+msgstr \"Добавить имеющиеся файлы\"\n+\n+#: git-gui.sh:2229\n+#, fuzzy\n+msgid \"Initial Commit Message:\"\n+msgstr \"\"\n+\"Первоначальный комментарий к состоянию:\"\n+\n+#: git-gui.sh:2230\n+#, fuzzy\n+msgid \"Amended Commit Message:\"\n+msgstr \"Исправленный комментарий к состоянию:\"\n+\n+#: git-gui.sh:2231\n+#, fuzzy\n+msgid \"Amended Initial Commit Message:\"\n+msgstr \"\"\n+\"Первоначальный комментарий к \"\n+\"исправленному состоянию:\"\n+\n+#: git-gui.sh:2232\n+#, fuzzy\n+msgid \"Amended Merge Commit Message:\"\n+msgstr \"\"\n+\"Комментарий к исправленному объединению:\"\n+\n+#: git-gui.sh:2233\n+msgid \"Merge Commit Message:\"\n+msgstr \"Комментарий к объединению:\"\n+\n+#: git-gui.sh:2234\n+msgid \"Commit Message:\"\n+msgstr \"Комментарий к состоянию:\"\n+\n+#: git-gui.sh:2279 git-gui.sh:2417 lib/console.tcl:73\n+msgid \"Copy All\"\n+msgstr \"Копировать все\"\n+\n+#: git-gui.sh:2303 lib/blame.tcl:104\n+msgid \"File:\"\n+msgstr \"Файл:\"\n+\n+#: git-gui.sh:2405\n+msgid \"Refresh\"\n+msgstr \"Обновить\"\n+\n+#: git-gui.sh:2426\n+msgid \"Apply/Reverse Hunk\"\n+msgstr \"Применить/Убрать изменение\"\n+\n+#: git-gui.sh:2432\n+msgid \"Decrease Font Size\"\n+msgstr \"Уменьшить размер шрифта\"\n+\n+#: git-gui.sh:2436\n+msgid \"Increase Font Size\"\n+msgstr \"Увеличить размер шрифта\"\n+\n+#: git-gui.sh:2441\n+msgid \"Show Less Context\"\n+msgstr \"Меньше контекста\"\n+\n+#: git-gui.sh:2448\n+msgid \"Show More Context\"\n+msgstr \"Больше контекста\"\n+\n+#: git-gui.sh:2461\n+msgid \"Unstage Hunk From Commit\"\n+msgstr \"Не сохранять часть\"\n+\n+#: git-gui.sh:2463\n+msgid \"Stage Hunk For Commit\"\n+msgstr \"Подготовить часть для сохранения\"\n+\n+#: git-gui.sh:2473\n+msgid \"Initializing...\"\n+msgstr \"Инициализация...\"\n+\n+#: lib/blame.tcl:77\n+msgid \"File Viewer\"\n+msgstr \"Просмотр файла\"\n+\n+#: lib/blame.tcl:81\n+msgid \"Commit:\"\n+msgstr \"Сохраненное состояние:\"\n+\n+#: lib/blame.tcl:249\n+msgid \"Copy Commit\"\n+msgstr \"Копировать сохраненное состояние\"\n+\n+#: lib/blame.tcl:369\n+#, tcl-format\n+msgid \"Reading %s...\"\n+msgstr \"Чтение %s...\"\n+\n+#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19\n+msgid \"Checkout Branch\"\n+msgstr \"Перейти на ветвь\"\n+\n+#: lib/branch_checkout.tcl:23\n+msgid \"Checkout\"\n+msgstr \"Перейти\"\n+\n+#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35\n+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:269\n+#: lib/checkout_op.tcl:519 lib/merge.tcl:176 lib/option.tcl:172\n+#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92\n+msgid \"Cancel\"\n+msgstr \"Отменить\"\n+\n+#: lib/branch_checkout.tcl:32 lib/browser.tcl:274\n+msgid \"Revision\"\n+msgstr \"Версия\"\n+\n+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159\n+#: lib/option.tcl:274\n+msgid \"Options\"\n+msgstr \"Настройки\"\n+\n+#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92\n+msgid \"Fetch Tracking Branch\"\n+msgstr \"Получить изменения из внешней ветви\"\n+\n+#: lib/branch_checkout.tcl:44\n+msgid \"Detach From Local Branch\"\n+msgstr \"Отсоединить от локальной ветви\"\n+\n+#: lib/branch_create.tcl:22\n+msgid \"Create Branch\"\n+msgstr \"Создание ветви\"\n+\n+#: lib/branch_create.tcl:27\n+msgid \"Create New Branch\"\n+msgstr \"Создать новую ветвь\"\n+\n+#: lib/branch_create.tcl:31\n+msgid \"Create\"\n+msgstr \"Создать\"\n+\n+#: lib/branch_create.tcl:40\n+msgid \"Branch Name\"\n+msgstr \"Название ветви\"\n+\n+#: lib/branch_create.tcl:43\n+msgid \"Name:\"\n+msgstr \"Название:\"\n+\n+#: lib/branch_create.tcl:58\n+msgid \"Match Tracking Branch Name\"\n+msgstr \"Взять из имен ветвей слежения\"\n+\n+#: lib/branch_create.tcl:66\n+msgid \"Starting Revision\"\n+msgstr \"Начальная версия\"\n+\n+#: lib/branch_create.tcl:72\n+msgid \"Update Existing Branch:\"\n+msgstr \"Обновить имеющуюся ветвь:\"\n+\n+#: lib/branch_create.tcl:75\n+msgid \"No\"\n+msgstr \"Нет\"\n+\n+#: lib/branch_create.tcl:80\n+msgid \"Fast Forward Only\"\n+msgstr \"Только Fast Forward\"\n+\n+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:511\n+msgid \"Reset\"\n+msgstr \"Сброс\"\n+\n+#: lib/branch_create.tcl:97\n+msgid \"Checkout After Creation\"\n+msgstr \"После создания сделать текущей\"\n+\n+#: lib/branch_create.tcl:131\n+msgid \"Please select a tracking branch.\"\n+msgstr \"Укажите ветвь слежения.\"\n+\n+#: lib/branch_create.tcl:140\n+#, tcl-format\n+msgid \"Tracking branch %s is not a branch in the remote repository.\"\n+msgstr \"\"\n+\"Ветвь слежения %s не является ветвью во \"\n+\"внешнем репозитории.\"\n+\n+#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86\n+msgid \"Please supply a branch name.\"\n+msgstr \"Укажите название ветви.\"\n+\n+#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106\n+#, tcl-format\n+msgid \"'%s' is not an acceptable branch name.\"\n+msgstr \"Недопустимое название ветви '%s'.\"\n+\n+#: lib/branch_delete.tcl:15\n+msgid \"Delete Branch\"\n+msgstr \"Удаление ветви\"\n+\n+#: lib/branch_delete.tcl:20\n+msgid \"Delete Local Branch\"\n+msgstr \"Удалить локальную ветвь\"\n+\n+#: lib/branch_delete.tcl:37\n+msgid \"Local Branches\"\n+msgstr \"Локальные ветви\"\n+\n+#: lib/branch_delete.tcl:52\n+msgid \"Delete Only If Merged Into\"\n+msgstr \"\"\n+\"Удалить только в случае, если было \"\n+\"объединение с\"\n+\n+#: lib/branch_delete.tcl:54\n+msgid \"Always (Do not perform merge test.)\"\n+msgstr \"\"\n+\"Всегда (не выполнять проверку на \"\n+\"объединение)\"\n+\n+#: lib/branch_delete.tcl:103\n+#, tcl-format\n+msgid \"The following branches are not completely merged into %s:\"\n+msgstr \"\"\n+\"Следующие ветви объединены с %s не \"\n+\"полностью:\"\n+\n+#: lib/branch_delete.tcl:115\n+msgid \"\"\n+\"Recovering deleted branches is difficult. \\n\"\n+\"\\n\"\n+\" Delete the selected branches?\"\n+msgstr \"\"\n+\"Восстановить удаленную ветвь сложно. \\n\"\n+\"\\n\"\n+\" Удалить выбранные ветви?\"\n+\n+#: lib/branch_delete.tcl:141\n+#, tcl-format\n+msgid \"\"\n+\"Failed to delete branches:\\n\"\n+\"%s\"\n+msgstr \"\"\n+\"Не удалось удалить ветви:\\n\"\n+\"%s\"\n+\n+#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22\n+msgid \"Rename Branch\"\n+msgstr \"Переименование ветви\"\n+\n+#: lib/branch_rename.tcl:26\n+msgid \"Rename\"\n+msgstr \"Переименовать\"\n+\n+#: lib/branch_rename.tcl:36\n+msgid \"Branch:\"\n+msgstr \"Ветвь:\"\n+\n+#: lib/branch_rename.tcl:39\n+msgid \"New Name:\"\n+msgstr \"Новое название:\"\n+\n+#: lib/branch_rename.tcl:75\n+msgid \"Please select a branch to rename.\"\n+msgstr \"Укажите ветвь для переименования.\"\n+\n+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179\n+#, tcl-format\n+msgid \"Branch '%s' already exists.\"\n+msgstr \"Ветвь '%s' уже существует.\"\n+\n+#: lib/branch_rename.tcl:117\n+#, tcl-format\n+msgid \"Failed to rename '%s'.\"\n+msgstr \"Не удалось переименовать '%s'. \"\n+\n+#: lib/browser.tcl:10\n+msgid \"Starting...\"\n+msgstr \"Запуск...\"\n+\n+#: lib/browser.tcl:19\n+msgid \"File Browser\"\n+msgstr \"Просмотр списка файлов\"\n+\n+#: lib/browser.tcl:120 lib/browser.tcl:137\n+#, tcl-format\n+msgid \"Loading %s...\"\n+msgstr \"Загрузка %s...\"\n+\n+#: lib/browser.tcl:254 lib/browser.tcl:260\n+msgid \"Browse Branch Files\"\n+msgstr \"Показать файлы ветви\"\n+\n+#: lib/browser.tcl:265\n+msgid \"Browse\"\n+msgstr \"Показать\"\n+\n+#: lib/checkout_op.tcl:79\n+#, fuzzy, tcl-format\n+msgid \"Fetching %s from %s\"\n+msgstr \"Получение изменений из %s \"\n+\n+#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31\n+msgid \"Close\"\n+msgstr \"Закрыть\"\n+\n+#: lib/checkout_op.tcl:169\n+#, tcl-format\n+msgid \"Branch '%s' does not exist.\"\n+msgstr \"Ветвь '%s' не существует \"\n+\n+#: lib/checkout_op.tcl:205\n+#, tcl-format\n+msgid \"\"\n+\"Branch '%s' already exists.\\n\"\n+\"\\n\"\n+\"It cannot fast-forward to %s.\\n\"\n+\"A merge is required.\"\n+msgstr \"\"\n+\"Ветвь '%s' уже существует.\\n\"\n+\"\\n\"\n+\"Она не может быть прокручена(fast-forward) к %s.\\n\"\n+\"Требуется объединение.\"\n+\n+#: lib/checkout_op.tcl:219\n+#, tcl-format\n+msgid \"Merge strategy '%s' not supported.\"\n+msgstr \"\"\n+\"Операция объединения '%s' не \"\n+\"поддерживается.\"\n+\n+#: lib/checkout_op.tcl:238\n+#, tcl-format\n+msgid \"Failed to update '%s'.\"\n+msgstr \"Не удалось обновить '%s'.\"\n+\n+#: lib/checkout_op.tcl:250\n+msgid \"Index is already locked.\"\n+msgstr \"Индекс заблокирован.\"\n+\n+#: lib/checkout_op.tcl:265\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before the current branch can be changed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"Последнее прочитанное состояние \"\n+\"репозитория не соответствует текущему.\\n\"\n+\"\\n\"\n+\"С момента последней проверки репозиторий \"\n+\"был изменен другой программой \"\n+\"Git.Необходимо перечитать репозиторий, \"\n+\"прежде чем изменять текущую ветвь. \\n\"\n+\"\\n\"\n+\"Это будет сделано сейчас автоматически.\\n\"\n+\n+#: lib/checkout_op.tcl:352\n+#, tcl-format\n+msgid \"Aborted checkout of '%s' (file level merging is required).\"\n+msgstr \"\"\n+\"Прерван переход на '%s' (требуется \"\n+\"объединение на уровне файлов)\"\n+\n+#: lib/checkout_op.tcl:353\n+msgid \"File level merge required.\"\n+msgstr \"\"\n+\"Требуется объединение на уровне файлов.\"\n+\n+#: lib/checkout_op.tcl:357\n+#, tcl-format\n+msgid \"Staying on branch '%s'.\"\n+msgstr \"Ветвь '%s' остается текущей.\"\n+\n+#: lib/checkout_op.tcl:426\n+msgid \"\"\n+\"You are no longer on a local branch.\\n\"\n+\"\\n\"\n+\"If you wanted to be on a branch, create one now starting from 'This Detached \"\n+\"Checkout'.\"\n+msgstr \"\"\n+\"Вы находитесь не в локальной ветви.\\n\"\n+\"\\n\"\n+\"Если вы хотите снова вернуться к \"\n+\"какой-нибудь ветви, создайте ее сейчас, \"\n+\"начиная с 'Текущего отсоединенного \"\n+\"состояния'.\"\n+\n+#: lib/checkout_op.tcl:475\n+#, tcl-format\n+msgid \"Resetting '%s' to '%s' will lose the following commits:\"\n+msgstr \"\"\n+\"Сброс '%s' в '%s' приведет к потере следующих \"\n+\"сохраненных состояний: \"\n+\n+#: lib/checkout_op.tcl:497\n+msgid \"Recovering lost commits may not be easy.\"\n+msgstr \"\"\n+\"Восстановить потерянные сохраненные \"\n+\"состояния будет сложно.\"\n+\n+#: lib/checkout_op.tcl:502\n+#, tcl-format\n+msgid \"Reset '%s'?\"\n+msgstr \"Сбросить '%s'?\"\n+\n+#: lib/checkout_op.tcl:507 lib/merge.tcl:171\n+msgid \"Visualize\"\n+msgstr \"Наглядно\"\n+\n+#: lib/checkout_op.tcl:575\n+#, tcl-format\n+msgid \"\"\n+\"Failed to set current branch.\\n\"\n+\"\\n\"\n+\"This working directory is only partially switched.  We successfully updated \"\n+\"your files, but failed to update an internal Git file.\\n\"\n+\"\\n\"\n+\"This should not have occurred.  %s will now close and give up.\"\n+msgstr \"\"\n+\"Не удалось установить текущую ветвь.\\n\"\n+\"\\n\"\n+\"Ваш рабочий каталог обновлен только \"\n+\"частично. Были обновлены все файлы кроме \"\n+\"служебных файлов Git. \\n\"\n+\"\\n\"\n+\"Этого не должно было произойти. %s \"\n+\"завершается.\"\n+\n+#: lib/choose_rev.tcl:35\n+msgid \"This Detached Checkout\"\n+msgstr \"Текущее отсоединенное состояние\"\n+\n+#: lib/choose_rev.tcl:42\n+msgid \"Revision Expression:\"\n+msgstr \"Выражение для определения версии:\"\n+\n+#: lib/choose_rev.tcl:56\n+msgid \"Local Branch\"\n+msgstr \"Локальная ветвь:\"\n+\n+#: lib/choose_rev.tcl:61\n+msgid \"Tracking Branch\"\n+msgstr \"Ветвь слежения\"\n+\n+#: lib/choose_rev.tcl:66\n+msgid \"Tag\"\n+msgstr \"Метка\"\n+\n+#: lib/choose_rev.tcl:227\n+#, tcl-format\n+msgid \"Invalid revision: %s\"\n+msgstr \"Неверная версия: %s\"\n+\n+#: lib/choose_rev.tcl:248\n+msgid \"No revision selected.\"\n+msgstr \"Версия не указана.\"\n+\n+#: lib/choose_rev.tcl:256\n+msgid \"Revision expression is empty.\"\n+msgstr \"\"\n+\"Пустое выражения для определения версии.\"\n+\n+#: lib/commit.tcl:9\n+msgid \"\"\n+\"There is nothing to amend.\\n\"\n+\"\\n\"\n+\"You are about to create the initial commit.  There is no commit before this \"\n+\"to amend.\\n\"\n+msgstr \"\"\n+\"Отсутствует состояние для исправления.\\n\"\n+\"\\n\"\n+\"Вы можете создать начальное сохраненное \"\n+\"состояние. Других состояний для \"\n+\"исправления нет.\\n\"\n+\n+#: lib/commit.tcl:18\n+msgid \"\"\n+\"Cannot amend while merging.\\n\"\n+\"\\n\"\n+\"You are currently in the middle of a merge that has not been fully \"\n+\"completed.  You cannot amend the prior commit unless you first abort the \"\n+\"current merge activity.\\n\"\n+msgstr \"\"\n+\"Невозможно исправить состояние во время \"\n+\"объединения.\\n\"\n+\"\\n\"\n+\"Текущее объединение не завершено. \"\n+\"Невозможно исправить предыдущее \"\n+\"сохраненное состояние не прерывая \"\n+\"текущее объединение.\\n\"\n+\n+#: lib/commit.tcl:49\n+msgid \"Error loading commit data for amend:\"\n+msgstr \"\"\n+\"Ошибка при загрузке данных для \"\n+\"исправления сохраненного состояния:\"\n+\n+#: lib/commit.tcl:76\n+msgid \"Unable to obtain your identity:\"\n+msgstr \"\"\n+\"Невозможно получить информацию об \"\n+\"авторстве:\"\n+\n+#: lib/commit.tcl:81\n+msgid \"Invalid GIT_COMMITTER_IDENT:\"\n+msgstr \"Неверная GIT_COMMITTER_IDENT:\"\n+\n+#: lib/commit.tcl:133\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before another commit can be created.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"Последнее прочитанное состояние \"\n+\"репозитория не соответствует текущему.\\n\"\n+\"\\n\"\n+\"С момента последней проверки репозиторий \"\n+\"был изменен другой программой \"\n+\"Git.Необходимо перечитать репозиторий, \"\n+\"прежде чем изменять текущую ветвь. \\n\"\n+\"\\n\"\n+\"Это будет сделано сейчас автоматически.\\n\"\n+\n+#: lib/commit.tcl:154\n+#, tcl-format\n+msgid \"\"\n+\"Unmerged files cannot be committed.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.  You must resolve them and add the file before \"\n+\"committing.\\n\"\n+msgstr \"\"\n+\"Нельзя сохранить необъединенные файлы.\\n\"\n+\"\\n\"\n+\"Для файла %s возник конфликт объединения. \"\n+\"Разрешите конфликт и добавьте к \"\n+\"подготовленным файлам перед \"\n+\"сохранением.\\n\"\n+\n+#: lib/commit.tcl:162\n+#, tcl-format\n+msgid \"\"\n+\"Unknown file state %s detected.\\n\"\n+\"\\n\"\n+\"File %s cannot be committed by this program.\\n\"\n+msgstr \"\"\n+\"Обнаружено неизвестное состояние файла \"\n+\"%s.\\n\"\n+\"\\n\"\n+\"Файл %s не может быть сохранен данной \"\n+\"программой.\\n\"\n+\n+#: lib/commit.tcl:170\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"You must add at least 1 file before you can commit.\\n\"\n+msgstr \"\"\n+\"Отсутствуют изменения для сохранения.\\n\"\n+\"\\n\"\n+\"Подготовьте хотя бы один файл до создания \"\n+\"сохраненного состояния.\\n\"\n+\n+#: lib/commit.tcl:183\n+msgid \"\"\n+\"Please supply a commit message.\\n\"\n+\"\\n\"\n+\"A good commit message has the following format:\\n\"\n+\"\\n\"\n+\"- First line: Describe in one sentance what you did.\\n\"\n+\"- Second line: Blank\\n\"\n+\"- Remaining lines: Describe why this change is good.\\n\"\n+msgstr \"\"\n+\"Напишите комментарий к сохраненному \"\n+\"состоянию.\\n\"\n+\"\\n\"\n+\"Рекомендуется следующий формат \"\n+\"комментария:\\n\"\n+\"\\n\"\n+\"- первая строка: краткое описание \"\n+\"сделанных изменений.\\n\"\n+\"- вторая строка пустая\\n\"\n+\"- оставшиеся строки: опишите, что дают \"\n+\"ваши изменения.\\n\"\n+\n+#: lib/commit.tcl:257\n+msgid \"write-tree failed:\"\n+msgstr \"\"\n+\"Программа write-tree завершилась с ошибкой:\"\n+\n+#: lib/commit.tcl:279\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"No files were modified by this commit and it was not a merge commit.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"Отсутствуют изменения для сохранения.\\n\"\n+\"\\n\"\n+\"Ни один файл не был изменен и не было \"\n+\"объединения.\\n\"\n+\"\\n\"\n+\"Сейчас автоматически запустится \"\n+\"перечитывание репозитория.\\n\"\n+\n+#: lib/commit.tcl:286\n+msgid \"No changes to commit.\"\n+msgstr \"Отуствуют измения для сохранения.\"\n+\n+#: lib/commit.tcl:317\n+msgid \"commit-tree failed:\"\n+msgstr \"\"\n+\"Программа commit-tree завершилась с ошибкой:\"\n+\n+#: lib/commit.tcl:339\n+msgid \"update-ref failed:\"\n+msgstr \"\"\n+\"Программа update-ref завершилась с ошибкой:\"\n+\n+#: lib/commit.tcl:430\n+#, tcl-format\n+msgid \"Created commit %s: %s\"\n+msgstr \"Создано состояние %s: %s \"\n+\n+#: lib/console.tcl:55\n+msgid \"Working... please wait...\"\n+msgstr \"В процессе... пожалуйста, ждите...\"\n+\n+#: lib/console.tcl:184\n+msgid \"Success\"\n+msgstr \"Процесс успешно завершен\"\n+\n+#: lib/console.tcl:194\n+msgid \"Error: Command Failed\"\n+msgstr \"Ошибка: не удалось выполнить команду\"\n+\n+#: lib/database.tcl:43\n+msgid \"Number of loose objects\"\n+msgstr \"Количество несвязанных объектов\"\n+\n+#: lib/database.tcl:44\n+msgid \"Disk space used by loose objects\"\n+msgstr \"\"\n+\"Объем дискового пространства, занятый \"\n+\"несвязанными объектами\"\n+\n+#: lib/database.tcl:45\n+msgid \"Number of packed objects\"\n+msgstr \"Количество упакованных объектов\"\n+\n+#: lib/database.tcl:46\n+msgid \"Number of packs\"\n+msgstr \"Количество pack-файлов\"\n+\n+#: lib/database.tcl:47\n+msgid \"Disk space used by packed objects\"\n+msgstr \"\"\n+\"Объем дискового пространства, занятый \"\n+\"упакованными объектами\"\n+\n+#: lib/database.tcl:48\n+msgid \"Packed objects waiting for pruning\"\n+msgstr \"\"\n+\"Несвязанные объекты, которые можно \"\n+\"удалить\"\n+\n+#: lib/database.tcl:49\n+msgid \"Garbage files\"\n+msgstr \"Мусор\"\n+\n+#: lib/database.tcl:72\n+msgid \"Compressing the object database\"\n+msgstr \"Сжатие базы объектов\"\n+\n+#: lib/database.tcl:83\n+msgid \"Verifying the object database with fsck-objects\"\n+msgstr \"Проверка базы объектов при помощи fsck\"\n+\n+#: lib/diff.tcl:42\n+#, tcl-format\n+msgid \"\"\n+\"No differences detected.\\n\"\n+\"\\n\"\n+\"%s has no changes.\\n\"\n+\"\\n\"\n+\"The modification date of this file was updated by another application, but \"\n+\"the content within the file was not changed.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started to find other files which may have \"\n+\"the same state.\"\n+msgstr \"\"\n+\"Изменений не обнаружено.\\n\"\n+\"\\n\"\n+\"в %s отутствуют изменения.\\n\"\n+\"\\n\"\n+\"Дата изменения файла была обновлена \"\n+\"другой программой, но содержимое файла \"\n+\"осталось прежним.\\n\"\n+\"\\n\"\n+\"Сейчас будет запущено перечитывание \"\n+\"репозитория, чтобы найти подобные файлы.\"\n+\n+#: lib/diff.tcl:97\n+msgid \"Error loading file:\"\n+msgstr \"Ошибка загрузки файла:\"\n+\n+#: lib/diff.tcl:162\n+msgid \"Error loading diff:\"\n+msgstr \"Ошибка загрузки diff:\"\n+\n+#: lib/diff.tcl:278\n+msgid \"Failed to unstage selected hunk.\"\n+msgstr \"Не удалось исключить выбранную часть\"\n+\n+#: lib/diff.tcl:285\n+msgid \"Failed to stage selected hunk.\"\n+msgstr \"\"\n+\"Не удалось подготовить к сохранению \"\n+\"выбранную часть\"\n+\n+#: lib/error.tcl:12 lib/error.tcl:102\n+msgid \"error\"\n+msgstr \"ошибка\"\n+\n+#: lib/error.tcl:28\n+msgid \"warning\"\n+msgstr \"предупреждение\"\n+\n+#: lib/error.tcl:81\n+msgid \"You must correct the above errors before committing.\"\n+msgstr \"\"\n+\"Прежде чем сохранить, исправьте \"\n+\"вышеуказанные ошибки.\"\n+\n+#: lib/index.tcl:364\n+#, fuzzy, tcl-format\n+msgid \"Revert changes in file %s?\"\n+msgstr \"Отменить изменения\"\n+\n+#: lib/index.tcl:366\n+#, tcl-format\n+msgid \"Revert changes in these %i files?\"\n+msgstr \"Отменить изменения в %i файле(-ах)?\"\n+\n+#: lib/index.tcl:372\n+#, fuzzy\n+msgid \"Any unadded changes will be permanently lost by the revert.\"\n+msgstr \"\"\n+\"Отменить изменения в %s?\\n\"\n+\"\\n\"\n+\"Любые изменения, не подготовленные к \"\n+\"сохранению, будут потеряны при данной \"\n+\"операции.\"\n+\n+#: lib/index.tcl:375\n+msgid \"Do Nothing\"\n+msgstr \"Ничего не делать\"\n+\n+#: lib/merge.tcl:14\n+msgid \"\"\n+\"Cannot merge while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit before starting any type of merge.\\n\"\n+msgstr \"\"\n+\"Невозможно выполнить объединение во \"\n+\"время исправления.\\n\"\n+\"\\n\"\n+\"Завершите исправление данного состояния \"\n+\"перед выполнением операции объединения.\\n\"\n+\n+#: lib/merge.tcl:28\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before a merge can be performed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"Последнее прочитанное состояние \"\n+\"репозитория не соответствует текущему.\\n\"\n+\"\\n\"\n+\"С момента последней проверки репозиторий \"\n+\"был изменен другой программой \"\n+\"Git.Необходимо перечитать репозиторий, \"\n+\"прежде чем изменять текущую ветвь. \\n\"\n+\"\\n\"\n+\"Это будет сделано сейчас автоматически.\\n\"\n+\n+#: lib/merge.tcl:45\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a conflicted merge.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.\\n\"\n+\"\\n\"\n+\"You must resolve them, add the file, and commit to complete the current \"\n+\"merge.  Only then can you begin another merge.\\n\"\n+msgstr \"\"\n+\"Предыдущее объединение не завершено \"\n+\"из-за конфликта.\\n\"\n+\"\\n\"\n+\"Для файла %s возник конфликт объединения.\\n\"\n+\"Разрешите конфликт, подготовьте файл и \"\n+\"сохраните. Только после этого можно \"\n+\"начать следующее объединение.\\n\"\n+\n+#: lib/merge.tcl:55\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a change.\\n\"\n+\"\\n\"\n+\"File %s is modified.\\n\"\n+\"\\n\"\n+\"You should complete the current commit before starting a merge.  Doing so \"\n+\"will help you abort a failed merge, should the need arise.\\n\"\n+msgstr \"\"\n+\"Изменения не сохранены.\\n\"\n+\"\\n\"\n+\"Файл  %s изменен.\\n\"\n+\"\\n\"\n+\"Подготовьте и сохраните измения перед \"\n+\"началом объединения. В случае \"\n+\"необходимости это позволит прервать \"\n+\"операцию объединения.\\n\"\n+\n+#: lib/merge.tcl:94\n+#, tcl-format\n+msgid \"Merging %s and %s\"\n+msgstr \"Объединение %s и %s\"\n+\n+#: lib/merge.tcl:106\n+msgid \"Merge completed successfully.\"\n+msgstr \"Объединение успешно завершено.\"\n+\n+#: lib/merge.tcl:108\n+msgid \"Merge failed.  Conflict resolution is required.\"\n+msgstr \"\"\n+\"Не удалось завершить объединение. \"\n+\"Требуется разрешение конфликта.\"\n+\n+#: lib/merge.tcl:166\n+#, tcl-format\n+msgid \"Merge Into %s\"\n+msgstr \"Объединить с %s\"\n+\n+#: lib/merge.tcl:181 lib/transport.tcl:98\n+msgid \"Source Branches\"\n+msgstr \"Исходные ветви\"\n+\n+#: lib/merge.tcl:240\n+msgid \"\"\n+\"Cannot abort while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit.\\n\"\n+msgstr \"\"\n+\"Невозможно прервать исправление.\\n\"\n+\"\\n\"\n+\"Завершите текущее исправление \"\n+\"сохраненного состояния.\\n\"\n+\n+#: lib/merge.tcl:250\n+msgid \"\"\n+\"Abort merge?\\n\"\n+\"\\n\"\n+\"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\\n\"\n+\"\\n\"\n+\"Continue with aborting the current merge?\"\n+msgstr \"\"\n+\"Прервать объединение?\\n\"\n+\"Прерывание объединения приведет к потере \"\n+\"*ВСЕХ* несохраненных изменений.\\n\"\n+\"\\n\"\n+\"Продолжить?\"\n+\n+#: lib/merge.tcl:256\n+msgid \"\"\n+\"Abort commit?\\n\"\n+\"\\n\"\n+\"Aborting the current commit will cause *ALL* uncommitted changes to be \"\n+\"lost.\\n\"\n+\"\\n\"\n+\"Continue with aborting the current commit?\"\n+msgstr \"\"\n+\"Отменить изменения?\\n\"\n+\"\\n\"\n+\"Вызванная операция приведет к потере \"\n+\"*ВСЕХ* несохраненных изменений.\\n\"\n+\"\\n\"\n+\"Продолжить?\"\n+\n+#: lib/merge.tcl:267\n+msgid \"Aborting... please wait...\"\n+msgstr \"\"\n+\"Прерывание выполнения... Пожалуйста, \"\n+\"ждите...\"\n+\n+#: lib/merge.tcl:290\n+msgid \"Abort completed.  Ready.\"\n+msgstr \"Прервано.\"\n+\n+#: lib/option.tcl:77\n+msgid \"git-gui - a graphical user interface for Git.\"\n+msgstr \"\"\n+\"git-gui - графический пользовательский \"\n+\"интерфейс к Git.\"\n+\n+#: lib/option.tcl:164\n+msgid \"Restore Defaults\"\n+msgstr \"Восстановить настройки по умолчанию\"\n+\n+#: lib/option.tcl:168\n+msgid \"Save\"\n+msgstr \"Сохранить\"\n+\n+#: lib/option.tcl:178\n+#, tcl-format\n+msgid \"%s Repository\"\n+msgstr \"для репозитория %s \"\n+\n+#: lib/option.tcl:179\n+msgid \"Global (All Repositories)\"\n+msgstr \"Общие (для всех репозиториев)\"\n+\n+#: lib/option.tcl:185\n+msgid \"User Name\"\n+msgstr \"Имя пользователя\"\n+\n+#: lib/option.tcl:186\n+msgid \"Email Address\"\n+msgstr \"Адес электронной почты\"\n+\n+#: lib/option.tcl:188\n+msgid \"Summarize Merge Commits\"\n+msgstr \"\"\n+\"Суммарный комментарий при объединении\"\n+\n+#: lib/option.tcl:189\n+msgid \"Merge Verbosity\"\n+msgstr \"\"\n+\"Уровень детальности сообщений при \"\n+\"объединении\"\n+\n+#: lib/option.tcl:190\n+msgid \"Show Diffstat After Merge\"\n+msgstr \"\"\n+\"Показать отчет об изменениях после \"\n+\"объединения\"\n+\n+#: lib/option.tcl:192\n+msgid \"Trust File Modification Timestamps\"\n+msgstr \"Доверять времени модификации файла\"\n+\n+#: lib/option.tcl:193\n+msgid \"Prune Tracking Branches During Fetch\"\n+msgstr \"\"\n+\"Чистка ветвей слежения при получении \"\n+\"изменений\"\n+\n+#: lib/option.tcl:194\n+msgid \"Match Tracking Branches\"\n+msgstr \"\"\n+\"Имя новой ветви взять из имен ветвей \"\n+\"слежения\"\n+\n+#: lib/option.tcl:195\n+msgid \"Number of Diff Context Lines\"\n+msgstr \"Число строк в контексте diff\"\n+\n+#: lib/option.tcl:196\n+msgid \"New Branch Name Template\"\n+msgstr \"Шаблон для имени новой ветви\"\n+\n+#: lib/option.tcl:305\n+msgid \"Failed to completely save options:\"\n+msgstr \"\"\n+\"Не удалось полностью сохранить настройки:\"\n+\n+#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34\n+msgid \"Delete Remote Branch\"\n+msgstr \"Удалить внешнюю ветвь\"\n+\n+#: lib/remote_branch_delete.tcl:47\n+msgid \"From Repository\"\n+msgstr \"Из репозитория\"\n+\n+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118\n+msgid \"Remote:\"\n+msgstr \"внешний:\"\n+\n+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133\n+msgid \"Arbitrary URL:\"\n+msgstr \"по указанному URL:\"\n+\n+#: lib/remote_branch_delete.tcl:84\n+msgid \"Branches\"\n+msgstr \"Ветви\"\n+\n+#: lib/remote_branch_delete.tcl:109\n+msgid \"Delete Only If\"\n+msgstr \"Удалить только в случае, если\"\n+\n+#: lib/remote_branch_delete.tcl:111\n+msgid \"Merged Into:\"\n+msgstr \"Объединено с:\"\n+\n+#: lib/remote_branch_delete.tcl:119\n+msgid \"Always (Do not perform merge checks)\"\n+msgstr \"\"\n+\"Всегда (не выполнять проверку \"\n+\"объединений)\"\n+\n+#: lib/remote_branch_delete.tcl:152\n+msgid \"A branch is required for 'Merged Into'.\"\n+msgstr \"\"\n+\"Для опции 'Объединено с' требуется \"\n+\"указать ветвь.\"\n+\n+#: lib/remote_branch_delete.tcl:189\n+#, tcl-format\n+msgid \"\"\n+\"One or more of the merge tests failed because you have not fetched the \"\n+\"necessary commits.  Try fetching from %s first.\"\n+msgstr \"\"\n+\n+#: lib/remote_branch_delete.tcl:207\n+msgid \"Please select one or more branches to delete.\"\n+msgstr \"\"\n+\"Укажите одну или несколько ветвей для \"\n+\"удаления.\"\n+\n+#: lib/remote_branch_delete.tcl:216\n+msgid \"\"\n+\"Recovering deleted branches is difficult.\\n\"\n+\"\\n\"\n+\"Delete the selected branches?\"\n+msgstr \"\"\n+\"Восстановить удаленные ветви сложно.\\n\"\n+\"\\n\"\n+\"Продолжить?\"\n+\n+#: lib/remote_branch_delete.tcl:226\n+#, tcl-format\n+msgid \"Deleting branches from %s\"\n+msgstr \"Удаление ветвей из %s\"\n+\n+#: lib/remote_branch_delete.tcl:286\n+msgid \"No repository selected.\"\n+msgstr \"Не указан репозиторий\"\n+\n+#: lib/remote_branch_delete.tcl:291\n+#, tcl-format\n+msgid \"Scanning %s...\"\n+msgstr \"Перечитывание %s... \"\n+\n+#: lib/remote.tcl:156\n+#, fuzzy, tcl-format\n+msgid \"Fetch from %s...\"\n+msgstr \"Чистка %s... \"\n+\n+#: lib/remote.tcl:166\n+#, tcl-format\n+msgid \"Prune from %s...\"\n+msgstr \"Чистка %s... \"\n+\n+#: lib/remote.tcl:200\n+#, tcl-format\n+msgid \"Push to %s...\"\n+msgstr \"Отправка в %s...\"\n+\n+#: lib/shortcut.tcl:26 lib/shortcut.tcl:74\n+msgid \"Cannot write script:\"\n+msgstr \"Невозможно записать скрипт:\"\n+\n+#: lib/shortcut.tcl:149\n+msgid \"Cannot write icon:\"\n+msgstr \"Невозможно записать значок:\"\n+\n+#: lib/status_bar.tcl:58\n+#, tcl-format\n+msgid \"%s ... %i of %i %s (%2i%%)\"\n+msgstr \"%s ... %i из %i %s (%2i%%)\"\n+\n+#: lib/transport.tcl:7\n+#, tcl-format\n+msgid \"Fetching new changes from %s\"\n+msgstr \"Получение изменений из %s \"\n+\n+#: lib/transport.tcl:19\n+#, tcl-format\n+msgid \"Pruning tracking branches deleted from %s\"\n+msgstr \"Чистка ветвей слежения, удаленных из %s\"\n+\n+#: lib/transport.tcl:26\n+#, tcl-format\n+msgid \"Pushing changes to %s\"\n+msgstr \"Отправка изменений в %s \"\n+\n+#: lib/transport.tcl:68\n+#, tcl-format\n+msgid \"Pushing %s %s to %s\"\n+msgstr \"Отправка %s %s в %s\"\n+\n+#: lib/transport.tcl:84\n+msgid \"Push Branches\"\n+msgstr \"Отправить изменения\"\n+\n+#: lib/transport.tcl:115\n+msgid \"Destination Repository\"\n+msgstr \"Репозиторий назначения\"\n+\n+#: lib/transport.tcl:153\n+msgid \"Transfer Options\"\n+msgstr \"Настройки передачи\"\n+\n+#: lib/transport.tcl:155\n+msgid \"Use thin pack (for slow network connections)\"\n+msgstr \"\"\n+\"Использовать thin pack (для медленных сетевых \"\n+\"подключений)\"\n+\n+#: lib/transport.tcl:159\n+msgid \"Include tags\"\n+msgstr \"Включить метки\"\n-- \n1.5.3.2.g46909\n\n"},{"id":"52232","messageId":"Pine.LNX.4.64.0709021737120.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 13/15] Hungarian translation of git-gui","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:37:22Z","receivedAt":"2007-09-02T16:37:22Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nFrom: Miklos Vajna <vmiklos@frugalware.org>\n\nSigned-off-by: Miklos Vajna <vmiklos@frugalware.org>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n po/hu.po | 1422 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 1422 insertions(+), 0 deletions(-)\n create mode 100644 po/hu.po\n\ndiff --git a/po/hu.po b/po/hu.po\nnew file mode 100644\nindex 0000000..faac58f\n--- /dev/null\n+++ b/po/hu.po\n@@ -0,0 +1,1422 @@\n+# Hungarian translations for git-gui-i package.\n+# Copyright (C) 2007 THE git-gui-i'S COPYRIGHT HOLDER\n+# This file is distributed under the same license as the git-gui-i package.\n+# Miklos Vajna <vmiklos@frugalware.org>, 2007.\n+#\n+msgid \"\"\n+msgstr \"\"\n+\"Project-Id-Version: git-gui-i 18n\\n\"\n+\"Report-Msgid-Bugs-To: \\n\"\n+\"POT-Creation-Date: 2007-08-11 17:28+0200\\n\"\n+\"PO-Revision-Date: 2007-07-27 13:15+0200\\n\"\n+\"Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\\n\"\n+\"Language-Team: Hungarian\\n\"\n+\"MIME-Version: 1.0\\n\"\n+\"Content-Type: text/plain; charset=UTF-8\\n\"\n+\"Content-Transfer-Encoding: 8bit\\n\"\n+\"Plural-Forms: nplurals=2; plural=(n != 1);\\n\"\n+\n+#: git-gui.sh:531\n+msgid \"Cannot find git in PATH.\"\n+msgstr \"A git nem található a PATH-ban.\"\n+\n+#: git-gui.sh:550\n+msgid \"Cannot parse Git version string:\"\n+msgstr \"Nem értelmezhető a Git verzió sztring:\"\n+\n+#: git-gui.sh:567\n+#, tcl-format\n+msgid \"\"\n+\"Git version cannot be determined.\\n\"\n+\"\\n\"\n+\"%s claims it is version '%s'.\\n\"\n+\"\\n\"\n+\"%s requires at least Git 1.5.0 or later.\\n\"\n+\"\\n\"\n+\"Assume '%s' is version 1.5.0?\\n\"\n+msgstr \"\"\n+\"Nem állípítható meg a Git verziója.\\n\"\n+\"\\n\"\n+\"A(z) %s szerint a verzió '%s'.\\n\"\n+\"\\n\"\n+\"A(z) %s a Git 1.5.0 vagy későbbi verzióját igényli.\\n\"\n+\"\\n\"\n+\"Feltételezhetjük, hogy a(z) '%s' verziója legalább 1.5.0?\\n\"\n+\n+#: git-gui.sh:689\n+msgid \"Cannot find the git directory:\"\n+msgstr \"Nem található a git könyvtár:\"\n+\n+#: git-gui.sh:697\n+msgid \"Git directory not found:\"\n+msgstr \"A Git könyvtár nem található:\"\n+\n+#: git-gui.sh:703\n+msgid \"Cannot use funny .git directory:\"\n+msgstr \"Nem használható vicces .git könyvtár:\"\n+\n+#: git-gui.sh:708\n+msgid \"No working directory\"\n+msgstr \"Nincs munkakönyvtár\"\n+\n+#: git-gui.sh:854\n+msgid \"Refreshing file status...\"\n+msgstr \"A fájlok státuszának frissítése...\"\n+\n+#: git-gui.sh:891\n+msgid \"Scanning for modified files ...\"\n+msgstr \"Módosított fájlok keresése ...\"\n+\n+#: git-gui.sh:1057 lib/browser.tcl:247\n+msgid \"Ready.\"\n+msgstr \"Kész.\"\n+\n+#: git-gui.sh:1322\n+msgid \"Unmodified\"\n+msgstr \"Nem módosított\"\n+\n+#: git-gui.sh:1324\n+msgid \"Modified, not staged\"\n+msgstr \"Módosított, de nem kiválasztott\"\n+\n+#: git-gui.sh:1325 git-gui.sh:1330\n+msgid \"Staged for commit\"\n+msgstr \"Kiválasztva commitolásra\"\n+\n+#: git-gui.sh:1326 git-gui.sh:1331\n+msgid \"Portions staged for commit\"\n+msgstr \"Részek kiválasztva commitolásra\"\n+\n+#: git-gui.sh:1327 git-gui.sh:1332\n+msgid \"Staged for commit, missing\"\n+msgstr \"Kiválasztva commitolásra, hiányzó\"\n+\n+#: git-gui.sh:1329\n+msgid \"Untracked, not staged\"\n+msgstr \"Nem követett, nem kiválasztott\"\n+\n+#: git-gui.sh:1334\n+msgid \"Missing\"\n+msgstr \"Hiányzó\"\n+\n+#: git-gui.sh:1335\n+msgid \"Staged for removal\"\n+msgstr \"Kiválasztva eltávolításra\"\n+\n+#: git-gui.sh:1336\n+msgid \"Staged for removal, still present\"\n+msgstr \"Kiválasztva eltávolításra, jelenleg is elérhető\"\n+\n+#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341\n+msgid \"Requires merge resolution\"\n+msgstr \"Merge feloldás szükséges\"\n+\n+#: git-gui.sh:1383\n+msgid \"Starting gitk... please wait...\"\n+msgstr \"A gitk indítása... várjunk...\"\n+\n+#: git-gui.sh:1392\n+#, tcl-format\n+msgid \"\"\n+\"Unable to start gitk:\\n\"\n+\"\\n\"\n+\"%s does not exist\"\n+msgstr \"\"\n+\"A gitk indítása sikertelen:\\n\"\n+\"\\n\"\n+\"A(z) %s nem létezik\"\n+\n+#: git-gui.sh:1609\n+#, tcl-format\n+msgid \"Invalid font specified in gui.%s:\"\n+msgstr \"Érvénytelen font lett megadva a grafikus felületben.%s:\"\n+\n+#: git-gui.sh:1634\n+msgid \"Main Font\"\n+msgstr \"Fő betűtípus\"\n+\n+#: git-gui.sh:1635\n+msgid \"Diff/Console Font\"\n+msgstr \"Diff/konzol betűtípus\"\n+\n+#: git-gui.sh:1649\n+msgid \"Repository\"\n+msgstr \"Repó\"\n+\n+#: git-gui.sh:1650\n+msgid \"Edit\"\n+msgstr \"Szerkesztés\"\n+\n+#: git-gui.sh:1652\n+msgid \"Branch\"\n+msgstr \"Branch\"\n+\n+#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152\n+msgid \"Commit\"\n+msgstr \"Commit\"\n+\n+#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168\n+msgid \"Merge\"\n+msgstr \"Merge\"\n+\n+#: git-gui.sh:1659\n+msgid \"Fetch\"\n+msgstr \"Letöltés\"\n+\n+#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172\n+msgid \"Push\"\n+msgstr \"Push\"\n+\n+#: git-gui.sh:1669\n+msgid \"Browse Current Branch's Files\"\n+msgstr \"A jelenlegi branch fájljainak böngészése\"\n+\n+#: git-gui.sh:1673\n+msgid \"Browse Branch Files...\"\n+msgstr \"A branch fájljainak böngészése...\"\n+\n+#: git-gui.sh:1678\n+msgid \"Visualize Current Branch's History\"\n+msgstr \"A jelenlegi branch történetének vizualizálása\"\n+\n+#: git-gui.sh:1682\n+msgid \"Visualize All Branch History\"\n+msgstr \"Az összes branch történetének vizualizálása\"\n+\n+#: git-gui.sh:1689\n+#, tcl-format\n+msgid \"Browse %s's Files\"\n+msgstr \"A(z) %s branch fájljainak böngészése\"\n+\n+#: git-gui.sh:1691\n+#, tcl-format\n+msgid \"Visualize %s's History\"\n+msgstr \"A(z) %s branch történetének vizualizálása\"\n+\n+#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67\n+msgid \"Database Statistics\"\n+msgstr \"Adatbázis statisztikák\"\n+\n+#: git-gui.sh:1699 lib/database.tcl:34\n+msgid \"Compress Database\"\n+msgstr \"Adatbázis tömörítése\"\n+\n+#: git-gui.sh:1702\n+msgid \"Verify Database\"\n+msgstr \"Adatbázis ellenőrzése\"\n+\n+#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9\n+#: lib/shortcut.tcl:45 lib/shortcut.tcl:84\n+msgid \"Create Desktop Icon\"\n+msgstr \"Asztal ikon létrehozása\"\n+\n+#: git-gui.sh:1722\n+msgid \"Quit\"\n+msgstr \"Kilépés\"\n+\n+#: git-gui.sh:1729\n+msgid \"Undo\"\n+msgstr \"Visszavonás\"\n+\n+#: git-gui.sh:1732\n+msgid \"Redo\"\n+msgstr \"Mégis\"\n+\n+#: git-gui.sh:1736 git-gui.sh:2222\n+msgid \"Cut\"\n+msgstr \"Kivágás\"\n+\n+#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368\n+#: lib/console.tcl:69\n+msgid \"Copy\"\n+msgstr \"Másolás\"\n+\n+#: git-gui.sh:1742 git-gui.sh:2228\n+msgid \"Paste\"\n+msgstr \"Beillesztés\"\n+\n+#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26\n+#: lib/remote_branch_delete.tcl:38\n+msgid \"Delete\"\n+msgstr \"Törlés\"\n+\n+#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71\n+msgid \"Select All\"\n+msgstr \"Mindent kiválaszt\"\n+\n+#: git-gui.sh:1758\n+msgid \"Create...\"\n+msgstr \"Létrehozás...\"\n+\n+#: git-gui.sh:1764\n+msgid \"Checkout...\"\n+msgstr \"Checkout...\"\n+\n+#: git-gui.sh:1770\n+msgid \"Rename...\"\n+msgstr \"Átnevezés...\"\n+\n+#: git-gui.sh:1775 git-gui.sh:1873\n+msgid \"Delete...\"\n+msgstr \"Törlés...\"\n+\n+#: git-gui.sh:1780\n+msgid \"Reset...\"\n+msgstr \"Visszaállítás...\"\n+\n+#: git-gui.sh:1792 git-gui.sh:2169\n+msgid \"New Commit\"\n+msgstr \"Új commit\"\n+\n+#: git-gui.sh:1800 git-gui.sh:2176\n+msgid \"Amend Last Commit\"\n+msgstr \"Utolsó commit javítása\"\n+\n+#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99\n+msgid \"Rescan\"\n+msgstr \"Keresés újra\"\n+\n+#: git-gui.sh:1815\n+msgid \"Stage To Commit\"\n+msgstr \"Kiválasztás commitolásra\"\n+\n+#: git-gui.sh:1820\n+msgid \"Stage Changed Files To Commit\"\n+msgstr \"Módosított fájlok kiválasztása commitolásra\"\n+\n+#: git-gui.sh:1826\n+msgid \"Unstage From Commit\"\n+msgstr \"Commitba való kiválasztás visszavonása\"\n+\n+#: git-gui.sh:1831 lib/index.tcl:376\n+msgid \"Revert Changes\"\n+msgstr \"Változtatások visszaállítása\"\n+\n+#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246\n+msgid \"Sign Off\"\n+msgstr \"Aláír\"\n+\n+#: git-gui.sh:1853\n+msgid \"Local Merge...\"\n+msgstr \"Helyi merge...\"\n+\n+#: git-gui.sh:1858\n+msgid \"Abort Merge...\"\n+msgstr \"Merge megszakítása...\"\n+\n+#: git-gui.sh:1870\n+msgid \"Push...\"\n+msgstr \"Push...\"\n+\n+#: git-gui.sh:1880\n+msgid \"Apple\"\n+msgstr \"Apple\"\n+\n+#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65\n+#, tcl-format\n+msgid \"About %s\"\n+msgstr \"Névjegy: %s\"\n+\n+#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414\n+msgid \"Options...\"\n+msgstr \"Opciók...\"\n+\n+#: git-gui.sh:1897\n+msgid \"Help\"\n+msgstr \"Segítség\"\n+\n+#: git-gui.sh:1938\n+msgid \"Online Documentation\"\n+msgstr \"Online dokumentáció\"\n+\n+#: git-gui.sh:2054\n+msgid \"Current Branch:\"\n+msgstr \"Jelenlegi branch:\"\n+\n+#: git-gui.sh:2075\n+msgid \"Staged Changes (Will Be Committed)\"\n+msgstr \"Kiválasztott változtatások (commitolva lesz)\"\n+\n+#: git-gui.sh:2095\n+msgid \"Unstaged Changes (Will Not Be Committed)\"\n+msgstr \"Nem kiválasztott változtatások (nem lesz commitolva)\"\n+\n+#: git-gui.sh:2142\n+msgid \"Stage Changed\"\n+msgstr \"Változtatások kiválasztása\"\n+\n+#: git-gui.sh:2188\n+msgid \"Initial Commit Message:\"\n+msgstr \"Kezdeti commit üzenet:\"\n+\n+#: git-gui.sh:2189\n+msgid \"Amended Commit Message:\"\n+msgstr \"Javító commit üzenet:\"\n+\n+#: git-gui.sh:2190\n+msgid \"Amended Initial Commit Message:\"\n+msgstr \"Kezdeti javító commit üzenet:\"\n+\n+#: git-gui.sh:2191\n+msgid \"Amended Merge Commit Message:\"\n+msgstr \"Javító merge commit üzenet:\"\n+\n+#: git-gui.sh:2192\n+msgid \"Merge Commit Message:\"\n+msgstr \"Merge commit üzenet:\"\n+\n+#: git-gui.sh:2193\n+msgid \"Commit Message:\"\n+msgstr \"Commit üzenet:\"\n+\n+#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73\n+msgid \"Copy All\"\n+msgstr \"Összes másolása\"\n+\n+#: git-gui.sh:2262 lib/blame.tcl:104\n+msgid \"File:\"\n+msgstr \"Fájl:\"\n+\n+#: git-gui.sh:2364\n+msgid \"Refresh\"\n+msgstr \"Frissítés\"\n+\n+#: git-gui.sh:2385\n+msgid \"Apply/Reverse Hunk\"\n+msgstr \"Hunk alkalmazása/visszaállítása\"\n+\n+#: git-gui.sh:2391\n+msgid \"Decrease Font Size\"\n+msgstr \"Font méret csökkentése\"\n+\n+#: git-gui.sh:2395\n+msgid \"Increase Font Size\"\n+msgstr \"Fönt méret növelése\"\n+\n+#: git-gui.sh:2400\n+msgid \"Show Less Context\"\n+msgstr \"Kevesebb környezet mutatása\"\n+\n+#: git-gui.sh:2407\n+msgid \"Show More Context\"\n+msgstr \"Több környezet mutatása\"\n+\n+#: git-gui.sh:2422\n+msgid \"Unstage Hunk From Commit\"\n+msgstr \"Hunk törlése commitból\"\n+\n+#: git-gui.sh:2426 git-gui.sh:2430\n+msgid \"Stage Hunk For Commit\"\n+msgstr \"Hunk kiválasztása commitba\"\n+\n+#: git-gui.sh:2440\n+msgid \"Initializing...\"\n+msgstr \"Inicializálás...\"\n+\n+#: lib/blame.tcl:77\n+msgid \"File Viewer\"\n+msgstr \"Fájl néző\"\n+\n+#: lib/blame.tcl:81\n+msgid \"Commit:\"\n+msgstr \"Commit:\"\n+\n+#: lib/blame.tcl:249\n+msgid \"Copy Commit\"\n+msgstr \"Commit másolása\"\n+\n+#: lib/blame.tcl:369\n+#, tcl-format\n+msgid \"Reading %s...\"\n+msgstr \"A(z) %s olvasása...\"\n+\n+#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19\n+msgid \"Checkout Branch\"\n+msgstr \"Branch checkoutolása\"\n+\n+#: lib/branch_checkout.tcl:23\n+msgid \"Checkout\"\n+msgstr \"Checkout\"\n+\n+#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35\n+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:283\n+#: lib/checkout_op.tcl:522 lib/merge.tcl:172 lib/option.tcl:172\n+#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92\n+msgid \"Cancel\"\n+msgstr \"Mégsem\"\n+\n+#: lib/branch_checkout.tcl:32 lib/browser.tcl:288\n+msgid \"Revision\"\n+msgstr \"Revízió\"\n+\n+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159\n+#: lib/option.tcl:274\n+msgid \"Options\"\n+msgstr \"Opciók\"\n+\n+#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92\n+msgid \"Fetch Tracking Branch\"\n+msgstr \"Követő branch letöltése\"\n+\n+#: lib/branch_checkout.tcl:44\n+msgid \"Detach From Local Branch\"\n+msgstr \"Helyi branch leválasztása\"\n+\n+#: lib/branch_create.tcl:22\n+msgid \"Create Branch\"\n+msgstr \"Branch létrehozása\"\n+\n+#: lib/branch_create.tcl:27\n+msgid \"Create New Branch\"\n+msgstr \"Új branch létrehozása\"\n+\n+#: lib/branch_create.tcl:31\n+msgid \"Create\"\n+msgstr \"Létrehozás\"\n+\n+#: lib/branch_create.tcl:40\n+msgid \"Branch Name\"\n+msgstr \"Branch neve\"\n+\n+#: lib/branch_create.tcl:43\n+msgid \"Name:\"\n+msgstr \"Név:\"\n+\n+#: lib/branch_create.tcl:58\n+msgid \"Match Tracking Branch Name\"\n+msgstr \"Egyeztetendő követési branch név\"\n+\n+#: lib/branch_create.tcl:66\n+msgid \"Starting Revision\"\n+msgstr \"A következő revíziótól\"\n+\n+#: lib/branch_create.tcl:72\n+msgid \"Update Existing Branch:\"\n+msgstr \"Létező branch frissítése\"\n+\n+#: lib/branch_create.tcl:75\n+msgid \"No\"\n+msgstr \"Nem\"\n+\n+#: lib/branch_create.tcl:80\n+msgid \"Fast Forward Only\"\n+msgstr \"Csak fast forward\"\n+\n+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514\n+msgid \"Reset\"\n+msgstr \"Visszaállítás\"\n+\n+#: lib/branch_create.tcl:97\n+msgid \"Checkout After Creation\"\n+msgstr \"Checkout létrehozás után\"\n+\n+#: lib/branch_create.tcl:131\n+msgid \"Please select a tracking branch.\"\n+msgstr \"Válasszunk ki egy követő branchet.\"\n+\n+#: lib/branch_create.tcl:140\n+#, tcl-format\n+msgid \"Tracking branch %s is not a branch in the remote repository.\"\n+msgstr \"A(z) %s követő branch nem branch a távoli repóban.\"\n+\n+#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86\n+msgid \"Please supply a branch name.\"\n+msgstr \"Adjunk megy egy branch nevet.\"\n+\n+#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106\n+#, tcl-format\n+msgid \"'%s' is not an acceptable branch name.\"\n+msgstr \"A(z) '%s' nem egy elfogadható branch név.\"\n+\n+#: lib/branch_delete.tcl:15\n+msgid \"Delete Branch\"\n+msgstr \"Branch törlése\"\n+\n+#: lib/branch_delete.tcl:20\n+msgid \"Delete Local Branch\"\n+msgstr \"Helyi branch törlése\"\n+\n+#: lib/branch_delete.tcl:37\n+msgid \"Local Branches\"\n+msgstr \"Helyi branchek\"\n+\n+#: lib/branch_delete.tcl:52\n+msgid \"Delete Only If Merged Into\"\n+msgstr \"Csak már merge-ölt törlése\"\n+\n+#: lib/branch_delete.tcl:54\n+msgid \"Always (Do not perform merge test.)\"\n+msgstr \"Mindig (Ne legyen merge teszt.)\"\n+\n+#: lib/branch_delete.tcl:103\n+#, tcl-format\n+msgid \"The following branches are not completely merged into %s:\"\n+msgstr \"A következő branchek nem teljesen lettek merge-ölve ebbe: %s:\"\n+\n+#: lib/branch_delete.tcl:115\n+msgid \"\"\n+\"Recovering deleted branches is difficult. \\n\"\n+\"\\n\"\n+\" Delete the selected branches?\"\n+msgstr \"\"\n+\"A törölt branchek visszaállítása bonyolult. \\n\"\n+\"\\n\"\n+\" Biztosan törli a kiválasztott brancheket?\"\n+\n+#: lib/branch_delete.tcl:141\n+#, tcl-format\n+msgid \"\"\n+\"Failed to delete branches:\\n\"\n+\"%s\"\n+msgstr \"\"\n+\"Nem sikerült törölni a következő brancheket:\\n\"\n+\"%s\"\n+\n+#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22\n+msgid \"Rename Branch\"\n+msgstr \"Branch átnevezése\"\n+\n+#: lib/branch_rename.tcl:26\n+msgid \"Rename\"\n+msgstr \"Átnevezés\"\n+\n+#: lib/branch_rename.tcl:36\n+msgid \"Branch:\"\n+msgstr \"Branch:\"\n+\n+#: lib/branch_rename.tcl:39\n+msgid \"New Name:\"\n+msgstr \"Új név:\"\n+\n+#: lib/branch_rename.tcl:75\n+msgid \"Please select a branch to rename.\"\n+msgstr \"Válasszunk ki egy átnevezendő branchet.\"\n+\n+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179\n+#, tcl-format\n+msgid \"Branch '%s' already exists.\"\n+msgstr \"A(z) '%s' branch már létezik.\"\n+\n+#: lib/branch_rename.tcl:117\n+#, tcl-format\n+msgid \"Failed to rename '%s'.\"\n+msgstr \"Nem sikerült átnevezni: '%s'.\"\n+\n+#: lib/browser.tcl:17\n+msgid \"Starting...\"\n+msgstr \"Indítás...\"\n+\n+#: lib/browser.tcl:26\n+msgid \"File Browser\"\n+msgstr \"Fájl böngésző\"\n+\n+#: lib/browser.tcl:127 lib/browser.tcl:144\n+#, tcl-format\n+msgid \"Loading %s...\"\n+msgstr \"A(z) %s betöltése...\"\n+\n+#: lib/browser.tcl:188\n+msgid \"[Up To Parent]\"\n+msgstr \"[Fel a szülőhöz]\"\n+\n+#: lib/browser.tcl:268 lib/browser.tcl:274\n+msgid \"Browse Branch Files\"\n+msgstr \"A branch fájljainak böngészése\"\n+\n+#: lib/browser.tcl:279\n+msgid \"Browse\"\n+msgstr \"Böngészés\"\n+\n+#: lib/checkout_op.tcl:79\n+#, tcl-format\n+msgid \"Fetching %s from %s\"\n+msgstr \"A(z) %s letöltése innen: %s\"\n+\n+#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31\n+msgid \"Close\"\n+msgstr \"Bezárás\"\n+\n+#: lib/checkout_op.tcl:169\n+#, tcl-format\n+msgid \"Branch '%s' does not exist.\"\n+msgstr \"A(z) '%s' branch nem létezik.\"\n+\n+#: lib/checkout_op.tcl:206\n+#, tcl-format\n+msgid \"\"\n+\"Branch '%s' already exists.\\n\"\n+\"\\n\"\n+\"It cannot fast-forward to %s.\\n\"\n+\"A merge is required.\"\n+msgstr \"\"\n+\"A(z) '%s' branch már létezik.\\n\"\n+\"\\n\"\n+\"Nem lehet fast-forwardolni a következőhöz: %s.\\n\"\n+\"Egy merge szükséges.\"\n+\n+#: lib/checkout_op.tcl:220\n+#, tcl-format\n+msgid \"Merge strategy '%s' not supported.\"\n+msgstr \"A(z) '%s' merge strategy nem támogatott.\"\n+\n+#: lib/checkout_op.tcl:239\n+#, tcl-format\n+msgid \"Failed to update '%s'.\"\n+msgstr \"Nem sikerült frissíteni a következőt: '%s'.\"\n+\n+#: lib/checkout_op.tcl:251\n+msgid \"Staging area (index) is already locked.\"\n+msgstr \"A kiválasztási terület (index) már zárolva van.\"\n+\n+#: lib/checkout_op.tcl:266\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before the current branch can be changed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"Az utolsó keresési állapot nem egyezik meg a repó állpotával.\\n\"\n+\"\\n\"\n+\"Egy másik Git program módosította ezt a repót az utolsó keresés óta. Egy \"\n+\"újrakeresés mindenképpen szükséges mielőtt a jelenlegi branchet módosítani \"\n+\"lehetne.\\n\"\n+\"\\n\"\n+\"Az újrakeresés most automatikusan el fog indulni.\\n\"\n+\n+#: lib/checkout_op.tcl:353\n+#, tcl-format\n+msgid \"Aborted checkout of '%s' (file level merging is required).\"\n+msgstr \"A(z) '%s' checkoutja megszakítva (fájlszintű merge-ölés szükséges).\"\n+\n+#: lib/checkout_op.tcl:354\n+msgid \"File level merge required.\"\n+msgstr \"Fájlszintű merge-ölés szükséges.\"\n+\n+#: lib/checkout_op.tcl:358\n+#, tcl-format\n+msgid \"Staying on branch '%s'.\"\n+msgstr \"Jelenleg a(z) '%s' branchen.\"\n+\n+#: lib/checkout_op.tcl:429\n+msgid \"\"\n+\"You are no longer on a local branch.\\n\"\n+\"\\n\"\n+\"If you wanted to be on a branch, create one now starting from 'This Detached \"\n+\"Checkout'.\"\n+msgstr \"\"\n+\"Már nem egy helyi branchen vagyunk.\\n\"\n+\"\\n\"\n+\"Ha egy branchen szeretnénk lenni, hozzunk létre egyet az 'Ez a leválasztott \"\n+\"checkout'-ból.\"\n+\n+#: lib/checkout_op.tcl:478\n+#, tcl-format\n+msgid \"Resetting '%s' to '%s' will lose the following commits:\"\n+msgstr \"\"\n+\"A(z) '%s' -> '%s' visszaállítás a következő commitok elvesztését jelenti:\"\n+\n+#: lib/checkout_op.tcl:500\n+msgid \"Recovering lost commits may not be easy.\"\n+msgstr \"Az elveszett commitok helyreállítása nem biztos, hogy egyszerű.\"\n+\n+#: lib/checkout_op.tcl:505\n+#, tcl-format\n+msgid \"Reset '%s'?\"\n+msgstr \"Visszaállítjuk a következőt: '%s'?\"\n+\n+#: lib/checkout_op.tcl:510 lib/merge.tcl:164\n+msgid \"Visualize\"\n+msgstr \"Vizualizálás\"\n+\n+#: lib/checkout_op.tcl:578\n+#, tcl-format\n+msgid \"\"\n+\"Failed to set current branch.\\n\"\n+\"\\n\"\n+\"This working directory is only partially switched.  We successfully updated \"\n+\"your files, but failed to update an internal Git file.\\n\"\n+\"\\n\"\n+\"This should not have occurred.  %s will now close and give up.\"\n+msgstr \"\"\n+\"Nem sikerült beállítani a jelenlegi branchet.\\n\"\n+\"\\n\"\n+\"A munkakönyvtár csak részben váltott át.  A fájlok sikeresen frissítve \"\n+\"lettek, de nem sikerült frissíteni egy belső Git fájlt.\\n\"\n+\"\\n\"\n+\"Ennek nem szabad megtörténnie.  A(z) %s most kilép és feladja.\"\n+\n+#: lib/choose_rev.tcl:53\n+msgid \"This Detached Checkout\"\n+msgstr \"Ez a leválasztott checkout\"\n+\n+#: lib/choose_rev.tcl:60\n+msgid \"Revision Expression:\"\n+msgstr \"Revízió kifejezés:\"\n+\n+#: lib/choose_rev.tcl:74\n+msgid \"Local Branch\"\n+msgstr \"Helyi branch\"\n+\n+#: lib/choose_rev.tcl:79\n+msgid \"Tracking Branch\"\n+msgstr \"Követő branch\"\n+\n+#: lib/choose_rev.tcl:84\n+msgid \"Tag\"\n+msgstr \"Tag\"\n+\n+#: lib/choose_rev.tcl:317\n+#, tcl-format\n+msgid \"Invalid revision: %s\"\n+msgstr \"Érvénytelen revízió: %s\"\n+\n+#: lib/choose_rev.tcl:338\n+msgid \"No revision selected.\"\n+msgstr \"Nincs kiválasztva revízió.\"\n+\n+#: lib/choose_rev.tcl:346\n+msgid \"Revision expression is empty.\"\n+msgstr \"A revízió kifejezés üres.\"\n+\n+#: lib/commit.tcl:9\n+msgid \"\"\n+\"There is nothing to amend.\\n\"\n+\"\\n\"\n+\"You are about to create the initial commit.  There is no commit before this \"\n+\"to amend.\\n\"\n+msgstr \"\"\n+\"Nincs semmi javítanivaló.\\n\"\n+\"\\n\"\n+\"Az első commit létrehozása előtt nincs semmilyen commit amit javitani \"\n+\"lehetne.\\n\"\n+\n+#: lib/commit.tcl:18\n+msgid \"\"\n+\"Cannot amend while merging.\\n\"\n+\"\\n\"\n+\"You are currently in the middle of a merge that has not been fully \"\n+\"completed.  You cannot amend the prior commit unless you first abort the \"\n+\"current merge activity.\\n\"\n+msgstr \"\"\n+\"Nem lehet javítani merge alatt.\\n\"\n+\"\\n\"\n+\"A jelenlegi merge még nem teljesen fejeződött be. Csak akkor javíthat egy \"\n+\"előbbi commitot, hogyha megszakítja a jelenlegi merge folyamatot.\\n\"\n+\n+#: lib/commit.tcl:49\n+msgid \"Error loading commit data for amend:\"\n+msgstr \"Hiba a javítandó commit adat betöltése közben:\"\n+\n+#: lib/commit.tcl:76\n+msgid \"Unable to obtain your identity:\"\n+msgstr \"Nem sikerült megállapítani az azonosítót:\"\n+\n+#: lib/commit.tcl:81\n+msgid \"Invalid GIT_COMMITTER_IDENT:\"\n+msgstr \"Érvénytelen GIT_COMMITTER_IDENT:\"\n+\n+#: lib/commit.tcl:133\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before another commit can be created.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"Az utolsó keresési állapot nem egyezik meg a repó állapotával.\\n\"\n+\"\\n\"\n+\"Egy másik Git program módosította ezt a repót az utolsó keresés óta. Egy \"\n+\"újrakeresés mindenképpen szükséges mielőtt a jelenlegi branchet módosítani \"\n+\"lehetne.\\n\"\n+\"\\n\"\n+\"Az újrakeresés most automatikusan el fog indulni.\\n\"\n+\n+#: lib/commit.tcl:154\n+#, tcl-format\n+msgid \"\"\n+\"Unmerged files cannot be committed.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.  You must resolve them and stage the file \"\n+\"before committing.\\n\"\n+msgstr \"\"\n+\"Nem commitolhatunk fájlokat merge előtt.\\n\"\n+\"\\n\"\n+\"A(z) %s fájlban ütközések vannak. Egyszer azokat ki kell javítani, majd \"\n+\"hozzá ki kell választani a fájlt mielőtt commitolni lehetne.\\n\"\n+\n+#: lib/commit.tcl:162\n+#, tcl-format\n+msgid \"\"\n+\"Unknown file state %s detected.\\n\"\n+\"\\n\"\n+\"File %s cannot be committed by this program.\\n\"\n+msgstr \"\"\n+\"Ismeretlen fájl típus %s érzékelve.\\n\"\n+\"\\n\"\n+\"A(z) %s fájlt nem tudja ez a program commitolni.\\n\"\n+\n+#: lib/commit.tcl:170\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"You must stage at least 1 file before you can commit.\\n\"\n+msgstr \"\"\n+\"Nincs commitolandó változtatás.\\n\"\n+\"\\n\"\n+\"Legalább egy fájl ki kell választani, hogy commitolni lehessen.\\n\"\n+\n+#: lib/commit.tcl:183\n+msgid \"\"\n+\"Please supply a commit message.\\n\"\n+\"\\n\"\n+\"A good commit message has the following format:\\n\"\n+\"\\n\"\n+\"- First line: Describe in one sentance what you did.\\n\"\n+\"- Second line: Blank\\n\"\n+\"- Remaining lines: Describe why this change is good.\\n\"\n+msgstr \"\"\n+\"Adjunk megy egy commit üzenetet.\\n\"\n+\"\\n\"\n+\"Egy jó commit üzenetnek a következő a formátuma:\\n\"\n+\"\\n\"\n+\"- Első sor: Egy mondatban leírja, hogy mit csináltunk.\\n\"\n+\"- Második sor: Üres\\n\"\n+\"- A többi sor: Leírja, hogy miért jó ez a változtatás.\\n\"\n+\n+#: lib/commit.tcl:257\n+msgid \"write-tree failed:\"\n+msgstr \"a write-tree sikertelen:\"\n+\n+#: lib/commit.tcl:279\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"No files were modified by this commit and it was not a merge commit.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"Nincs commitolandó változtatás.\\n\"\n+\"\\n\"\n+\"Egyetlen fájlt se módosított ez a commit és merge commit se volt.\\n\"\n+\"\\n\"\n+\"Az újrakeresés most automatikusan el fog indulni.\\n\"\n+\n+#: lib/commit.tcl:286\n+msgid \"No changes to commit.\"\n+msgstr \"Nincs commitolandó változtatás.\"\n+\n+#: lib/commit.tcl:317\n+msgid \"commit-tree failed:\"\n+msgstr \"a commit-tree sikertelen:\"\n+\n+#: lib/commit.tcl:339\n+msgid \"update-ref failed:\"\n+msgstr \"az update-ref sikertelen:\"\n+\n+#: lib/commit.tcl:430\n+#, tcl-format\n+msgid \"Created commit %s: %s\"\n+msgstr \"Létrejött a %s commit: %s\"\n+\n+#: lib/console.tcl:55\n+msgid \"Working... please wait...\"\n+msgstr \"Munka folyamatban.. Várjunk...\"\n+\n+#: lib/console.tcl:184\n+msgid \"Success\"\n+msgstr \"Siker\"\n+\n+#: lib/console.tcl:194\n+msgid \"Error: Command Failed\"\n+msgstr \"Hiba: a parancs sikertelen\"\n+\n+#: lib/database.tcl:43\n+msgid \"Number of loose objects\"\n+msgstr \"Elvesztett objektumok száma\"\n+\n+#: lib/database.tcl:44\n+msgid \"Disk space used by loose objects\"\n+msgstr \"Elveszett objektumok által elfoglalt lemezterület\"\n+\n+#: lib/database.tcl:45\n+msgid \"Number of packed objects\"\n+msgstr \"Csomagolt objektumok számra\"\n+\n+#: lib/database.tcl:46\n+msgid \"Number of packs\"\n+msgstr \"Csomagok száma\"\n+\n+#: lib/database.tcl:47\n+msgid \"Disk space used by packed objects\"\n+msgstr \"A csomagolt objektumok által használt lemezterület\"\n+\n+#: lib/database.tcl:48\n+msgid \"Packed objects waiting for pruning\"\n+msgstr \"Eltávolításra váró csomagolt objektumok számra\"\n+\n+#: lib/database.tcl:49\n+msgid \"Garbage files\"\n+msgstr \"Hulladék fájlok\"\n+\n+#: lib/database.tcl:72\n+msgid \"Compressing the object database\"\n+msgstr \"Az objektum adatbázis tömörítése\"\n+\n+#: lib/database.tcl:83\n+msgid \"Verifying the object database with fsck-objects\"\n+msgstr \"Az objektum adatbázis ellenőrzése az fsck-objects használatával\"\n+\n+#: lib/diff.tcl:42\n+#, tcl-format\n+msgid \"\"\n+\"No differences detected.\\n\"\n+\"\\n\"\n+\"%s has no changes.\\n\"\n+\"\\n\"\n+\"The modification date of this file was updated by another application, but \"\n+\"the content within the file was not changed.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started to find other files which may have \"\n+\"the same state.\"\n+msgstr \"\"\n+\"Nincsenek változások.\\n\"\n+\"\\n\"\n+\"A(z) %s módosítatlan.\\n\"\n+\"\\n\"\n+\"A fájl módosítási dátumát frissítette egy másik alkalmazás, de a fájl \"\n+\"tartalma változatlan.\\n\"\n+\"\\n\"\n+\"Egy újrakeresés fog indulni a hasonló állapotú fájlok megtalálása érdekében.\"\n+\n+#: lib/diff.tcl:97\n+msgid \"Error loading file:\"\n+msgstr \"Hiba a fájl betöltése közben:\"\n+\n+#: lib/diff.tcl:162\n+msgid \"Error loading diff:\"\n+msgstr \"Hiba a diff betöltése közben:\"\n+\n+#: lib/diff.tcl:278\n+msgid \"Failed to unstage selected hunk.\"\n+msgstr \"Nem visszavonni a hunk kiválasztását.\"\n+\n+#: lib/diff.tcl:285\n+msgid \"Failed to stage selected hunk.\"\n+msgstr \"Nem sikerült kiválasztani a hunkot.\"\n+\n+#: lib/error.tcl:12 lib/error.tcl:102\n+msgid \"error\"\n+msgstr \"hiba\"\n+\n+#: lib/error.tcl:28\n+msgid \"warning\"\n+msgstr \"figyelmeztetés\"\n+\n+#: lib/error.tcl:81\n+msgid \"You must correct the above errors before committing.\"\n+msgstr \"Ki kell javítanunk a fenti hibákat commit előtt.\"\n+\n+#: lib/index.tcl:364\n+#, tcl-format\n+msgid \"Revert changes in file %s?\"\n+msgstr \"Visszaállítja a változtatásokat a(z) %s fájlban?\"\n+\n+#: lib/index.tcl:366\n+#, tcl-format\n+msgid \"Revert changes in these %i files?\"\n+msgstr \"Visszaállítja a változtatásokat ebben e %i fájlban?\"\n+\n+#: lib/index.tcl:372\n+msgid \"Any unstaged changes will be permanently lost by the revert.\"\n+msgstr \"\"\n+\"Minden nem kiválasztott változtatás el fog veszni ezáltal a visszaállítás \"\n+\"által.\"\n+\n+#: lib/index.tcl:375\n+msgid \"Do Nothing\"\n+msgstr \"Ne csináljunk semmit\"\n+\n+#: lib/merge.tcl:13\n+msgid \"\"\n+\"Cannot merge while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit before starting any type of merge.\\n\"\n+msgstr \"\"\n+\"Javítás közben nem lehetséges a merge.\\n\"\n+\"\\n\"\n+\"Egyszer be kell fejezni ennek a commitnak a javítását, majd kezdődhet egy \"\n+\"merge.\\n\"\n+\n+#: lib/merge.tcl:27\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before a merge can be performed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\"Az utolsó keresési állapot nem egyezik meg a repó állapotával.\\n\"\n+\"\\n\"\n+\"Egy másik Git program módosította ezt a repót az utolsó keresés óta. Egy \"\n+\"újrakeresés mindenképpen szükséges mielőtt a jelenlegi branchet módosítani \"\n+\"lehetne.\\n\"\n+\"\\n\"\n+\"Az újrakeresés most automatikusan el fog indulni.\\n\"\n+\n+#: lib/merge.tcl:44\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a conflicted merge.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.\\n\"\n+\"\\n\"\n+\"You must resolve them, stage the file, and commit to complete the current \"\n+\"merge.  Only then can you begin another merge.\\n\"\n+msgstr \"\"\n+\"Jelenleg egy ütközés feloldása közben vagyunk.\\n\"\n+\"\\n\"\n+\"A(z) %s fájlban ütközések vannak.\\n\"\n+\"\\n\"\n+\"Fel kell oldanunk őket, kiválasztani a fájlt, és commitolni hogy befejezzük \"\n+\"a jelenlegi merge-t. Csak ezután kezdhetünk el egy újabbat.\\n\"\n+\n+#: lib/merge.tcl:54\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a change.\\n\"\n+\"\\n\"\n+\"File %s is modified.\\n\"\n+\"\\n\"\n+\"You should complete the current commit before starting a merge.  Doing so \"\n+\"will help you abort a failed merge, should the need arise.\\n\"\n+msgstr \"\"\n+\"Jelenleg egy változtatás közben vagyunk.\\n\"\n+\"\\n\"\n+\"A(z) %s fájl megváltozott.\\n\"\n+\"\\n\"\n+\"Először be kell fejeznünk a jelenlegi commitot, hogy elkezdhessünk egy merge-\"\n+\"t. Ez segíteni fog, hogy félbeszakíthassunk egy merge-t.\\n\"\n+\n+#: lib/merge.tcl:106\n+#, tcl-format\n+msgid \"%s of %s\"\n+msgstr \"%s / %s\"\n+\n+#: lib/merge.tcl:119\n+#, tcl-format\n+msgid \"Merging %s and %s\"\n+msgstr \"A(z) %s és a(z) %s merge-ölése\"\n+\n+#: lib/merge.tcl:131\n+msgid \"Merge completed successfully.\"\n+msgstr \"A merge sikeresen befejeződött.\"\n+\n+#: lib/merge.tcl:133\n+msgid \"Merge failed.  Conflict resolution is required.\"\n+msgstr \"A merge sikertelen. Fel kell oldanunk az ütközéseket.\"\n+\n+#: lib/merge.tcl:158\n+#, tcl-format\n+msgid \"Merge Into %s\"\n+msgstr \"Merge-ölés a következőbe: %s\"\n+\n+#: lib/merge.tcl:177\n+msgid \"Revision To Merge\"\n+msgstr \"Merge-ölni szándékozott revízió\"\n+\n+#: lib/merge.tcl:212\n+msgid \"\"\n+\"Cannot abort while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit.\\n\"\n+msgstr \"\"\n+\"A commit javítás közben megszakítva.\\n\"\n+\"\\n\"\n+\"Be kell fejeznünk ennek a commitnak a javítását.\\n\"\n+\n+#: lib/merge.tcl:222\n+msgid \"\"\n+\"Abort merge?\\n\"\n+\"\\n\"\n+\"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\\n\"\n+\"\\n\"\n+\"Continue with aborting the current merge?\"\n+msgstr \"\"\n+\"Megszakítjuk a merge-t?\\n\"\n+\"\\n\"\n+\"A jelenlegi merge megszakítása *MINDEN* nem commitolt változtatás \"\n+\"elvesztését jelenti.\\n\"\n+\"\\n\"\n+\"Folytatjuk a jelenlegi merge megszakítását?\"\n+\n+#: lib/merge.tcl:228\n+msgid \"\"\n+\"Reset changes?\\n\"\n+\"\\n\"\n+\"Resetting the changes will cause *ALL* uncommitted changes to be lost.\\n\"\n+\"\\n\"\n+\"Continue with resetting the current changes?\"\n+msgstr \"\"\n+\"Visszavonjuk a módosításokat?\\n\"\n+\"\\n\"\n+\"A módosítások visszavonása *MINDEN* nem commitolt változtatás elvesztését \"\n+\"jelenti.\\n\"\n+\"\\n\"\n+\"Folytatjuk a jelenlegi módosítások visszavonását?\"\n+\n+#: lib/merge.tcl:239\n+msgid \"Aborting\"\n+msgstr \"Félbeszakítás\"\n+\n+#: lib/merge.tcl:266\n+msgid \"Abort failed.\"\n+msgstr \"A félbeszakítás nem sikerült.\"\n+\n+#: lib/merge.tcl:268\n+msgid \"Abort completed.  Ready.\"\n+msgstr \"A megkeszakítás befejeződött. Kész.\"\n+\n+#: lib/option.tcl:77\n+msgid \"git-gui - a graphical user interface for Git.\"\n+msgstr \"git-gui - egy grafikus felület a Githez.\"\n+\n+#: lib/option.tcl:164\n+msgid \"Restore Defaults\"\n+msgstr \"Alapértelmezés visszaállítása\"\n+\n+#: lib/option.tcl:168\n+msgid \"Save\"\n+msgstr \"Mentés\"\n+\n+#: lib/option.tcl:178\n+#, tcl-format\n+msgid \"%s Repository\"\n+msgstr \"%s Repó\"\n+\n+#: lib/option.tcl:179\n+msgid \"Global (All Repositories)\"\n+msgstr \"Globális (minden repó)\"\n+\n+#: lib/option.tcl:185\n+msgid \"User Name\"\n+msgstr \"Felhasználónév\"\n+\n+#: lib/option.tcl:186\n+msgid \"Email Address\"\n+msgstr \"Email cím\"\n+\n+#: lib/option.tcl:188\n+msgid \"Summarize Merge Commits\"\n+msgstr \"A merge commitok összegzése\"\n+\n+#: lib/option.tcl:189\n+msgid \"Merge Verbosity\"\n+msgstr \"Merge beszédesség\"\n+\n+#: lib/option.tcl:190\n+msgid \"Show Diffstat After Merge\"\n+msgstr \"Diffstat mutatása merge után\"\n+\n+#: lib/option.tcl:192\n+msgid \"Trust File Modification Timestamps\"\n+msgstr \"A fájl módosítási dátumok megbízhatóak\"\n+\n+#: lib/option.tcl:193\n+msgid \"Prune Tracking Branches During Fetch\"\n+msgstr \"A követő branchek eltávolítása letöltés alatt\"\n+\n+#: lib/option.tcl:194\n+msgid \"Match Tracking Branches\"\n+msgstr \"A követő branchek egyeztetése\"\n+\n+#: lib/option.tcl:195\n+msgid \"Number of Diff Context Lines\"\n+msgstr \"A diff környezeti sorok száma\"\n+\n+#: lib/option.tcl:196\n+msgid \"New Branch Name Template\"\n+msgstr \"Új branch név sablon\"\n+\n+#: lib/option.tcl:305\n+msgid \"Failed to completely save options:\"\n+msgstr \"Nem sikerült teljesen elmenteni a beállításokat:\"\n+\n+#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34\n+msgid \"Delete Remote Branch\"\n+msgstr \"Távoli branch törlése\"\n+\n+#: lib/remote_branch_delete.tcl:47\n+msgid \"From Repository\"\n+msgstr \"Forrás repó\"\n+\n+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118\n+msgid \"Remote:\"\n+msgstr \"Távoli:\"\n+\n+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133\n+msgid \"Arbitrary URL:\"\n+msgstr \"Tetszőleges URL:\"\n+\n+#: lib/remote_branch_delete.tcl:84\n+msgid \"Branches\"\n+msgstr \"Branchek\"\n+\n+#: lib/remote_branch_delete.tcl:109\n+msgid \"Delete Only If\"\n+msgstr \"Törlés csak akkor ha\"\n+\n+#: lib/remote_branch_delete.tcl:111\n+msgid \"Merged Into:\"\n+msgstr \"Merge-ölt a következőbe:\"\n+\n+#: lib/remote_branch_delete.tcl:119\n+msgid \"Always (Do not perform merge checks)\"\n+msgstr \"Mindig (Ne végezzen merge vizsgálatokat)\"\n+\n+#: lib/remote_branch_delete.tcl:152\n+msgid \"A branch is required for 'Merged Into'.\"\n+msgstr \"Egy branch szükséges a 'Merge-ölt a következőbe'-hez.\"\n+\n+#: lib/remote_branch_delete.tcl:189\n+#, tcl-format\n+msgid \"\"\n+\"One or more of the merge tests failed because you have not fetched the \"\n+\"necessary commits.  Try fetching from %s first.\"\n+msgstr \"\"\n+\"Egy vagy több merge teszt hibát jelzett, mivel nem töltöttük le a megfelelő \"\n+\"commitokat. Próbáljunk meg letölteni a következőből: %s először.\"\n+\n+#: lib/remote_branch_delete.tcl:207\n+msgid \"Please select one or more branches to delete.\"\n+msgstr \"Válasszunk ki egy vagy több branchet törlésre.\"\n+\n+#: lib/remote_branch_delete.tcl:216\n+msgid \"\"\n+\"Recovering deleted branches is difficult.\\n\"\n+\"\\n\"\n+\"Delete the selected branches?\"\n+msgstr \"\"\n+\"A törölt branchek visszaállítása nehéz.\\n\"\n+\"\\n\"\n+\"Töröljük a kiválasztott brancheket?\"\n+\n+#: lib/remote_branch_delete.tcl:226\n+#, tcl-format\n+msgid \"Deleting branches from %s\"\n+msgstr \"Brancek törlése innen: %s\"\n+\n+#: lib/remote_branch_delete.tcl:286\n+msgid \"No repository selected.\"\n+msgstr \"Nincs kiválasztott repó.\"\n+\n+#: lib/remote_branch_delete.tcl:291\n+#, tcl-format\n+msgid \"Scanning %s...\"\n+msgstr \"Keresés itt: %s...\"\n+\n+# tcl-format\n+#: lib/remote.tcl:162\n+#, tcl-format\n+msgid \"Fetch from %s...\"\n+msgstr \"Letöltés innen: %s...\"\n+\n+#: lib/remote.tcl:172\n+#, tcl-format\n+msgid \"Prune from %s...\"\n+msgstr \"Törlés innen: %s...\"\n+\n+#: lib/remote.tcl:206\n+#, tcl-format\n+msgid \"Push to %s...\"\n+msgstr \"Pusholás ide: %s...\"\n+\n+#: lib/shortcut.tcl:26 lib/shortcut.tcl:74\n+msgid \"Cannot write script:\"\n+msgstr \"Nem sikerült írni a scriptet:\"\n+\n+#: lib/shortcut.tcl:149\n+msgid \"Cannot write icon:\"\n+msgstr \"Nem sikerült írni az ikont:\"\n+\n+#: lib/status_bar.tcl:58\n+#, tcl-format\n+msgid \"%s ... %i of %i %s (%2i%%)\"\n+msgstr \"%s ... %i / %i %s (%2i%%)\"\n+\n+#: lib/transport.tcl:7\n+#, tcl-format\n+msgid \"Fetching new changes from %s\"\n+msgstr \"Új változások letöltése innen: %s\"\n+\n+#: lib/transport.tcl:19\n+#, tcl-format\n+msgid \"Pruning tracking branches deleted from %s\"\n+msgstr \"A %s repóból törölt követő branchek törlése\"\n+\n+#: lib/transport.tcl:26\n+#, tcl-format\n+msgid \"Pushing changes to %s\"\n+msgstr \"Változások pusholása ide: %s\"\n+\n+#: lib/transport.tcl:68\n+#, tcl-format\n+msgid \"Pushing %s %s to %s\"\n+msgstr \"Pusholás: %s %s, ide: %s\"\n+\n+#: lib/transport.tcl:84\n+msgid \"Push Branches\"\n+msgstr \"Branchek pusholása\"\n+\n+#: lib/transport.tcl:98\n+msgid \"Source Branches\"\n+msgstr \"Forrás branchek\"\n+\n+#: lib/transport.tcl:115\n+msgid \"Destination Repository\"\n+msgstr \"Cél repó\"\n+\n+#: lib/transport.tcl:153\n+msgid \"Transfer Options\"\n+msgstr \"Átviteli opciók\"\n+\n+#: lib/transport.tcl:155\n+msgid \"Use thin pack (for slow network connections)\"\n+msgstr \"Vékony csomagok használata (lassú hálózati kapcsolatok számára)\"\n+\n+#: lib/transport.tcl:159\n+msgid \"Include tags\"\n+msgstr \"Tageket is\"\n+\n+#~ msgid \"Add To Commit\"\n+#~ msgstr \"Hozzáadás a commithoz\"\n+\n+#~ msgid \"Add Existing To Commit\"\n+#~ msgstr \"Hozzáadás létező commithoz\"\n+\n+#~ msgid \"Running miga...\"\n+#~ msgstr \"A miga futtatása...\"\n+\n+#~ msgid \"Add Existing\"\n+#~ msgstr \"Létező hozzáadása\"\n+\n+#~ msgid \"\"\n+#~ \"Abort commit?\\n\"\n+#~ \"\\n\"\n+#~ \"Aborting the current commit will cause *ALL* uncommitted changes to be \"\n+#~ \"lost.\\n\"\n+#~ \"\\n\"\n+#~ \"Continue with aborting the current commit?\"\n+#~ msgstr \"\"\n+#~ \"Megszakítjuk a commitot?\\n\"\n+#~ \"\\n\"\n+#~ \"A jelenlegi commit megszakítása *MINDEN* nem commitolt változtatás \"\n+#~ \"elvesztését jelenti.\\n\"\n+#~ \"\\n\"\n+#~ \"Folytatjuk a jelenlegi commit megszakítását?\"\n+\n+#~ msgid \"Aborting... please wait...\"\n+#~ msgstr \"Megszakítás... várjunk...\"\n-- \n1.5.3.2.g46909\n\n"},{"id":"52233","messageId":"Pine.LNX.4.64.0709021737390.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 14/15] German glossary for translation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:37:46Z","receivedAt":"2007-09-02T16:37:46Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nFrom: Christian Stimming <stimming@tuhh.de>\n\nSigned-off-by: Christian Stimming <christian.stimming@ibeo-as.com>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n po/glossary/de.po |  158 +++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 158 insertions(+), 0 deletions(-)\n create mode 100644 po/glossary/de.po\n\ndiff --git a/po/glossary/de.po b/po/glossary/de.po\nnew file mode 100644\nindex 0000000..aab3b22\n--- /dev/null\n+++ b/po/glossary/de.po\n@@ -0,0 +1,158 @@\n+# Translation of git-gui glossary to German\n+# Copyright (C) 2007 Shawn Pearce, et al.\n+# This file is distributed under the same license as the git package.\n+# Christian Stimming <stimming@tuhh.de>, 2007\n+#\n+msgid \"\"\n+msgstr \"\"\n+\"Project-Id-Version: git-gui glossary\\n\"\n+\"PO-Revision-Date: 2007-07-26 14:45+0200\\n\"\n+\"Last-Translator: Christian Stimming <stimming@tuhh.de>\\n\"\n+\"Language-Team: German \\n\"\n+\"MIME-Version: 1.0\\n\"\n+\"Content-Type: text/plain; charset=UTF-8\\n\"\n+\"Content-Transfer-Encoding: 8bit\\n\"\n+\n+#. \"English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)\"\n+msgid \"\"\n+\"English Term (Dear translator: This file will never be visible to the user!)\"\n+msgstr \"\"\n+\"Deutsche Übersetzung.\\n\"\n+\"Andere deutsche SCM:\\n\"\n+\"  http://tortoisesvn.net/docs/release/TortoiseSVN_de/index.html und http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_de.po (username=guest, password empty, gut),\\n\"\n+\"  http://msdn.microsoft.com/de-de/library/ms181038(vs.80).aspx (MS Visual Source Safe, kommerziell),\\n\"\n+\"  http://cvsbook.red-bean.com/translations/german/Kap_06.html (mittelmäßig),\\n\"\n+\"  http://tortoisecvs.cvs.sourceforge.net/tortoisecvs/po/TortoiseCVS/de_DE.po?view=markup (mittelmäßig),\\n\"\n+\"  http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/de/rapidsvn.po (username=guest, password empty, schlecht)\"\n+\n+#. \"\"\n+msgid \"amend\"\n+msgstr \"nachbessern (ergänzen)\"\n+\n+#. \"\"\n+msgid \"annotate\"\n+msgstr \"annotieren\"\n+\n+#. \"A 'branch' is an active line of development.\"\n+msgid \"branch [noun]\"\n+msgstr \"Zweig\"\n+\n+#. \"\"\n+msgid \"branch [verb]\"\n+msgstr \"verzweigen\"\n+\n+#. \"\"\n+msgid \"checkout [noun]\"\n+msgstr \"Auscheck? Ausspielung? Abruf? (Source Safe: Auscheckvorgang)\"\n+\n+#. \"The action of updating the working tree to a revision which was stored in the object database.\"\n+msgid \"checkout [verb]\"\n+msgstr \"auschecken? ausspielen? abrufen? (Source Safe: auschecken)\"\n+\n+#. \"A single point in the git history.\"\n+msgid \"commit [noun]\"\n+msgstr \"Übertragung (Sendung?, Übergabe?, Einspielung?, Ablagevorgang?)\"\n+\n+#. \"The action of storing a new snapshot of the project's state in the git history.\"\n+msgid \"commit [verb]\"\n+msgstr \"übertragen (TortoiseSVN: übertragen; Source Safe: einchecken; senden?, übergeben?, einspielen?, einpflegen?, ablegen?)\"\n+\n+#. \"\"\n+msgid \"diff [noun]\"\n+msgstr \"Vergleich (Source Safe: Unterschiede)\"\n+\n+#. \"\"\n+msgid \"diff [verb]\"\n+msgstr \"vergleichen\"\n+\n+#. \"A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have.\"\n+msgid \"fast forward merge\"\n+msgstr \"Schnellzusammenführung\"\n+\n+#. \"Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too.\"\n+msgid \"fetch\"\n+msgstr \"anfordern (holen?)\"\n+\n+#. \"A collection of files. The index is a stored version of your working tree.\"\n+msgid \"index (in git-gui: staging area)\"\n+msgstr \"Bereitstellung\"\n+\n+#. \"A successful merge results in the creation of a new commit representing the result of the merge.\"\n+msgid \"merge [noun]\"\n+msgstr \"Zusammenführung\"\n+\n+#. \"To bring the contents of another branch into the current branch.\"\n+msgid \"merge [verb]\"\n+msgstr \"zusammenführen\"\n+\n+#. \"\"\n+msgid \"message\"\n+msgstr \"Meldung (Nachricht?; Source Safe: Kommentar)\"\n+\n+#. \"Pulling a branch means to fetch it and merge it.\"\n+msgid \"pull\"\n+msgstr \"übernehmen (ziehen?)\"\n+\n+#. \"Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)\"\n+msgid \"push\"\n+msgstr \"ausliefern (hochladen? verschicken? schieben?)\"\n+\n+#. \"\"\n+msgid \"redo\"\n+msgstr \"wiederholen\"\n+\n+#. \"A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)\"\n+msgid \"repository\"\n+msgstr \"Projektarchiv\"\n+\n+#. \"\"\n+msgid \"reset\"\n+msgstr \"zurücksetzen (zurückkehren?)\"\n+\n+#. \"\"\n+msgid \"revert\"\n+msgstr \"revidieren\"\n+\n+#. \"A particular state of files and directories which was stored in the object database.\"\n+msgid \"revision\"\n+msgstr \"Version (TortoiseSVN: Revision; Source Safe: Version)\"\n+\n+#. \"\"\n+msgid \"sign off\"\n+msgstr \"abzeichnen (gegenzeichnen?, freizeichnen?, absegnen?)\"\n+\n+#. \"\"\n+msgid \"staging area\"\n+msgstr \"Bereitstellung\"\n+\n+#. \"\"\n+msgid \"status\"\n+msgstr \"Status\"\n+\n+#. \"A ref pointing to a tag or commit object\"\n+msgid \"tag [noun]\"\n+msgstr \"Markierung\"\n+\n+#. \"\"\n+msgid \"tag [verb]\"\n+msgstr \"markieren\"\n+\n+#. \"A regular git branch that is used to follow changes from another repository.\"\n+msgid \"tracking branch\"\n+msgstr \"Übernahmezweig\"\n+\n+#. \"\"\n+msgid \"undo\"\n+msgstr \"rückgängig\"\n+\n+#. \"\"\n+msgid \"update\"\n+msgstr \"aktualisieren\"\n+\n+#. \"\"\n+msgid \"verify\"\n+msgstr \"überprüfen\"\n+\n+#. \"The tree of actual checked out files.\"\n+msgid \"working copy, working tree\"\n+msgstr \"Arbeitskopie\"\n-- \n1.5.3.2.g46909\n\n"},{"id":"52234","messageId":"Pine.LNX.4.64.0709021737510.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"[PATCH 15/15] git-gui: Added initial version of po/glossary/zh_cn.po","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:38:00Z","receivedAt":"2007-09-02T16:38:00Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nFrom: Xudong Guan <xudong.guan@gmail.com>\n\nwith contributions from LI Yang, WANG Cong, ZHANG Le, and rae l\nfrom the zh-kernel.org mailing list.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n po/glossary/zh_cn.po |  170 ++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 170 insertions(+), 0 deletions(-)\n create mode 100644 po/glossary/zh_cn.po\n\ndiff --git a/po/glossary/zh_cn.po b/po/glossary/zh_cn.po\nnew file mode 100644\nindex 0000000..158835b\n--- /dev/null\n+++ b/po/glossary/zh_cn.po\n@@ -0,0 +1,170 @@\n+# Translation of git-gui glossary to Simplified Chinese\n+# Copyright (C) 2007 Shawn Pearce, et al.\n+# This file is distributed under the same license as the git package.\n+# Xudong Guan <xudong.guan@gmail.com> and the zh-kernel.org mailing list, 2007\n+#\n+msgid \"\"\n+msgstr \"\"\n+\"Project-Id-Version: git-gui glossary\\n\"\n+\"PO-Revision-Date: 2007-07-23 22:07+0200\\n\"\n+\"Last-Translator: Xudong Guan <xudong.guan@gmail.com>\\n\"\n+\"Language-Team: Simplified Chinese \\n\"\n+\"MIME-Version: 1.0\\n\"\n+\"Content-Type: text/plain; charset=UTF-8\\n\"\n+\"Content-Transfer-Encoding: 8bit\\n\"\n+\n+#. \"English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)\"\n+msgid \"\"\n+\"English Term (Dear translator: This file will never be visible to the user!)\"\n+msgstr \"注：这个文件是为了帮助翻译人员统一名词术语。最终用户不会关心这个文件。\"\n+\n+#. \"\"\n+#. amend指用户修改最近一次commit的操作，修订？修改？修正？\n+#. [WANG Cong]: 根据我的了解，这个词似乎翻译成“修订”多一些。“修正”也可以，“修改”再次之。\n+#. [ZHANG Le]: 修订，感觉一般指对一些大型出版物的大规模升级，比如修订新华字典\n+#              修正，其实每次amend的结果也不一定就是最后结果，说不定还需要修改。所以不\n+#              如就叫修改\n+msgid \"amend\"\n+msgstr \"修订\"\n+\n+#. \"\"\n+#. git annotate 文件名：用来标注文件的每一行在什么时候被谁最后修改。\n+#. [WANG Cong]: \"标记\"一般是mark。;)\n+#. [ZHANG Le]: 标注，或者干脆用原意：注解，或注释\n+msgid \"annotate\"\n+msgstr \"标注\"\n+\n+#. \"A 'branch' is an active line of development.\"\n+msgid \"branch [noun]\"\n+msgstr \"分支\"\n+\n+#. \"\"\n+msgid \"branch [verb]\"\n+msgstr \"建立分支\"\n+\n+#. \"\"\n+#. [WANG Cong]: 网上有人翻译成“检出”，我感觉更好一些，毕竟把check的意思翻译出来了。\n+#. [ZHNAG Le]: 提取吧，提取分支／版本\n+#. [rae l]: 签出。subversion软件中的大多词汇已有翻译，既然git与subversion同是SCM管理，可以参考同类软件的翻译也不错。\n+msgid \"checkout [noun]\"\n+msgstr \"签出\"\n+\n+#. \"The action of updating the working tree to a revision which was stored in the object database.\"\n+msgid \"checkout [verb]\"\n+msgstr \"签出\"\n+\n+#. \"A single point in the git history.\"\n+msgid \"commit [noun]\"\n+msgstr \"提交\"\n+\n+#. \"The action of storing a new snapshot of the project's state in the git history.\"\n+msgid \"commit [verb]\"\n+msgstr \"提交\"\n+\n+#. \"\"\n+#. 差异？差别？\n+#. [ZHANG Le]: 个人感觉差别更加中性一些\n+msgid \"diff [noun]\"\n+msgstr \"差别\"\n+\n+#. \"\"\n+msgid \"diff [verb]\"\n+msgstr \"比较\"\n+\n+#. \"A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have.\"\n+msgid \"fast forward merge\"\n+msgstr \"快进式合并\"\n+\n+#. \"Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too.\"\n+#. 获取？取得？下载？更新？注意和update的区分\n+msgid \"fetch\"\n+msgstr \"获取\"\n+\n+#. \"A collection of files. The index is a stored version of your working tree.\"\n+#. index是working tree和repository之间的缓存\n+msgid \"index (in git-gui: staging area)\"\n+msgstr \"工作缓存？\"\n+\n+#. \"A successful merge results in the creation of a new commit representing the result of the merge.\"\n+msgid \"merge [noun]\"\n+msgstr \"合并\"\n+\n+#. \"To bring the contents of another branch into the current branch.\"\n+msgid \"merge [verb]\"\n+msgstr \"合并\"\n+\n+#. \"\"\n+#. message是指commit中的文字信息\n+msgid \"message\"\n+msgstr \"描述\"\n+\n+#. \"Pulling a branch means to fetch it and merge it.\"\n+msgid \"pull\"\n+msgstr \"获取＋合并\"\n+\n+#. \"Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)\"\n+msgid \"push\"\n+msgstr \"推入\"\n+\n+#. \"\"\n+msgid \"redo\"\n+msgstr \"重做\"\n+\n+#. \"A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)\"\n+msgid \"repository\"\n+msgstr \"仓库\"\n+\n+#. \"\"\n+msgid \"reset\"\n+msgstr \"重置\"\n+\n+#. \"\"\n+msgid \"revert\"\n+msgstr \"恢复\"\n+\n+#. \"A particular state of files and directories which was stored in the object database.\"\n+msgid \"revision\"\n+msgstr \"版本\"\n+\n+#. \"\"\n+msgid \"sign off\"\n+msgstr \"签名\"\n+\n+#. \"\"\n+#. 似乎是git-gui里面显示的本次提交的文件清单区域\n+msgid \"staging area\"\n+msgstr \"提交暂存区\"\n+\n+#. \"\"\n+msgid \"status\"\n+msgstr \"状态\"\n+\n+#. \"A ref pointing to a tag or commit object\"\n+msgid \"tag [noun]\"\n+msgstr \"标签\"\n+\n+#. \"\"\n+msgid \"tag [verb]\"\n+msgstr \"添加标签\"\n+\n+#. \"A regular git branch that is used to follow changes from another repository.\"\n+msgid \"tracking branch\"\n+msgstr \"跟踪分支\"\n+\n+#. \"\"\n+msgid \"undo\"\n+msgstr \"撤销\"\n+\n+#. \"\"\n+msgid \"update\"\n+msgstr \"更新。注意和fetch的区分\"\n+\n+#. \"\"\n+msgid \"verify\"\n+msgstr \"验证\"\n+\n+#. \"The tree of actual checked out files.\"\n+#. \"工作副本？工作区域？工作目录\"\n+#. [LI Yang]: 当前副本， 当前源码树？\n+msgid \"working copy, working tree\"\n+msgstr \"工作副本，工作源码树\"\n-- \n1.5.3.2.g46909\n\n"},{"id":"52235","messageId":"Pine.LNX.4.64.0709021738090.28586@racer.site","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021719380.28586@racer.site","subject":"Re: [PATCH 00/15] i18n support for git-gui","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-02T16:39:46Z","receivedAt":"2007-09-02T16:39:46Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nsorry for the fsckup with the first two patches; both should be attributed \nto Christian Stimming.\n\nFor convenience, I also uploaded that patch series (on top of your \n\"git-gui: Initialize Tcl's msgcat library for internationalization\" in \nyour \"pu\" branch) to the \"for-shawn\" branch in git-gui-i18n.\n\nCiao,\nDscho\n"},{"id":"52298","messageId":"20070903044938.GQ18160@spearce.org","threadId":"9749","inReplyTo":"Pine.LNX.4.64.0709021738090.28586@racer.site","subject":"Re: [PATCH 00/15] i18n support for git-gui","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-09-03T04:49:38Z","receivedAt":"2007-09-03T04:49:38Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:\n> sorry for the fsckup with the first two patches; both should be attributed \n> to Christian Stimming.\n> \n> For convenience, I also uploaded that patch series (on top of your \n> \"git-gui: Initialize Tcl's msgcat library for internationalization\" in \n> your \"pu\" branch) to the \"for-shawn\" branch in git-gui-i18n.\n\nThat was *much* easier than the small patch bomb.  ;-)\n\nI've swallowed this series down and added it to my `master` branch.\nI found one bug in the [mc \"...\"] string definitions and fixed it\n(below).  I also applied Michele Ballabio's \"remove does in some\nUI strings\" patch on top.  Those two changes I'm sure will impact\nsome of the translated strings.  I guess someone needs to run `make\nupdate-po` and ask translators to revise the individual languages?\n\n-->8--\nFrom b86882eda026a0da18472587034250a53e0daf51 Mon Sep 17 00:00:00 2001\nFrom: Shawn O. Pearce <spearce@spearce.org>\nDate: Mon, 3 Sep 2007 00:22:19 -0400\nSubject: [PATCH] git-gui: Correct stock message for 'Invalid font specified in %s'\n\nThis particular message is talking about a specific option in the\nconfiguration file named \"gui.$name\".  This option is not localized\nso we cannot localize the \"gui.\" that denotes the section the option\n$name is found within.  Currently there are no plans to localize the\nconfiguration options for git-gui, but if that were to change in the\nfuture then it would be necessary to localize not only the \"gui.\"\nsection prefix but also the $name (fontui and fontdiff).\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n git-gui.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-gui.sh b/git-gui.sh\nindex 913ba68..5635eea 100755\n--- a/git-gui.sh\n+++ b/git-gui.sh\n@@ -1643,7 +1643,7 @@ proc apply_config {} {\n \t\t\t\tfont configure $font $cn $cv\n \t\t\t}\n \t\t\t} err]} {\n-\t\t\terror_popup [append [mc \"Invalid font specified in gui.%s:\" $name] \"\\n\\n$err\"]\n+\t\t\terror_popup [append [mc \"Invalid font specified in %s:\" \"gui.$name\"] \"\\n\\n$err\"]\n \t\t}\n \t\tforeach {cn cv} [font configure $font] {\n \t\t\tfont configure ${font}bold $cn $cv\n-- \n1.5.3\n\n-- \nShawn.\n"},{"id":"52347","messageId":"Pine.LNX.4.64.0709031308160.28586@racer.site","threadId":"9749","inReplyTo":"20070903044938.GQ18160@spearce.org","subject":"Re: [PATCH 00/15] i18n support for git-gui","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-03T12:17:56Z","receivedAt":"2007-09-03T12:17:56Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 3 Sep 2007, Shawn O. Pearce wrote:\n\n> Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:\n> > sorry for the fsckup with the first two patches; both should be attributed \n> > to Christian Stimming.\n> > \n> > For convenience, I also uploaded that patch series (on top of your \n> > \"git-gui: Initialize Tcl's msgcat library for internationalization\" in \n> > your \"pu\" branch) to the \"for-shawn\" branch in git-gui-i18n.\n> \n> That was *much* easier than the small patch bomb.  ;-)\n\nHehe.  I somehow had the impression that there were only a handful of \npatches.  Imagine how surprised I was when format-patch came up with 15!  \n\n> I've swallowed this series down and added it to my `master` branch. I \n> found one bug in the [mc \"...\"] string definitions and fixed it (below). \n> I also applied Michele Ballabio's \"remove does in some UI strings\" patch \n> on top. Those two changes I'm sure will impact some of the translated \n> strings.  I guess someone needs to run `make update-po` and ask \n> translators to revise the individual languages?\n\nYes, will do so.\n\nThe thing is: these four changes are easy enough that update-po will still \nmatch them, and mark them with \"fuzzy\".\n\nNow, before I go and bug my dear translators, I will play around with a \ncustom diff driver for .po files which should be easier on the eye: it is \nnot in the least funny to see gazillions of changes which are just line \nnumber changes, and to miss out the real modifications.\n\nBTW I like your \"quiet\" patch...\n\nCiao,\nDscho\n"}]}