Download
1 / 1
E N D
<?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US"> <!-- git web interface version 1.6.5.rc2.25.gfd7fd.dirty, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke --> <!-- git core binaries version 1.7.0.4 --> <head> <meta http-equiv="content-type" content="text/html; charset=utf-8"/> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shCore.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushBash.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushCpp.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushCSharp.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushCss.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushDelphi.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushDiff.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushGroovy.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushJava.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushJScript.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushPerl.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushPhp.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushPlain.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushPython.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushRuby.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushScala.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushSql.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushVb.js"></script> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/shBrushXml.js"></script> <link type="text/css" rel="stylesheet" href="http://doucette.cc/SyntaxHighlighter/styles/shCore.css"/> <link type="text/css" rel="stylesheet" href="http://doucette.cc/SyntaxHighlighter/styles/shThemeDefault.css"/> <script type="text/javascript" src="http://doucette.cc/SyntaxHighlighter/scripts/lineHighlighter.js"></script> <script type="text/javascript"> SyntaxHighlighter.config.clipboardSwf = 'http://doucette.cc/SyntaxHighlighter/Flash/clipboard.swf'; SyntaxHighlighter.all(); window.onload = function() { highlightLines(); } </script> <meta name="generator" content="gitweb/1.6.5.rc2.25.gfd7fd.dirty git/1.7.0.4 mod_perl/2.0.4"/> <meta name="robots" content="index, nofollow"/> <title>git.doucette.cc Git - git.git/blobdiff - git-gui/po/git-gui.pot</title> <base href="http://git.doucette.cc" /> <link rel="stylesheet" type="text/css" href="/css"/> <link rel="alternate" title="git.git - history of git-gui/po/git-gui.pot - RSS feed" href="http://git.doucette.cc/git.git/rss?f=git-gui/po/git-gui.pot" type="application/rss+xml" /> <link rel="alternate" title="git.git - history of git-gui/po/git-gui.pot - RSS feed (no merges)" href="http://git.doucette.cc/git.git/rss?f=git-gui/po/git-gui.pot;opt=--no-merges" type="application/rss+xml" /> <link rel="alternate" title="git.git - history of git-gui/po/git-gui.pot - Atom feed" href="http://git.doucette.cc/git.git/atom?f=git-gui/po/git-gui.pot;opt=--no-merges" type="application/atom+xml" /> <link rel="alternate" title="git.git - history of git-gui/po/git-gui.pot - Atom feed (no merges)" href="http://git.doucette.cc/git.git/atom?f=git-gui/po/git-gui.pot;opt=--no-merges" type="application/atom+xml" /> <link rel="shortcut icon" href="/favicon.png" type="image/png" /> </head> <body> <div class="page_header"> <a title="git homepage" href="http://git-scm.com/"><img src="/logo" width="72" height="27" alt="git" class="logo"/></a><a href="http://git.doucette.cc/">projects</a> / <a href="http://git.doucette.cc/git.git">git.git</a> / blobdiff </div> <form method="get" action="http://git.doucette.cc/git.git" enctype="application/x-www-form-urlencoded"> <div class="search"> <input name="a" type="hidden" value="search" /> <input name="h" type="hidden" value="b4955fb611ce407ef0e522862c60ae0472dbfe5e" /> <select name="st" > <option selected="selected" value="commit">commit</option> <option value="grep">grep</option> <option value="author">author</option> <option value="committer">committer</option> <option value="pickaxe">pickaxe</option> </select><sup><a href="http://git.doucette.cc/git.git/search_help">?</a></sup> search: <input type="text" name="s" /> <span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span></div><div><input type="hidden" name=".cgifields" value="sr" /></div> </form> <div class="page_nav"> <a href="http://git.doucette.cc/git.git">summary</a> | <a href="http://git.doucette.cc/git.git/shortlog">shortlog</a> | <a href="http://git.doucette.cc/git.git/log">log</a> | <a href="http://git.doucette.cc/git.git/commit/b4955fb611ce407ef0e522862c60ae0472dbfe5e">commit</a> | <a href="http://git.doucette.cc/git.git/commitdiff/b4955fb611ce407ef0e522862c60ae0472dbfe5e">commitdiff</a> | <a href="http://git.doucette.cc/git.git/tree/b4955fb611ce407ef0e522862c60ae0472dbfe5e">tree</a><br/> <a href="http://git.doucette.cc/git.git/blobdiff_plain/1df27132493171294d0d2b53bd75bb8e131eea2b..b4955fb611ce407ef0e522862c60ae0472dbfe5e:/git-gui/po/git-gui.pot">raw</a><br/> </div> <div class="header"> <a class="title" href="http://git.doucette.cc/git.git/commit/b4955fb611ce407ef0e522862c60ae0472dbfe5e">Merge git://repo.or.cz/git-gui</a> </div> <div class="page_path"><a title="tree root" href="http://git.doucette.cc/git.git/tree/b4955fb611ce407ef0e522862c60ae0472dbfe5e">[git.git]</a> / <a title="git-gui" href="http://git.doucette.cc/git.git/tree/b4955fb611ce407ef0e522862c60ae0472dbfe5e:/git-gui">git-gui</a> / <a title="git-gui/po" href="http://git.doucette.cc/git.git/tree/b4955fb611ce407ef0e522862c60ae0472dbfe5e:/git-gui/po">po</a> / <a title="git-gui/po/git-gui.pot" href="http://git.doucette.cc/git.git/blob_plain/b4955fb611ce407ef0e522862c60ae0472dbfe5e:/git-gui/po/git-gui.pot">git-gui.pot</a><br/></div> <div class="page_body"> <div class="patchset"> <div class="patch" id="patch1"> <div class="diff header">diff --git <a class="path" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot">a/git-gui/po/git-gui.pot</a> <a class="path" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot">b/git-gui/po/git-gui.pot</a></div> <div class="diff extended_header"> index <a class="hash" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot">58db67c</a>..<a class="hash" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot">15aea0d</a> 100644<span class="info"> (file)</span><br/> </div> <div class="diff from_file">--- a/<a class="path" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot">git-gui/po/git-gui.pot</a></div> <div class="diff to_file">+++ b/<a class="path" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot">git-gui/po/git-gui.pot</a></div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l8">-8,7</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l8">+8,7</a> @@</span><span class="section"> msgid ""</span></div> <div class="diff"> msgstr ""</div> <div class="diff"> "Project-Id-Version: PACKAGE VERSION\n"</div> <div class="diff"> "Report-Msgid-Bugs-To: \n"</div> <div class="diff rem">-"POT-Creation-Date: 2008-11-16 13:56-0800\n"</div> <div class="diff add">+"POT-Creation-Date: 2008-12-08 08:31-0800\n"</div> <div class="diff"> "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"</div> <div class="diff"> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"</div> <div class="diff"> "Language-Team: LANGUAGE <LL@li.org>\n"</div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l234">-234,25</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l234">+234,25</a> @@</span><span class="section"> msgstr ""</span></div> <div class="diff"> msgid "Redo"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2378 git-gui.sh:2923</div> <div class="diff add">+#: git-gui.sh:2378 git-gui.sh:2937</div> <div class="diff"> msgid "Cut"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082</div> <div class="diff add">+#: git-gui.sh:2381 git-gui.sh:2940 git-gui.sh:3014 git-gui.sh:3096</div> <div class="diff"> #: lib/console.tcl:69</div> <div class="diff"> msgid "Copy"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2384 git-gui.sh:2929</div> <div class="diff add">+#: git-gui.sh:2384 git-gui.sh:2943</div> <div class="diff"> msgid "Paste"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26</div> <div class="diff add">+#: git-gui.sh:2387 git-gui.sh:2946 lib/branch_delete.tcl:26</div> <div class="diff"> #: lib/remote_branch_delete.tcl:38</div> <div class="diff"> msgid "Delete"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71</div> <div class="diff add">+#: git-gui.sh:2391 git-gui.sh:2950 git-gui.sh:3100 lib/console.tcl:71</div> <div class="diff"> msgid "Select All"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l284">-284,15</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l284">+284,15</a> @@</span><span class="section"> msgstr ""</span></div> <div class="diff"> msgid "Commit@@verb"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2443 git-gui.sh:2864</div> <div class="diff add">+#: git-gui.sh:2443 git-gui.sh:2878</div> <div class="diff"> msgid "New Commit"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2451 git-gui.sh:2871</div> <div class="diff add">+#: git-gui.sh:2451 git-gui.sh:2885</div> <div class="diff"> msgid "Amend Last Commit"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99</div> <div class="diff add">+#: git-gui.sh:2461 git-gui.sh:2839 lib/remote_branch_delete.tcl:99</div> <div class="diff"> msgid "Rescan"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l312">-312,15</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l312">+312,15</a> @@</span><span class="section"> msgstr ""</span></div> <div class="diff"> msgid "Revert Changes"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2491 git-gui.sh:3069</div> <div class="diff add">+#: git-gui.sh:2491 git-gui.sh:3083</div> <div class="diff"> msgid "Show Less Context"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2495 git-gui.sh:3073</div> <div class="diff add">+#: git-gui.sh:2495 git-gui.sh:3087</div> <div class="diff"> msgid "Show More Context"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947</div> <div class="diff add">+#: git-gui.sh:2502 git-gui.sh:2852 git-gui.sh:2961</div> <div class="diff"> msgid "Sign Off"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l354">-354,7</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l354">+354,7</a> @@</span><span class="section"> msgstr ""</span></div> <div class="diff"> msgid "Preferences..."</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2565 git-gui.sh:3115</div> <div class="diff add">+#: git-gui.sh:2565 git-gui.sh:3129</div> <div class="diff"> msgid "Options..."</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l374">-374,124</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l374">+374,124</a> @@</span><span class="section"> msgstr ""</span></div> <div class="diff"> msgid "Show SSH Key"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2707</div> <div class="diff add">+#: git-gui.sh:2721</div> <div class="diff"> #, tcl-format</div> <div class="diff"> msgid "fatal: cannot stat path %s: No such file or directory"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2740</div> <div class="diff add">+#: git-gui.sh:2754</div> <div class="diff"> msgid "Current Branch:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2761</div> <div class="diff add">+#: git-gui.sh:2775</div> <div class="diff"> msgid "Staged Changes (Will Commit)"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2781</div> <div class="diff add">+#: git-gui.sh:2795</div> <div class="diff"> msgid "Unstaged Changes"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2831</div> <div class="diff add">+#: git-gui.sh:2845</div> <div class="diff"> msgid "Stage Changed"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182</div> <div class="diff add">+#: git-gui.sh:2864 lib/transport.tcl:104 lib/transport.tcl:193</div> <div class="diff"> msgid "Push"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2885</div> <div class="diff add">+#: git-gui.sh:2899</div> <div class="diff"> msgid "Initial Commit Message:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2886</div> <div class="diff add">+#: git-gui.sh:2900</div> <div class="diff"> msgid "Amended Commit Message:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2887</div> <div class="diff add">+#: git-gui.sh:2901</div> <div class="diff"> msgid "Amended Initial Commit Message:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2888</div> <div class="diff add">+#: git-gui.sh:2902</div> <div class="diff"> msgid "Amended Merge Commit Message:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2889</div> <div class="diff add">+#: git-gui.sh:2903</div> <div class="diff"> msgid "Merge Commit Message:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2890</div> <div class="diff add">+#: git-gui.sh:2904</div> <div class="diff"> msgid "Commit Message:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73</div> <div class="diff add">+#: git-gui.sh:2953 git-gui.sh:3104 lib/console.tcl:73</div> <div class="diff"> msgid "Copy All"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:2963 lib/blame.tcl:104</div> <div class="diff add">+#: git-gui.sh:2977 lib/blame.tcl:104</div> <div class="diff"> msgid "File:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3078</div> <div class="diff add">+#: git-gui.sh:3092</div> <div class="diff"> msgid "Refresh"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3099</div> <div class="diff add">+#: git-gui.sh:3113</div> <div class="diff"> msgid "Decrease Font Size"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3103</div> <div class="diff add">+#: git-gui.sh:3117</div> <div class="diff"> msgid "Increase Font Size"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3111 lib/blame.tcl:281</div> <div class="diff add">+#: git-gui.sh:3125 lib/blame.tcl:281</div> <div class="diff"> msgid "Encoding"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3122</div> <div class="diff add">+#: git-gui.sh:3136</div> <div class="diff"> msgid "Apply/Reverse Hunk"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3127</div> <div class="diff add">+#: git-gui.sh:3141</div> <div class="diff"> msgid "Apply/Reverse Line"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3137</div> <div class="diff add">+#: git-gui.sh:3151</div> <div class="diff"> msgid "Run Merge Tool"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3142</div> <div class="diff add">+#: git-gui.sh:3156</div> <div class="diff"> msgid "Use Remote Version"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3146</div> <div class="diff add">+#: git-gui.sh:3160</div> <div class="diff"> msgid "Use Local Version"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3150</div> <div class="diff add">+#: git-gui.sh:3164</div> <div class="diff"> msgid "Revert To Base"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3169</div> <div class="diff add">+#: git-gui.sh:3183</div> <div class="diff"> msgid "Unstage Hunk From Commit"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3170</div> <div class="diff add">+#: git-gui.sh:3184</div> <div class="diff"> msgid "Unstage Line From Commit"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3172</div> <div class="diff add">+#: git-gui.sh:3186</div> <div class="diff"> msgid "Stage Hunk For Commit"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3173</div> <div class="diff add">+#: git-gui.sh:3187</div> <div class="diff"> msgid "Stage Line For Commit"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3196</div> <div class="diff add">+#: git-gui.sh:3210</div> <div class="diff"> msgid "Initializing..."</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3301</div> <div class="diff add">+#: git-gui.sh:3315</div> <div class="diff"> #, tcl-format</div> <div class="diff"> msgid ""</div> <div class="diff"> "Possible environment issues exist.\n"</div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l502">-502,14</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l502">+502,14</a> @@</span><span class="section"> msgid ""</span></div> <div class="diff"> "\n"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3331</div> <div class="diff add">+#: git-gui.sh:3345</div> <div class="diff"> msgid ""</div> <div class="diff"> "\n"</div> <div class="diff"> "This is due to a known issue with the\n"</div> <div class="diff"> "Tcl binary distributed by Cygwin."</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: git-gui.sh:3336</div> <div class="diff add">+#: git-gui.sh:3350</div> <div class="diff"> #, tcl-format</div> <div class="diff"> msgid ""</div> <div class="diff"> "\n"</div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l589">-589,43</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l589">+589,43</a> @@</span><span class="section"> msgstr ""</span></div> <div class="diff"> msgid "Loading annotation..."</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/blame.tcl:964</div> <div class="diff add">+#: lib/blame.tcl:963</div> <div class="diff"> msgid "Author:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/blame.tcl:968</div> <div class="diff add">+#: lib/blame.tcl:967</div> <div class="diff"> msgid "Committer:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/blame.tcl:973</div> <div class="diff add">+#: lib/blame.tcl:972</div> <div class="diff"> msgid "Original File:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/blame.tcl:1021</div> <div class="diff add">+#: lib/blame.tcl:1020</div> <div class="diff"> msgid "Cannot find HEAD commit:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/blame.tcl:1076</div> <div class="diff add">+#: lib/blame.tcl:1075</div> <div class="diff"> msgid "Cannot find parent commit:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/blame.tcl:1091</div> <div class="diff add">+#: lib/blame.tcl:1090</div> <div class="diff"> msgid "Unable to display parent"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/blame.tcl:1092 lib/diff.tcl:297</div> <div class="diff add">+#: lib/blame.tcl:1091 lib/diff.tcl:297</div> <div class="diff"> msgid "Error loading diff:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/blame.tcl:1232</div> <div class="diff add">+#: lib/blame.tcl:1231</div> <div class="diff"> msgid "Originally By:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/blame.tcl:1238</div> <div class="diff add">+#: lib/blame.tcl:1237</div> <div class="diff"> msgid "In File:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/blame.tcl:1243</div> <div class="diff add">+#: lib/blame.tcl:1242</div> <div class="diff"> msgid "Copied Or Moved Here By:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l642">-642,7</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l642">+642,7</a> @@</span><span class="section"> msgstr ""</span></div> <div class="diff"> #: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172</div> <div class="diff"> #: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42</div> <div class="diff"> #: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352</div> <div class="diff rem">-#: lib/transport.tcl:97</div> <div class="diff add">+#: lib/transport.tcl:108</div> <div class="diff"> msgid "Cancel"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l1254">-1254,19</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l1254">+1254,19</a> @@</span><span class="section"> msgid ""</span></div> <div class="diff"> "current merge activity.\n"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:49</div> <div class="diff add">+#: lib/commit.tcl:48</div> <div class="diff"> msgid "Error loading commit data for amend:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:76</div> <div class="diff add">+#: lib/commit.tcl:75</div> <div class="diff"> msgid "Unable to obtain your identity:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:81</div> <div class="diff add">+#: lib/commit.tcl:80</div> <div class="diff"> msgid "Invalid GIT_COMMITTER_IDENT:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:133</div> <div class="diff add">+#: lib/commit.tcl:132</div> <div class="diff"> msgid ""</div> <div class="diff"> "Last scanned state does not match repository state.\n"</div> <div class="diff"> "\n"</div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l1276">-1276,7</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l1276">+1276,7</a> @@</span><span class="section"> msgid ""</span></div> <div class="diff"> "The rescan will be automatically started now.\n"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:156</div> <div class="diff add">+#: lib/commit.tcl:155</div> <div class="diff"> #, tcl-format</div> <div class="diff"> msgid ""</div> <div class="diff"> "Unmerged files cannot be committed.\n"</div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l1285">-1285,7</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l1285">+1285,7</a> @@</span><span class="section"> msgid ""</span></div> <div class="diff"> "before committing.\n"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:164</div> <div class="diff add">+#: lib/commit.tcl:163</div> <div class="diff"> #, tcl-format</div> <div class="diff"> msgid ""</div> <div class="diff"> "Unknown file state %s detected.\n"</div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l1293">-1293,14</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l1293">+1293,14</a> @@</span><span class="section"> msgid ""</span></div> <div class="diff"> "File %s cannot be committed by this program.\n"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:172</div> <div class="diff add">+#: lib/commit.tcl:171</div> <div class="diff"> msgid ""</div> <div class="diff"> "No changes to commit.\n"</div> <div class="diff"> "\n"</div> <div class="diff"> "You must stage at least 1 file before you can commit.\n"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:187</div> <div class="diff add">+#: lib/commit.tcl:186</div> <div class="diff"> msgid ""</div> <div class="diff"> "Please supply a commit message.\n"</div> <div class="diff"> "\n"</div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l1311">-1311,45</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l1311">+1311,45</a> @@</span><span class="section"> msgid ""</span></div> <div class="diff"> "- Remaining lines: Describe why this change is good.\n"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:211</div> <div class="diff add">+#: lib/commit.tcl:210</div> <div class="diff"> #, tcl-format</div> <div class="diff"> msgid "warning: Tcl does not support encoding '%s'."</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:227</div> <div class="diff add">+#: lib/commit.tcl:226</div> <div class="diff"> msgid "Calling pre-commit hook..."</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:242</div> <div class="diff add">+#: lib/commit.tcl:241</div> <div class="diff"> msgid "Commit declined by pre-commit hook."</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:265</div> <div class="diff add">+#: lib/commit.tcl:264</div> <div class="diff"> msgid "Calling commit-msg hook..."</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:280</div> <div class="diff add">+#: lib/commit.tcl:279</div> <div class="diff"> msgid "Commit declined by commit-msg hook."</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:293</div> <div class="diff add">+#: lib/commit.tcl:292</div> <div class="diff"> msgid "Committing changes..."</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:309</div> <div class="diff add">+#: lib/commit.tcl:308</div> <div class="diff"> msgid "write-tree failed:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374</div> <div class="diff add">+#: lib/commit.tcl:309 lib/commit.tcl:353 lib/commit.tcl:373</div> <div class="diff"> msgid "Commit failed."</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:327</div> <div class="diff add">+#: lib/commit.tcl:326</div> <div class="diff"> #, tcl-format</div> <div class="diff"> msgid "Commit %s appears to be corrupt"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:332</div> <div class="diff add">+#: lib/commit.tcl:331</div> <div class="diff"> msgid ""</div> <div class="diff"> "No changes to commit.\n"</div> <div class="diff"> "\n"</div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l1358">-1358,19</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l1358">+1358,19</a> @@</span><span class="section"> msgid ""</span></div> <div class="diff"> "A rescan will be automatically started now.\n"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:339</div> <div class="diff add">+#: lib/commit.tcl:338</div> <div class="diff"> msgid "No changes to commit."</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:353</div> <div class="diff add">+#: lib/commit.tcl:352</div> <div class="diff"> msgid "commit-tree failed:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:373</div> <div class="diff add">+#: lib/commit.tcl:372</div> <div class="diff"> msgid "update-ref failed:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/commit.tcl:461</div> <div class="diff add">+#: lib/commit.tcl:460</div> <div class="diff"> #, tcl-format</div> <div class="diff"> msgid "Created commit %s: %s"</div> <div class="diff"> msgstr ""</div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l1999">-1999,7</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l1999">+1999,8</a> @@</span><span class="section"> msgstr ""</span></div> <div class="diff"> msgid "Do not know how to initialize repository at location '%s'."</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71</div> <div class="diff add">+#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63</div> <div class="diff add">+#: lib/transport.tcl:81</div> <div class="diff"> #, tcl-format</div> <div class="diff"> msgid "push %s"</div> <div class="diff"> msgstr ""</div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l2017">-2017,11</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l2018">+2018,11</a> @@</span><span class="section"> msgstr ""</span></div> <div class="diff"> msgid "From Repository"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123</div> <div class="diff add">+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134</div> <div class="diff"> msgid "Remote:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138</div> <div class="diff add">+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149</div> <div class="diff"> msgid "Arbitrary Location:"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff chunk_header"><span class="chunk_info">@@ <a class="list" href="http://git.doucette.cc/git.git/blob/58db67c217e00ee1571d0a182969ce162fad4216:/git-gui/po/git-gui.pot#l2336">-2336,35</a> <a class="list" href="http://git.doucette.cc/git.git/blob/15aea0dc64fd9711bf7246d347ceaafc773d874b:/git-gui/po/git-gui.pot#l2337">+2337,40</a> @@</span><span class="section"> msgstr ""</span></div> <div class="diff"> msgid "Pushing changes to %s"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/transport.tcl:72</div> <div class="diff add">+#: lib/transport.tcl:64</div> <div class="diff add">+#, tcl-format</div> <div class="diff add">+msgid "Mirroring to %s"</div> <div class="diff add">+msgstr ""</div> <div class="diff add">+</div> <div class="diff add">+#: lib/transport.tcl:82</div> <div class="diff"> #, tcl-format</div> <div class="diff"> msgid "Pushing %s %s to %s"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/transport.tcl:89</div> <div class="diff add">+#: lib/transport.tcl:100</div> <div class="diff"> msgid "Push Branches"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/transport.tcl:103</div> <div class="diff add">+#: lib/transport.tcl:114</div> <div class="diff"> msgid "Source Branches"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/transport.tcl:120</div> <div class="diff add">+#: lib/transport.tcl:131</div> <div class="diff"> msgid "Destination Repository"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/transport.tcl:158</div> <div class="diff add">+#: lib/transport.tcl:169</div> <div class="diff"> msgid "Transfer Options"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/transport.tcl:160</div> <div class="diff add">+#: lib/transport.tcl:171</div> <div class="diff"> msgid "Force overwrite existing branch (may discard changes)"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/transport.tcl:164</div> <div class="diff add">+#: lib/transport.tcl:175</div> <div class="diff"> msgid "Use thin pack (for slow network connections)"</div> <div class="diff"> msgstr ""</div> <div class="diff"> </div> <div class="diff rem">-#: lib/transport.tcl:168</div> <div class="diff add">+#: lib/transport.tcl:179</div> <div class="diff"> msgid "Include tags"</div> <div class="diff"> msgstr ""</div> </div> </div> </div> <div class="page_footer"> <div class="page_footer_text">Git</div> <a class="rss_logo" title="history of git-gui/po/git-gui.pot RSS feed" href="http://git.doucette.cc/git.git/rss?f=git-gui/po/git-gui.pot">RSS</a> <a class="rss_logo" title="history of git-gui/po/git-gui.pot Atom feed" href="http://git.doucette.cc/git.git/atom?f=git-gui/po/git-gui.pot">Atom</a> </div> </body> </html>
