Mercurial Repositories > eric / changeset
changeset
Updated translations.
Wed, 06 Nov 2024 09:04:18 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 06 Nov 2024 09:04:18 +0100
- branch
- eric7
- changeset 11041
- 4a90f19b8c96
- parent 11040
- a4fd43ac7923
- child 11042
- d6fce9475dfa
Updated translations.
--- a/src/eric7/i18n/eric7_cs.ts Wed Nov 06 09:04:03 2024 +0100 +++ b/src/eric7/i18n/eric7_cs.ts Wed Nov 06 09:04:18 2024 +0100 @@ -38025,7 +38025,7 @@ <translation type="unfinished">Pohled</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38066,7 +38066,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38123,8 +38123,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished">Přepnout</translation> @@ -38155,8 +38155,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> <source>Pull Changes</source> <translation type="unfinished" /> @@ -38213,7 +38213,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> <source>Apply Changegroup</source> <translation type="unfinished" /> @@ -38244,7 +38244,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2467" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> @@ -38273,135 +38273,145 @@ <translation>Mercurial chyba</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1535" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1612" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2561" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2468" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2422" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2287" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2332" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2333" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2705" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2765" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2766" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2776" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <source>No differences available. Get some more log entries.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <source>No differences available.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2815" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> <source>There is no difference.</source> <translation type="unfinished">Žádné rozdíly nebyly nalezeny.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2934" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> <source>Save Diff</source> <translation type="unfinished">Uložit Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch soubory (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2969" /> - <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> - <translation type="unfinished"><p>Patch soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p>Patch soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3010" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -66977,33 +66987,38 @@ <translation /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="284" /> + <location filename="../Project/PropertiesDialog.py" line="306" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="164" /> + <location filename="../Project/PropertiesDialog.py" line="109" /> + <source><p>The project directory must not be '<b>{0}</b>'.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Project/PropertiesDialog.py" line="170" /> <source>The project is version controlled by <b>{0}</b>.</source> <translation>Projekt je pod správou verzovacího systému <b>{0}</b>.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="171" /> + <location filename="../Project/PropertiesDialog.py" line="177" /> <source>The project is not version controlled.</source> <translation>Projekt není pod správou verzovacího systému.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="176" /> + <location filename="../Project/PropertiesDialog.py" line="182" /> <source>Version control is not available for remote projects.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="239" /> + <location filename="../Project/PropertiesDialog.py" line="261" /> <source>Source Files ({0});;All Files (*)</source> <translation>Zdrojové soubory ({0});;Všechny soubory (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="243" /> + <location filename="../Project/PropertiesDialog.py" line="265" /> <source>All Files (*)</source> <translation type="unfinished">Všechny soubory (*)</translation> </message>
--- a/src/eric7/i18n/eric7_de.ts Wed Nov 06 09:04:03 2024 +0100 +++ b/src/eric7/i18n/eric7_de.ts Wed Nov 06 09:04:18 2024 +0100 @@ -38090,7 +38090,7 @@ <translation>Ansicht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation>Zweige auswählen</translation> @@ -38131,7 +38131,7 @@ <translation>Wähle die anzuzeigenden Zweige aus einer Liste geschlossener Zweigen und erneuere den Dialog</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> @@ -38188,8 +38188,8 @@ <translation>Schließe die ausgewählten Köpfe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation>Umschalten</translation> @@ -38220,8 +38220,8 @@ <translation>Verschiebe ein Lesezeichen zur ausgewählten Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> <source>Pull Changes</source> <translation>Änderungen herunterladen</translation> @@ -38279,7 +38279,7 @@ <p>Dies erzeugt eine Änderungsgruppendatei für die ausgewählten Änderungssätze. Ist keine Änderung ausgewählt, werden alle in die Datei geschrieben. Ist ein Änderungssatz ausgewählt, so wird er als Basis verwendet. Ansonsten wird die kleinste, ausgewählte Revision als Basis verwendet und alle anderen werden in die Datei geschrieben. Zeigt der Dialog ausgehende Änderungssätze an, so werden alle ausgewählten in die Datei geschrieben.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> <source>Apply Changegroup</source> <translation>Änderungsgruppe anwenden</translation> @@ -38310,7 +38310,7 @@ <translation>Alle Signaturen der ausgewählten Revision verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2467" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation>Änderungssätze löschen</translation> @@ -38339,135 +38339,145 @@ <translation>Mercurial-Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> <source>{0} (large file)</source> <translation>{0} (Binärriese)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> <source>Side-by-Side Diff to Parent {0}</source> <translation>Unterschiede nebeneinander zu Vorgänger {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1535" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Unterschiede nebeneinander</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1612" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> <source>Pull Selected Changes</source> <translation>Ausgewählte Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2561" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2468" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2422" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2287" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Wähle das Lesezeichen aus, auf das umgeschaltet werden soll (leer lassen, um Revision zu verwenden):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2332" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Define Bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2333" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> <source>Enter bookmark name for changeset "{0}":</source> <translation>Gib einen Lesezeichennamen für den Änderungssatz "{0}" ein:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> <source>Move Bookmark</source> <translation>Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation>Wähle ein Lesezeichen aus, das zum Änderungssatz '{0}' verschoben werden soll:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> <source>Find Commit</source> <translation>Revision finden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2705" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> <source>'{0}' was not found.</source> <translation>„{0}“ wurde nicht gefunden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2765" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> <source>Generating differences ...</source> <translation>Erzeuge Unterschiede ...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2766" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> <source>Differences</source> <translation>Unterschiede</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2776" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <source>No differences available. Get some more log entries.</source> + <translation>Keine Unterschiede verfügbar. Lade weitere Log-Einträge.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <source>No differences available.</source> + <translation>Keine Unterschiede verfügbar.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> <source>Differences to Parent {0}</source> <translation>Unterschiede zu Vorgänger {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> <source>Diff to Parent {0}{1}</source> <translation>Diff zu Vorgänger {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2815" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> <source>There is no difference.</source> <translation>Es gibt keinen Unterschied.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2934" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> <source>Save Diff</source> <translation>Diff speichern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> <source>Patch Files (*.diff)</source> <translation>Patchdateien (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Patchdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2969" /> - <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> - <translation><p>Die Patchdatei <b>{0}</b> konnte nicht gespeichert werden.<br>Grund: {1}</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation><p>Die Patchdatei <b>{0}</b> konnte nicht gespeichert werden.<br>Grund: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> <source>closed</source> <translation>geschlossen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> <source>inactive</source> <translation>inaktiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3010" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> <source>{0} ({1})</source> <translation>{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> <source>Select the branches to be shown (none for 'All'):</source> <translation>Wähle die anzuzeigenden Zweige (keinen für 'Alle'):</translation> </message> @@ -67044,33 +67054,38 @@ <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="284" /> + <location filename="../Project/PropertiesDialog.py" line="306" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation>Keiner</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="164" /> + <location filename="../Project/PropertiesDialog.py" line="109" /> + <source><p>The project directory must not be '<b>{0}</b>'.</p></source> + <translation><p>Das Projektverzeichnis darf nicht '<b>{0}</b>' sein.</p></translation> + </message> + <message> + <location filename="../Project/PropertiesDialog.py" line="170" /> <source>The project is version controlled by <b>{0}</b>.</source> <translation>Das Projekt steht unter Versionskontrolle durch <b>{0}</b>.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="171" /> + <location filename="../Project/PropertiesDialog.py" line="177" /> <source>The project is not version controlled.</source> <translation>Das Projekt steht nicht unter Versionskontrolle.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="176" /> + <location filename="../Project/PropertiesDialog.py" line="182" /> <source>Version control is not available for remote projects.</source> <translation>Versionskontrolle steht für entfernte Projekte nicht zur Verfügung.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="239" /> + <location filename="../Project/PropertiesDialog.py" line="261" /> <source>Source Files ({0});;All Files (*)</source> <translation>Quelldateien ({0});;Alle Dateien (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="243" /> + <location filename="../Project/PropertiesDialog.py" line="265" /> <source>All Files (*)</source> <translation>Alle Dateien (*)</translation> </message>
--- a/src/eric7/i18n/eric7_empty.ts Wed Nov 06 09:04:03 2024 +0100 +++ b/src/eric7/i18n/eric7_empty.ts Wed Nov 06 09:04:18 2024 +0100 @@ -37890,7 +37890,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -37931,7 +37931,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -37988,8 +37988,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished" /> @@ -38020,8 +38020,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> <source>Pull Changes</source> <translation type="unfinished" /> @@ -38078,7 +38078,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> <source>Apply Changegroup</source> <translation type="unfinished" /> @@ -38109,7 +38109,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2467" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> @@ -38138,135 +38138,145 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1535" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1612" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2561" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2468" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2422" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2287" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2332" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2333" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2705" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> <source>'{0}' was not found.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2765" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2766" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2776" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <source>No differences available. Get some more log entries.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <source>No differences available.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2815" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> <source>There is no difference.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2934" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> <source>Save Diff</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> <source>Patch Files (*.diff)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2969" /> - <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3010" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -66753,33 +66763,38 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="284" /> + <location filename="../Project/PropertiesDialog.py" line="306" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="164" /> + <location filename="../Project/PropertiesDialog.py" line="109" /> + <source><p>The project directory must not be '<b>{0}</b>'.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Project/PropertiesDialog.py" line="170" /> <source>The project is version controlled by <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="171" /> + <location filename="../Project/PropertiesDialog.py" line="177" /> <source>The project is not version controlled.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="176" /> + <location filename="../Project/PropertiesDialog.py" line="182" /> <source>Version control is not available for remote projects.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="239" /> + <location filename="../Project/PropertiesDialog.py" line="261" /> <source>Source Files ({0});;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="243" /> + <location filename="../Project/PropertiesDialog.py" line="265" /> <source>All Files (*)</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_en.ts Wed Nov 06 09:04:03 2024 +0100 +++ b/src/eric7/i18n/eric7_en.ts Wed Nov 06 09:04:18 2024 +0100 @@ -37915,7 +37915,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -37956,7 +37956,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38013,8 +38013,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished" /> @@ -38045,8 +38045,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> <source>Pull Changes</source> <translation type="unfinished" /> @@ -38103,7 +38103,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> <source>Apply Changegroup</source> <translation type="unfinished" /> @@ -38134,7 +38134,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2467" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> @@ -38163,135 +38163,145 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1535" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1612" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2561" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2468" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2422" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2287" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2332" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2333" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2705" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> <source>'{0}' was not found.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2765" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2766" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2776" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <source>No differences available. Get some more log entries.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <source>No differences available.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2815" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> <source>There is no difference.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2934" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> <source>Save Diff</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> <source>Patch Files (*.diff)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2969" /> - <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3010" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -66807,33 +66817,38 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="284" /> + <location filename="../Project/PropertiesDialog.py" line="306" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="164" /> + <location filename="../Project/PropertiesDialog.py" line="109" /> + <source><p>The project directory must not be '<b>{0}</b>'.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Project/PropertiesDialog.py" line="170" /> <source>The project is version controlled by <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="171" /> + <location filename="../Project/PropertiesDialog.py" line="177" /> <source>The project is not version controlled.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="176" /> + <location filename="../Project/PropertiesDialog.py" line="182" /> <source>Version control is not available for remote projects.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="239" /> + <location filename="../Project/PropertiesDialog.py" line="261" /> <source>Source Files ({0});;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="243" /> + <location filename="../Project/PropertiesDialog.py" line="265" /> <source>All Files (*)</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_es.ts Wed Nov 06 09:04:03 2024 +0100 +++ b/src/eric7/i18n/eric7_es.ts Wed Nov 06 09:04:18 2024 +0100 @@ -38093,7 +38093,7 @@ <translation>Ver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation>Seleccionar Branches</translation> @@ -38134,7 +38134,7 @@ <translation>Seleccionar las branchse a mostrar de un listado de todas las branches cerradas y actualizar la pantalla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> @@ -38192,8 +38192,8 @@ <translation>Cerrar las heads seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation>Hacer switch</translation> @@ -38224,8 +38224,8 @@ <translation>Mover marcador a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> <source>Pull Changes</source> <translation>Hacer Pull de Cambios</translation> @@ -38283,7 +38283,7 @@ <p>Esto crea un archivo de changegroup que contiene las revisiones seleccionadas. Si no se han seleccionado revisiones, se incluirán todos los changesets. Si se ha seleccionado una revisión, se tomará como revisión base. En cualquier otro lugar, la revisión más baja se usará como revisión base y todas las otras revisiones se incluirán en el archivo. Si el diálogo muestra changesets salientes, todos los changesets seleccionados se incluirán en el archivo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> <source>Apply Changegroup</source> <translation>Aplicar Changegroup</translation> @@ -38314,7 +38314,7 @@ <translation>Verificar todas las firmas que puede haber para la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2467" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation>Hacer strip de Changesets</translation> @@ -38343,135 +38343,145 @@ <translation>Error de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> <source>{0} (large file)</source> <translation>{0} (archivo grande)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> <source>Side-by-Side Diff to Parent {0}</source> <translation>Mostrar Diff lado a lado con el Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1535" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Comparar lado a lado</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1612" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> <source>Pull Selected Changes</source> <translation>Hacer Pull de Cambios Seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2561" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2468" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2422" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2287" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Seleccionar marcador al que cambiar (dejar vacío para usar revisión):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2332" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Define Bookmark</source> <translation>Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2333" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> <source>Enter bookmark name for changeset "{0}":</source> <translation>Introducir nombre de marcador para el changeset "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> <source>Move Bookmark</source> <translation>Mover Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation>Seleccionar el marcador a mover al changeset "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> <source>Find Commit</source> <translation>Buscar Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2705" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> <source>'{0}' was not found.</source> <translation>'{0}' no se ha encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2765" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> <source>Generating differences ...</source> <translation>Generando diferencias ...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2766" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2776" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <source>No differences available. Get some more log entries.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <source>No differences available.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> <source>Differences to Parent {0}</source> <translation>Diferencias con el Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> <source>Diff to Parent {0}{1}</source> <translation>Diff con el Parent {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2815" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2934" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de parche <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2969" /> - <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> - <translation><p>El archivo de parche <b>{0}</b> no puede ser guardado.<br />Causa: {1}</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation><p>El archivo de parche <b>{0}</b> no puede ser guardado.<br />Causa: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> <source>closed</source> <translation>cerrada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> <source>inactive</source> <translation>inactiva</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3010" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> <source>{0} ({1})</source> <translation>{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> <source>Select the branches to be shown (none for 'All'):</source> <translation>Seleccionar las branches a mostrar (ninguna para mostrar 'Todas'):</translation> </message> @@ -67046,33 +67056,38 @@ <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="284" /> + <location filename="../Project/PropertiesDialog.py" line="306" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation>Ninguno</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="164" /> + <location filename="../Project/PropertiesDialog.py" line="109" /> + <source><p>The project directory must not be '<b>{0}</b>'.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Project/PropertiesDialog.py" line="170" /> <source>The project is version controlled by <b>{0}</b>.</source> <translation>El proyecto está bajo control de versiones de <b>{0}</b>.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="171" /> + <location filename="../Project/PropertiesDialog.py" line="177" /> <source>The project is not version controlled.</source> <translation>El proyecto no tiene control de versiones.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="176" /> + <location filename="../Project/PropertiesDialog.py" line="182" /> <source>Version control is not available for remote projects.</source> <translation>El control de versiones no está disponible para proyectos remotos.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="239" /> + <location filename="../Project/PropertiesDialog.py" line="261" /> <source>Source Files ({0});;All Files (*)</source> <translation>Archivos fuente ({0});;Todos los archivos (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="243" /> + <location filename="../Project/PropertiesDialog.py" line="265" /> <source>All Files (*)</source> <translation>Todos los archivos (*)</translation> </message>
--- a/src/eric7/i18n/eric7_fr.ts Wed Nov 06 09:04:03 2024 +0100 +++ b/src/eric7/i18n/eric7_fr.ts Wed Nov 06 09:04:18 2024 +0100 @@ -38079,7 +38079,7 @@ <translation type="unfinished">Affichage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38120,7 +38120,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38177,8 +38177,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation>Basculer de version</translation> @@ -38209,8 +38209,8 @@ <translation>Déplacer le signet vers la révision sélectionnée</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> <source>Pull Changes</source> <translation type="unfinished" /> @@ -38267,7 +38267,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> <source>Apply Changegroup</source> <translation type="unfinished" /> @@ -38298,7 +38298,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2467" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> @@ -38327,135 +38327,145 @@ <translation>Erreur Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1535" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1612" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2561" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2468" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2422" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> <source>The project should be reread. Do this now?</source> <translation>Le projet devrai être relu. Le faire maintenant ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2287" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2332" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Define Bookmark</source> <translation>Définir un signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2333" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> <source>Move Bookmark</source> <translation>Déplacer un signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> <source>Find Commit</source> <translation>Chercher le commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2705" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> <source>'{0}' was not found.</source> <translation>'{0}' n'a pas été trouvé.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2765" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2766" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> <source>Differences</source> <translation>Différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2776" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <source>No differences available. Get some more log entries.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <source>No differences available.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2815" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> <source>There is no difference.</source> <translation>Aucune différence.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2934" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> <source>Save Diff</source> <translation>Enregistrer Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> <source>Patch Files (*.diff)</source> <translation>Fichiers Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Le fichier patch <b>{0}</b>existe déjà. Écraser ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2969" /> - <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> - <translation><p>Le fichier patch <b>{0}</b> ne peut être enregistré.<br>Rasion : {1}</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation><p>Le fichier patch <b>{0}</b> ne peut être enregistré.<br>Rasion : {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3010" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> <source>{0} ({1})</source> <translation type="unfinished">{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -67133,33 +67143,38 @@ <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="284" /> + <location filename="../Project/PropertiesDialog.py" line="306" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="164" /> + <location filename="../Project/PropertiesDialog.py" line="109" /> + <source><p>The project directory must not be '<b>{0}</b>'.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Project/PropertiesDialog.py" line="170" /> <source>The project is version controlled by <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="171" /> + <location filename="../Project/PropertiesDialog.py" line="177" /> <source>The project is not version controlled.</source> <translation>Le projet n'est pas géré par un système de contrôle de version (VCS).</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="176" /> + <location filename="../Project/PropertiesDialog.py" line="182" /> <source>Version control is not available for remote projects.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="239" /> + <location filename="../Project/PropertiesDialog.py" line="261" /> <source>Source Files ({0});;All Files (*)</source> <translation>Fichiers sources ({0});;Tous les fichiers (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="243" /> + <location filename="../Project/PropertiesDialog.py" line="265" /> <source>All Files (*)</source> <translation type="unfinished">Tous fichiers (*)</translation> </message>
--- a/src/eric7/i18n/eric7_it.ts Wed Nov 06 09:04:03 2024 +0100 +++ b/src/eric7/i18n/eric7_it.ts Wed Nov 06 09:04:18 2024 +0100 @@ -38062,7 +38062,7 @@ <translation type="unfinished">Visualizza</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38103,7 +38103,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38160,8 +38160,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished" /> @@ -38192,8 +38192,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> <source>Pull Changes</source> <translation type="unfinished" /> @@ -38250,7 +38250,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> <source>Apply Changegroup</source> <translation type="unfinished" /> @@ -38281,7 +38281,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2467" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> @@ -38310,135 +38310,145 @@ <translation>Mercurial Error</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1535" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1612" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2561" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2468" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2422" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2287" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2332" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2333" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2705" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' non è stato trovato.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2765" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2766" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2776" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <source>No differences available. Get some more log entries.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <source>No differences available.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2815" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> <source>There is no difference.</source> <translation type="unfinished">Non ci sono differenze.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2934" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> <source>Save Diff</source> <translation type="unfinished">Salva Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">File Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Il file patch <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2969" /> - <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> - <translation type="unfinished"><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3010" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> <source>{0} ({1})</source> <translation type="unfinished">{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -67037,33 +67047,38 @@ <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="284" /> + <location filename="../Project/PropertiesDialog.py" line="306" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished">Nessuno</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="164" /> + <location filename="../Project/PropertiesDialog.py" line="109" /> + <source><p>The project directory must not be '<b>{0}</b>'.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Project/PropertiesDialog.py" line="170" /> <source>The project is version controlled by <b>{0}</b>.</source> <translation>Il progetto è sotto controllo della versione di <b>{0}</b>.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="171" /> + <location filename="../Project/PropertiesDialog.py" line="177" /> <source>The project is not version controlled.</source> <translation>Il progetto non è sotto controllo della versione.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="176" /> + <location filename="../Project/PropertiesDialog.py" line="182" /> <source>Version control is not available for remote projects.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="239" /> + <location filename="../Project/PropertiesDialog.py" line="261" /> <source>Source Files ({0});;All Files (*)</source> <translation>Source Files ({0});;All Files (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="243" /> + <location filename="../Project/PropertiesDialog.py" line="265" /> <source>All Files (*)</source> <translation type="unfinished">Tutti i file (*)</translation> </message>
--- a/src/eric7/i18n/eric7_pt.ts Wed Nov 06 09:04:03 2024 +0100 +++ b/src/eric7/i18n/eric7_pt.ts Wed Nov 06 09:04:18 2024 +0100 @@ -38067,7 +38067,7 @@ <translation type="unfinished">Vista</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38108,7 +38108,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> @@ -38166,8 +38166,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished">Mudar</translation> @@ -38198,8 +38198,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> <source>Pull Changes</source> <translation type="unfinished" /> @@ -38256,7 +38256,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> <source>Apply Changegroup</source> <translation type="unfinished" /> @@ -38287,7 +38287,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2467" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> @@ -38316,135 +38316,145 @@ <translation>Erro de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> <source>{0} (large file)</source> <translation>{0} (ficheiro grande)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1535" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1612" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2561" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2468" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2422" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> <source>The project should be reread. Do this now?</source> <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2287" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2332" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Define Bookmark</source> <translation type="unfinished">Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2333" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> <source>Move Bookmark</source> <translation type="unfinished">Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2705" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> <source>'{0}' was not found.</source> <translation>'{0}' não foi encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2765" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2766" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> <source>Differences</source> <translation type="unfinished">Diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2776" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <source>No differences available. Get some more log entries.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <source>No differences available.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2815" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> <source>There is no difference.</source> <translation type="unfinished">Não há diferenças.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2934" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> <source>Save Diff</source> <translation type="unfinished">Gravar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> <source>Patch Files (*.diff)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2969" /> - <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> - <translation type="unfinished"><p>O ficheiro remendo <b>{0}</b> não se pôde gravar.<br />Motivo: {1}</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p>O ficheiro remendo <b>{0}</b> não se pôde gravar.<br />Motivo: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3010" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -67026,33 +67036,38 @@ <translation /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="284" /> + <location filename="../Project/PropertiesDialog.py" line="306" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="164" /> + <location filename="../Project/PropertiesDialog.py" line="109" /> + <source><p>The project directory must not be '<b>{0}</b>'.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Project/PropertiesDialog.py" line="170" /> <source>The project is version controlled by <b>{0}</b>.</source> <translation>O projeto tem a versão controlada por <b>{0}</b>.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="171" /> + <location filename="../Project/PropertiesDialog.py" line="177" /> <source>The project is not version controlled.</source> <translation>O projeto não tem a versão controlada.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="176" /> + <location filename="../Project/PropertiesDialog.py" line="182" /> <source>Version control is not available for remote projects.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="239" /> + <location filename="../Project/PropertiesDialog.py" line="261" /> <source>Source Files ({0});;All Files (*)</source> <translation>Ficheiros Fonte ({0});;Ficheiros Todos (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="243" /> + <location filename="../Project/PropertiesDialog.py" line="265" /> <source>All Files (*)</source> <translation type="unfinished">Ficheiros Todos (*)</translation> </message>
--- a/src/eric7/i18n/eric7_ru.ts Wed Nov 06 09:04:03 2024 +0100 +++ b/src/eric7/i18n/eric7_ru.ts Wed Nov 06 09:04:18 2024 +0100 @@ -38142,7 +38142,7 @@ <translation>Отображение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation>Выбрать ветки</translation> @@ -38183,7 +38183,7 @@ <translation>Выберите для отображения ветки из списка закрытых веток и обновите отображение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation>Копировать наборы изменений</translation> @@ -38241,8 +38241,8 @@ <translation>Закрыть выбранные головные ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation>Переключиться</translation> @@ -38273,8 +38273,8 @@ <translation>Переместить закладку в выбранную ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> <source>Pull Changes</source> <translation>Затянуть изменения</translation> @@ -38332,7 +38332,7 @@ <p>Создание файла группы изменений, содержащего выбранные ревизии. Если не выбрано ни одного набора, будут скомплектованы все наборы изменений. Если выбрана одна ревизия, то она будет интерпретирована как базовая ревизия. В противном случае самая младшая ревизия будет использована как базовая ревизия а все остальные изменения будут скомплектованы. Если диалог отображает исходящие наборы изменений, все помеченные наборы изменений будут собраны в комплект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> <source>Apply Changegroup</source> <translation>Применить группу изменений</translation> @@ -38363,7 +38363,7 @@ <translation>Проверить все подписи, которые могут быть для отмеченных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2467" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation>Срезать наборы изменений (strip)</translation> @@ -38392,135 +38392,145 @@ <translation>Mercurial: Ошибка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> <source>{0} (large file)</source> <translation>{0} большой файл</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> <source>Side-by-Side Diff to Parent {0}</source> <translation>Построчные различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1535" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Построчное сравнение</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1612" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> <source>Pull Selected Changes</source> <translation>Затянуть помеченные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2561" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2468" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2422" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2287" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Выберите закладку для переключения (оставьте поле пустым для использования ревизии):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2332" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Define Bookmark</source> <translation>Определить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2333" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> <source>Enter bookmark name for changeset "{0}":</source> <translation>Введите имя закладки для набора изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> <source>Move Bookmark</source> <translation>Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation>Выберите закладку для перемещения в набор изменений '{0}':</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> <source>Find Commit</source> <translation>Поиск фиксации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2705" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> <source>'{0}' was not found.</source> <translation>'{0}' не найден.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2765" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> <source>Generating differences ...</source> <translation>Генерация различий...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2766" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2776" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <source>No differences available. Get some more log entries.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <source>No differences available.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> <source>Differences to Parent {0}</source> <translation>Различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> <source>Diff to Parent {0}{1}</source> <translation>Различия с предком {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2815" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> <source>There is no difference.</source> <translation>Различий нет.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2934" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> <source>Save Diff</source> <translation>Сохранить различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> <source>Patch Files (*.diff)</source> <translation>Файлы патчей (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл патча <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2969" /> - <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> - <translation><p>Невозможно сохранить файл патча <b>{0}</b>.<br>Причина: {1}</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation><p>Невозможно сохранить файл патча <b>{0}</b>.<br>Причина: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> <source>closed</source> <translation>закрыта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> <source>inactive</source> <translation>неактивна</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3010" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> <source>{0} ({1})</source> <translation>{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> <source>Select the branches to be shown (none for 'All'):</source> <translation>Выберите ветки для отображения (не для варианта 'Все'):</translation> </message> @@ -67160,33 +67170,38 @@ <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="284" /> + <location filename="../Project/PropertiesDialog.py" line="306" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation>Нет</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="164" /> + <location filename="../Project/PropertiesDialog.py" line="109" /> + <source><p>The project directory must not be '<b>{0}</b>'.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Project/PropertiesDialog.py" line="170" /> <source>The project is version controlled by <b>{0}</b>.</source> <translation>Проект находится под управлением <b>{0}</b>.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="171" /> + <location filename="../Project/PropertiesDialog.py" line="177" /> <source>The project is not version controlled.</source> <translation>Проект не находится под управлением системы контроля версий.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="176" /> + <location filename="../Project/PropertiesDialog.py" line="182" /> <source>Version control is not available for remote projects.</source> <translation>Контроль версий недоступен для удаленных проектов.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="239" /> + <location filename="../Project/PropertiesDialog.py" line="261" /> <source>Source Files ({0});;All Files (*)</source> <translation>Файлы исходников ({0});;Все файлы (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="243" /> + <location filename="../Project/PropertiesDialog.py" line="265" /> <source>All Files (*)</source> <translation>Все файлы (*)</translation> </message>
--- a/src/eric7/i18n/eric7_tr.ts Wed Nov 06 09:04:03 2024 +0100 +++ b/src/eric7/i18n/eric7_tr.ts Wed Nov 06 09:04:18 2024 +0100 @@ -38020,7 +38020,7 @@ <translation type="unfinished">Görünüm</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38061,7 +38061,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38118,8 +38118,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished">Değiştirmek</translation> @@ -38150,8 +38150,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> <source>Pull Changes</source> <translation type="unfinished" /> @@ -38208,7 +38208,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> <source>Apply Changegroup</source> <translation type="unfinished" /> @@ -38239,7 +38239,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2467" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> @@ -38268,135 +38268,145 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1535" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1612" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2561" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2468" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2422" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2287" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2332" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2333" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2705" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' bulunamadı.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2765" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2766" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2776" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <source>No differences available. Get some more log entries.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <source>No differences available.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2815" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> <source>There is no difference.</source> <translation type="unfinished">Herhangi bir farklılık bulunamadı.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2934" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> <source>Save Diff</source> <translation type="unfinished">Farklılıkları Kaydet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch Dosyaları (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Yama dosyası <b>{0}</b> zaten var. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2969" /> - <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> - <translation type="unfinished"><p><b>{0}</b>yama kaydedilemedi.<br>Sebep: {1}</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p><b>{0}</b>yama kaydedilemedi.<br>Sebep: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3010" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -66955,33 +66965,38 @@ <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="284" /> + <location filename="../Project/PropertiesDialog.py" line="306" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished">Yok</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="164" /> + <location filename="../Project/PropertiesDialog.py" line="109" /> + <source><p>The project directory must not be '<b>{0}</b>'.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Project/PropertiesDialog.py" line="170" /> <source>The project is version controlled by <b>{0}</b>.</source> <translation>Proje sürümü <b>{0}</b> tarafından yapılmaktadır.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="171" /> + <location filename="../Project/PropertiesDialog.py" line="177" /> <source>The project is not version controlled.</source> <translation>Projenin sürüm kontrolü yapılmadı.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="176" /> + <location filename="../Project/PropertiesDialog.py" line="182" /> <source>Version control is not available for remote projects.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="239" /> + <location filename="../Project/PropertiesDialog.py" line="261" /> <source>Source Files ({0});;All Files (*)</source> <translation>Kaynak Dosyaları ({0});; Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="243" /> + <location filename="../Project/PropertiesDialog.py" line="265" /> <source>All Files (*)</source> <translation type="unfinished">Tüm Dosyalar (*)</translation> </message>
--- a/src/eric7/i18n/eric7_zh_CN.ts Wed Nov 06 09:04:03 2024 +0100 +++ b/src/eric7/i18n/eric7_zh_CN.ts Wed Nov 06 09:04:18 2024 +0100 @@ -38030,7 +38030,7 @@ <translation type="unfinished">视图</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38071,7 +38071,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2209" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38128,8 +38128,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2286" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished">转换</translation> @@ -38160,8 +38160,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> <source>Pull Changes</source> <translation type="unfinished" /> @@ -38218,7 +38218,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> <source>Apply Changegroup</source> <translation type="unfinished" /> @@ -38249,7 +38249,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2467" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> <source>Strip Changesets</source> <translation type="unfinished" /> @@ -38278,135 +38278,145 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1535" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1612" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> <source>Pull Selected Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2561" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2468" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2422" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2287" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2332" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2333" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2704" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2705" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> <source>'{0}' was not found.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2765" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2766" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2776" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <source>No differences available. Get some more log entries.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <source>No differences available.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2815" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> <source>There is no difference.</source> <translation type="unfinished">没有差异。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2934" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> <source>Save Diff</source> <translation type="unfinished">保存差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">补丁文件 (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>补丁文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2969" /> - <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> - <translation type="unfinished"><p>补丁文件 <b>{0}</b> 无法保存。<br />原因：{1}</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"><p>补丁文件 <b>{0}</b> 无法保存。<br />原因：{1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3010" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -67052,33 +67062,38 @@ <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="284" /> + <location filename="../Project/PropertiesDialog.py" line="306" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished">无</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="164" /> + <location filename="../Project/PropertiesDialog.py" line="109" /> + <source><p>The project directory must not be '<b>{0}</b>'.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Project/PropertiesDialog.py" line="170" /> <source>The project is version controlled by <b>{0}</b>.</source> <translation>本项目由 <b>{0}</b> 进行版本控制。</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="171" /> + <location filename="../Project/PropertiesDialog.py" line="177" /> <source>The project is not version controlled.</source> <translation>项目未进行版本控制。</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="176" /> + <location filename="../Project/PropertiesDialog.py" line="182" /> <source>Version control is not available for remote projects.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="239" /> + <location filename="../Project/PropertiesDialog.py" line="261" /> <source>Source Files ({0});;All Files (*)</source> <translation>源文件 ({0});;所有文件 (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="243" /> + <location filename="../Project/PropertiesDialog.py" line="265" /> <source>All Files (*)</source> <translation type="unfinished">所有文件 (*)</translation> </message>
