--- a/i18n/eric5_ru.ts Tue Apr 20 19:15:21 2010 +0000 +++ b/i18n/eric5_ru.ts Tue Apr 20 19:50:37 2010 +0000 @@ -13795,127 +13795,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="534"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="592"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="771"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Select number of entries to show.</source> <translation type="unfinished">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1289"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1423"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> <source>Reverting changes</source> <translation type="unfinished">Отменяю изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1513"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1537"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1522"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> @@ -15714,10 +15714,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16218,12 +16233,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="216"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="221"/> <source>yes</source> <translation type="unfinished">да</translation> </message> @@ -42237,17 +42252,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1376"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -42255,36 +42270,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1370"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1372"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1009"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1036"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>