--- a/i18n/eric5_en.ts Fri Mar 07 19:15:46 2014 +0100 +++ b/i18n/eric5_en.ts Fri Mar 07 19:20:36 2014 +0100 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="en" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.0" language="en"> <context> <name>AboutDialog</name> <message> @@ -1901,7 +1902,7 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open in New &Tab Ctrl+LMB</source> <translation type="unfinished"></translation> </message> <message> @@ -2128,7 +2129,7 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open in New &Tab Ctrl+LMB</source> <translation type="unfinished"></translation> </message> <message> @@ -14771,7 +14772,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="648"/> + <location filename="../UI/FindFileDialog.py" line="658"/> <source>Replace in Files</source> <translation type="unfinished"></translation> </message> @@ -14786,32 +14787,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="537"/> + <location filename="../UI/FindFileDialog.py" line="547"/> <source>Select directory</source> <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="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> <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> @@ -14820,6 +14821,28 @@ <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> + <numerusform>%n occurrence</numerusform> + <numerusform>%n occurrences</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n file(s)</source> + <translation> + <numerusform>%n file</numerusform> + <numerusform>%n files</numerusform> + </translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -15570,7 +15593,7 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1083"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open Link in New Tab Ctrl+LMB</source> <translation type="unfinished"></translation> </message> <message> @@ -24626,7 +24649,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> @@ -24727,82 +24750,82 @@ <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="151"/> + <source>missing</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="146"/> - <source>not tracked</source> + <source>normal</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> - <source>missing</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="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="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> <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> @@ -24887,17 +24910,17 @@ <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> <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> @@ -24912,7 +24935,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> @@ -24927,12 +24950,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> @@ -24942,12 +24965,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>