--- a/i18n/eric5_zh_CN.GB2312.ts Fri Mar 07 19:15:46 2014 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Fri Mar 07 19:20:36 2014 +0100 @@ -16178,12 +16178,12 @@ <translation>查找</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="648"/> + <location filename="../UI/FindFileDialog.py" line="658"/> <source>Replace in Files</source> <translation>在文件中替换</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="537"/> + <location filename="../UI/FindFileDialog.py" line="547"/> <source>Select directory</source> <translation>选择文件夹</translation> </message> @@ -16208,12 +16208,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="675"/> + <location filename="../UI/FindFileDialog.py" line="685"/> <source>Open</source> <translation type="unfinished">打开</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="676"/> + <location filename="../UI/FindFileDialog.py" line="686"/> <source>Copy Path to Clipboard</source> <translation type="unfinished"></translation> </message> @@ -16228,17 +16228,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="607"/> + <location filename="../UI/FindFileDialog.py" line="617"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="648"/> + <location filename="../UI/FindFileDialog.py" line="658"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="622"/> + <location filename="../UI/FindFileDialog.py" line="632"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation type="unfinished"></translation> </message> @@ -16247,6 +16247,26 @@ <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/FindFileDialog.py" line="491"/> + <source>{0} / {1}</source> + <comment>occurrences / files</comment> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n occurrence(s)</source> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n file(s)</source> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -26657,7 +26677,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="244"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -26753,72 +26773,72 @@ <translation type="unfinished">调整列宽</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> <source>added</source> <translation type="unfinished">已添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="148"/> <source>modified</source> <translation type="unfinished">已修改</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="149"/> <source>removed</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="146"/> - <source>not tracked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="142"/> <source>normal</source> <translation type="unfinished">标准</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> - <source>ignored</source> - <translation type="unfinished">已忽略</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <source>ignored</source> + <translation type="unfinished">已忽略</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>missing</source> <translation type="unfinished">遗漏</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="300"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="300"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="628"/> <source>Commit</source> <translation type="unfinished">提交</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="794"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">没有未提交的更改可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="692"/> <source>Add</source> <translation type="unfinished">添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="692"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">没有未版本化的条目可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="744"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>Revert</source> <translation type="unfinished">还原</translation> </message> @@ -26828,12 +26848,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="715"/> <source>Remove</source> <translation type="unfinished">移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="744"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -26918,7 +26938,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="515"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -26928,12 +26948,12 @@ <translation type="obsolete">差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="774"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="628"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -26948,7 +26968,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="241"/> <source>Mercurial Queue Repository Status</source> <translation type="unfinished"></translation> </message> @@ -26963,12 +26983,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> @@ -26978,12 +26998,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="121"/> <source>Add as Large File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="124"/> <source>Add as Normal File</source> <translation type="unfinished"></translation> </message>