Mercurial Repositories > eric / changeset
changeset
Modified the find in files dialog to show some statistics when done.
Fri, 07 Mar 2014 19:20:36 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 07 Mar 2014 19:20:36 +0100
- changeset 3343
- f7a6d271bb40
- parent 3342
- f8cd11fa94ed
- child 3345
- 071afe8be2a1
Modified the find in files dialog to show some statistics when done.
| UI/FindFileDialog.py | file | annotate | diff | comparison | revisions | |
| i18n/eric5_cs.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_de.qm | file | annotate | diff | comparison | revisions | |
| i18n/eric5_de.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_en.qm | file | annotate | diff | comparison | revisions | |
| i18n/eric5_en.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_es.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_fr.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_it.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_ru.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_tr.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_zh_CN.GB2312.ts | file | annotate | diff | comparison | revisions |
--- a/UI/FindFileDialog.py Fri Mar 07 19:15:46 2014 +0100 +++ b/UI/FindFileDialog.py Fri Mar 07 19:20:36 2014 +0100 @@ -418,8 +418,11 @@ self.findList.setUpdatesEnabled(False) progress = 0 breakSearch = False + occurrences = 0 + fileOccurrences = 0 for file in files: self.__lastFileItem = None + found = False if self.__cancelSearch or breakSearch: break @@ -447,6 +450,8 @@ count += 1 contains = search.search(line) if contains: + occurrences += 1 + found = True start = contains.start() end = contains.end() if self.__replaceMode: @@ -473,6 +478,8 @@ QApplication.processEvents() + if found: + fileOccurrences += 1 progress += 1 self.findProgress.setValue(progress) @@ -480,7 +487,10 @@ self.findProgress.setMaximum(1) self.findProgress.setValue(1) - self.findProgressLabel.setPath("") + resultFormat = self.tr("{0} / {1}", "occurrences / files") + self.findProgressLabel.setPath(resultFormat.format( + self.tr("%n occurrence(s)", "", occurrences), + self.tr("%n file(s)", "", fileOccurrences))) self.findList.setUpdatesEnabled(True) self.findList.sortItems(self.findList.sortColumn(),
--- a/i18n/eric5_cs.ts Fri Mar 07 19:15:46 2014 +0100 +++ b/i18n/eric5_cs.ts Fri Mar 07 19:20:36 2014 +0100 @@ -15406,7 +15406,7 @@ <translation>Hledat</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="537"/> + <location filename="../UI/FindFileDialog.py" line="547"/> <source>Select directory</source> <translation>Výběr adresáře</translation> </message> @@ -15466,7 +15466,7 @@ <translation>Nahradit</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="648"/> + <location filename="../UI/FindFileDialog.py" line="658"/> <source>Replace in Files</source> <translation>Nahradit v souborech</translation> </message> @@ -15491,12 +15491,12 @@ <translation>Pocit jako</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="675"/> + <location filename="../UI/FindFileDialog.py" line="685"/> <source>Open</source> <translation>Otevřít</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="676"/> + <location filename="../UI/FindFileDialog.py" line="686"/> <source>Copy Path to Clipboard</source> <translation>Kopírovat cestu do schránky</translation> </message> @@ -15511,17 +15511,17 @@ <translation><p>Výraz hledná není platný. </p><p>Chyba: {0}</p></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><p>Nelze číst ze souboru <b>{0}</b>. Přeskočeno.</p><p>Důvod: {1}</p></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><p>Nelze uložit do souboru <b>{0}</b>. Přeskočeno.</p><p>Důvod: {1}</p></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> @@ -15530,6 +15530,30 @@ <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> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n file(s)</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -25844,7 +25868,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>Mercurial status</translation> </message> @@ -25940,72 +25964,72 @@ <translation>Přizpůsobit šířky sloupců</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>přidáno</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>změněno</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>odebráno</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> + <source>not tracked</source> + <translation>nesledováno</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="146"/> - <source>not tracked</source> - <translation>nesledováno</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="142"/> <source>normal</source> <translation>normální</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> - <source>ignored</source> - <translation>ignorováno</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <source>ignored</source> + <translation>ignorováno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>missing</source> <translation>chybějící</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>Chyba v procesu generování</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>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</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>Zapsat měny</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>Nezapsné změny nejsou dostupné/vybrané.</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>Přidat</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>Položky mimo verzi nejsou dostupné/vybrány.</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>Vrátit</translation> </message> @@ -26015,12 +26039,12 @@ <translation>Odebrat z repozitáře</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>Odebrat</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>Chybějící záznamy nejsou dostupné/vybrány.</translation> </message> @@ -26105,7 +26129,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> @@ -26115,12 +26139,12 @@ <translation type="obsolete">Odlišnosti</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> @@ -26135,7 +26159,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> @@ -26150,12 +26174,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> @@ -26165,12 +26189,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>
--- a/i18n/eric5_de.ts Fri Mar 07 19:15:46 2014 +0100 +++ b/i18n/eric5_de.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="de" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.0" language="de"> <context> <name>AboutDialog</name> <message> @@ -1938,8 +1939,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> </context> <context> @@ -2175,8 +2176,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> </context> <context> @@ -14662,7 +14663,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="../UI/FindFileDialog.py" line="537"/> + <location filename="../UI/FindFileDialog.py" line="547"/> <source>Select directory</source> <translation>Wähle ein Verzeichnis</translation> </message> @@ -14852,17 +14853,17 @@ <translation>Ersetzen</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="648"/> + <location filename="../UI/FindFileDialog.py" line="658"/> <source>Replace in Files</source> <translation>Ersetzen in Dateien</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><p>Die Datei <b>{0}</b> konnte nicht gelesen werden. Überspringe sie.</p><p>Ursache: {1}</p></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><p>Die Datei <b>{0}</b> konnte nicht gespeichert werden. Überspringe sie.</p><p>Ursache: {1}</p></translation> </message> @@ -14887,12 +14888,12 @@ <translation>Ersttreffer öffnen</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="675"/> + <location filename="../UI/FindFileDialog.py" line="685"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="676"/> + <location filename="../UI/FindFileDialog.py" line="686"/> <source>Copy Path to Clipboard</source> <translation>Pfad in die Zwischenablage kopieren</translation> </message> @@ -14907,7 +14908,7 @@ <translation><p>Der Suchausdruck ist nicht gültig.</p><p>Fehler: {0}</p></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><p>Der aktuelle und der originale Hash-Wert der Datei <b>{0}</b> sind unterschiedlich. Überspringe sie.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></translation> </message> @@ -14916,6 +14917,28 @@ <source>%v/%m Files</source> <translation>%v/%m Dateien</translation> </message> + <message> + <location filename="../UI/FindFileDialog.py" line="491"/> + <source>{0} / {1}</source> + <comment>occurrences / files</comment> + <translation>{0} / {1}</translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n occurrence(s)</source> + <translation> + <numerusform>%n Vorkommen</numerusform> + <numerusform>%n Vorkommen</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n file(s)</source> + <translation> + <numerusform>%n Datei</numerusform> + <numerusform>%n Dateien</numerusform> + </translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -15940,8 +15963,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1083"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open Link in New Tab Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1156"/> @@ -24773,7 +24796,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>Mercurial-Status</translation> </message> @@ -24870,72 +24893,72 @@ <translation>Spaltengrößen anpassen</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>hinzugefügt</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>modifiziert</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>gelöscht</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> + <source>not tracked</source> + <translation>nicht versioniert</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="146"/> - <source>not tracked</source> - <translation>nicht versioniert</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="142"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> - <source>ignored</source> - <translation>ignoriert</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <source>ignored</source> + <translation>ignoriert</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>missing</source> <translation>fehlt</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>Fehler beim Prozessstart</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>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</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>Einpflegen</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>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</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>Hinzufügen</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>Es sind keine unversionierten Einträge vorhanden/ausgewählt.</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>Rückgängig machen</translation> </message> @@ -24945,12 +24968,12 @@ <translation>Vom Repository löschen</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>Entfernen</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>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> </message> @@ -25035,17 +25058,17 @@ <translation>Fehlende wiederherstellen</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>alle</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>Unterschiede</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>Es sind keine Einträge zum Einpflegen ausgewählt.</translation> </message> @@ -25060,7 +25083,7 @@ <translation>Alle vom Einpflegen abwählen</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>Mercurial Status des Queue-Repositories</translation> </message> @@ -25075,12 +25098,12 @@ <translation>Unterschiede &nebeneinander</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>Unterschiede nebeneinander</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>Es darf nur eine Datei ausgewählt werden.</translation> </message> @@ -25090,12 +25113,12 @@ <translation>Unterschiede nebeneinander anzeigen</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>Als Binärriese hinzufügen</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>Als Normale Datei hinzufügen</translation> </message>
--- 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>
--- a/i18n/eric5_es.ts Fri Mar 07 19:15:46 2014 +0100 +++ b/i18n/eric5_es.ts Fri Mar 07 19:20:36 2014 +0100 @@ -14792,7 +14792,7 @@ <translation>Buscar</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="537"/> + <location filename="../UI/FindFileDialog.py" line="547"/> <source>Select directory</source> <translation>Seleccionar un directorio</translation> </message> @@ -14862,7 +14862,7 @@ <translation>Reemplazar</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="648"/> + <location filename="../UI/FindFileDialog.py" line="658"/> <source>Replace in Files</source> <translation>Reemplazar en Archivos</translation> </message> @@ -14877,12 +14877,12 @@ <translation>Abrir primera ocurrencia</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="675"/> + <location filename="../UI/FindFileDialog.py" line="685"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="676"/> + <location filename="../UI/FindFileDialog.py" line="686"/> <source>Copy Path to Clipboard</source> <translation>Copiar Ruta al Portapapeles</translation> </message> @@ -14897,17 +14897,17 @@ <translation><p>La expresión de búsqueda no es válida.</p><p>Error:{0}</p></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><p>No se pudo leer el archivo <b>{0}</b>. Omitiéndolo.</p><p>Razón: {1}</p></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><p>No se pudo guardar el archivo <b>{0}</b>. Omitiéndolo.</p><p>Razón: {1}</p></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><p>Los hash actual y original del archivos <b>{0}</b> son distintos. Abandonando.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></translation> </message> @@ -14916,6 +14916,28 @@ <source>%v/%m Files</source> <translation>%v/%m Archivos</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> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n file(s)</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -24805,7 +24827,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>Mercurial Status</translation> </message> @@ -24902,72 +24924,72 @@ <translation>Adjustar tamaño de columnas</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>añadido</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>modificado</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>eliminado</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> + <source>not tracked</source> + <translation>sin seguimiento</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="146"/> - <source>not tracked</source> - <translation>sin seguimiento</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="142"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> - <source>ignored</source> - <translation>ignorado</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <source>ignored</source> + <translation>ignorado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>missing</source> <translation>perdido</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>Error de Generación de Proceso</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>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</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>Commit</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>No hay cambios pendientes de commit disponibles/seleccionados.</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>Añadir</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>No hay entradas sin versionar disponibles/seleccionadas.</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>Revertir</translation> </message> @@ -24977,12 +24999,12 @@ <translation>Eliminar de repositorio</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>Eliminar</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>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> @@ -25067,17 +25089,17 @@ <translation>Restore sobre elementos perdidos</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>todo</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>Diferencias</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>No hay entradas seleccionadas sobre las que aplicar commit.</translation> </message> @@ -25092,7 +25114,7 @@ <translation>Deshacer selección de todo en el commit</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>Estado de Cola del Repositorio Mercurial</translation> </message> @@ -25107,12 +25129,12 @@ <translation>&Lado a Lado Diff</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>Lado a Lado Diff</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>Se debe seleccionar solamente un archivo con cambios sin commit.</translation> </message> @@ -25122,12 +25144,12 @@ <translation>Mostrar diferencias lado a lado</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>
--- a/i18n/eric5_fr.ts Fri Mar 07 19:15:46 2014 +0100 +++ b/i18n/eric5_fr.ts Fri Mar 07 19:20:36 2014 +0100 @@ -16074,7 +16074,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="../UI/FindFileDialog.py" line="537"/> + <location filename="../UI/FindFileDialog.py" line="547"/> <source>Select directory</source> <translation>Sélection répertoire</translation> </message> @@ -16279,7 +16279,7 @@ <translation>Remplacer</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="648"/> + <location filename="../UI/FindFileDialog.py" line="658"/> <source>Replace in Files</source> <translation>Remplacer dans les fichiers</translation> </message> @@ -16304,12 +16304,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">Ouvrir</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">Copier chemin dans le Presse-Papiers</translation> </message> @@ -16324,17 +16324,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> @@ -16343,6 +16343,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 type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n file(s)</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -26738,7 +26760,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> @@ -26834,72 +26856,72 @@ <translation type="unfinished">Ajuster la largeur des colonnes</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">ajouté</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">modifié</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">normal</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> - <source>ignored</source> - <translation type="unfinished">ignoré</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <source>ignored</source> + <translation type="unfinished">ignoré</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>missing</source> <translation type="unfinished">manquant</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">Erreur du processus</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">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</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">Commit</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">Il n'y a pas de modification non commitée disponible/sélectionnée.</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">Ajouter</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">Aucune entrée "non-versionnée" disponible/sélectionnée.</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">Recouvrir</translation> </message> @@ -26909,12 +26931,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">Supprimer</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> @@ -26999,7 +27021,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> @@ -27009,12 +27031,12 @@ <translation type="obsolete">Différence</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> @@ -27029,7 +27051,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> @@ -27044,12 +27066,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> @@ -27059,12 +27081,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>
--- a/i18n/eric5_it.ts Fri Mar 07 19:15:46 2014 +0100 +++ b/i18n/eric5_it.ts Fri Mar 07 19:20:36 2014 +0100 @@ -15218,7 +15218,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="../UI/FindFileDialog.py" line="537"/> + <location filename="../UI/FindFileDialog.py" line="547"/> <source>Select directory</source> <translation>Seleziona una directory</translation> </message> @@ -15423,7 +15423,7 @@ <translation>Sostituisci</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="648"/> + <location filename="../UI/FindFileDialog.py" line="658"/> <source>Replace in Files</source> <translation>Sostituisci nei file</translation> </message> @@ -15438,12 +15438,12 @@ <translation>Feeling Like</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="675"/> + <location filename="../UI/FindFileDialog.py" line="685"/> <source>Open</source> <translation>Apri</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="676"/> + <location filename="../UI/FindFileDialog.py" line="686"/> <source>Copy Path to Clipboard</source> <translation>Copia il path nella Clipboard</translation> </message> @@ -15458,17 +15458,17 @@ <translation><p>L'espressione di ricerca non è valida.</p><p>Errore: {0}</p></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><p>Non posso leggere il file<b>{0}</b>. Lo salto.</p><p>Motivo:{1}</p></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><p>Non posso salvare il file<b>{0}</b>. Lo salto.</p><p>Motivo:{1}</p></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><p>L'hash originale e quello corrente del file <b>{0}</b> sono differenti. Lo salto.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></translation> </message> @@ -15477,6 +15477,28 @@ <source>%v/%m Files</source> <translation>%v/%m Files</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> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n file(s)</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -25762,7 +25784,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>Mercurial Status</translation> </message> @@ -25859,72 +25881,72 @@ <translation>Adatta dimensione colonne</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>aggiunto</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>modificato</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>rimosso</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> + <source>not tracked</source> + <translation>non tracciato</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="146"/> - <source>not tracked</source> - <translation>non tracciato</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="142"/> <source>normal</source> <translation>normale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> - <source>ignored</source> - <translation>ignorato</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <source>ignored</source> + <translation>ignorato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>missing</source> <translation>mancante</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>Errore Generazione Processo</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>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</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>Commit</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>Non ci sono modifiche disponibili/selezionate da committare.</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>Aggiungi</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>Non ci sono elementi non sotto controllo disponibili/selezionati.</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>Inverti</translation> </message> @@ -25934,12 +25956,12 @@ <translation>Rimuovi dal repository</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>Rimuovi</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>Non ci sono elementi mancati disponibili/selezionati.</translation> </message> @@ -26024,17 +26046,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="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> <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> @@ -26049,7 +26071,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> @@ -26064,12 +26086,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> @@ -26079,12 +26101,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>
--- a/i18n/eric5_ru.ts Fri Mar 07 19:15:46 2014 +0100 +++ b/i18n/eric5_ru.ts Fri Mar 07 19:20:36 2014 +0100 @@ -15328,7 +15328,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="../UI/FindFileDialog.py" line="537"/> + <location filename="../UI/FindFileDialog.py" line="547"/> <source>Select directory</source> <translation>Выберите каталог</translation> </message> @@ -15523,17 +15523,17 @@ <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="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><p>Не могу прочитать файл <b>{0}</b>. Пропускаю.</p><p>Причина: {1}</p></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><p>Не могу сохранить файл <b>{0}</b>. Пропускаю.</p><p>Причина: {1}</p></translation> </message> @@ -15558,12 +15558,12 @@ <translation>Приблизительно</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="675"/> + <location filename="../UI/FindFileDialog.py" line="685"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="676"/> + <location filename="../UI/FindFileDialog.py" line="686"/> <source>Copy Path to Clipboard</source> <translation>Сопировать путь в буфер обмена</translation> </message> @@ -15578,7 +15578,7 @@ <translation><p>Неверное выражение для поиска.</p><p>Ошибка: {0}</p></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><p>Хэш для файла <b>{0}</b> изменился. Пропускаем.</p><p>Хэш 1:{1}</p><p>Хэш 2: {2}</p></translation> </message> @@ -15587,6 +15587,30 @@ <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> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n file(s)</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -25887,7 +25911,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>Mercurial Status</translation> </message> @@ -25984,72 +26008,72 @@ <translation>Подстроить размеры колонок</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>добавлено</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>изменено</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>удалено</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> + <source>not tracked</source> + <translation>не отслеживается</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="146"/> - <source>not tracked</source> - <translation>не отслеживается</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="142"/> <source>normal</source> <translation>нормальный</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> - <source>ignored</source> - <translation>игнорировано</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <source>ignored</source> + <translation>игнорировано</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>missing</source> <translation>отсутствует</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>Ошибка процесса генерации</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>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</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>Зафиксировать</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>Нет доступных/выбранных неотправленных изменений.</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>Добавить</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>Нет/не выбраны неверсионные элементы.</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>Откатить</translation> </message> @@ -26059,12 +26083,12 @@ <translation>Удалить из репозитория</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>Удалить</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>Нет/не выбраны пропущенных элементы.</translation> </message> @@ -26149,7 +26173,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> @@ -26159,12 +26183,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>Различия</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> @@ -26179,7 +26203,7 @@ <translation>Снять выделение</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> @@ -26194,12 +26218,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> @@ -26209,12 +26233,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>
--- a/i18n/eric5_tr.ts Fri Mar 07 19:15:46 2014 +0100 +++ b/i18n/eric5_tr.ts Fri Mar 07 19:20:36 2014 +0100 @@ -15477,7 +15477,7 @@ <translation>Bul</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="648"/> + <location filename="../UI/FindFileDialog.py" line="658"/> <source>Replace in Files</source> <translation>Dosyalarda yer değiştir</translation> </message> @@ -15492,32 +15492,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>Dizin Seçiniz</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>Aç</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="676"/> + <location filename="../UI/FindFileDialog.py" line="686"/> <source>Copy Path to Clipboard</source> <translation>Yolu Panoya kopyala</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> @@ -15526,6 +15526,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 type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n file(s)</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -25687,7 +25709,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>Mercurial Durumu</translation> </message> @@ -25789,82 +25811,82 @@ <translation>Sütün boyutunu ayarla</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>eklendi</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>değiştirildi</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>kaldırılmış</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> + <source>not tracked</source> + <translation>izlenmedi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> + <source>missing</source> + <translation>kayıp</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="146"/> - <source>not tracked</source> - <translation>izlenmedi</translation> + <source>normal</source> + <translation>normal</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> - <source>missing</source> - <translation>kayıp</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="142"/> - <source>normal</source> - <translation>normal</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> <source>ignored</source> <translation>yoksayıldı</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>İşlem Üretecinde Hata</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>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</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>Teslimat</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>Ekle</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>Kaldır</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>Başa Dönme</translation> </message> @@ -25949,7 +25971,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> @@ -25959,12 +25981,12 @@ <translation type="obsolete">Farklılık</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> @@ -25979,7 +26001,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> @@ -25994,12 +26016,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> @@ -26009,12 +26031,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>
--- 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>
