Mercurial Repositories > eric / changeset
changeset
Generated translations after string format conversions done.
Fri, 30 Jul 2010 18:26:19 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 30 Jul 2010 18:26:19 +0200
- changeset 435
- 06ddd1d925e0
- parent 433
- 988006cb898f
- child 436
- fb832fd53831
Generated translations after string format conversions done.
| i18n/eric5_cs.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_de.qm | file | annotate | diff | comparison | revisions | |
| i18n/eric5_de.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_es.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_fr.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_it.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_ru.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_tr.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_zh_CN.GB2312.ts | file | annotate | diff | comparison | revisions |
--- a/i18n/eric5_cs.ts Fri Jul 30 12:55:36 2010 +0200 +++ b/i18n/eric5_cs.ts Fri Jul 30 18:26:19 2010 +0200 @@ -3395,7 +3395,7 @@ <translation>&Filtr pro:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source>Code Generation</source> <translation>Generování kódu</translation> </message> @@ -3430,7 +3430,7 @@ <translation><p>Nelze ovevřít source soubor "{0}".</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Nelze zapsat do source souboru "{0}".</p><p>Důvod: {1}</p></translation> </message> @@ -4551,22 +4551,22 @@ <translation></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Parent Process</source> <translation>Rodičovský proces</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Child process</source> <translation>Dětský proces</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Client forking</source> <translation>Větvení klienta</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Select the fork branch to follow.</source> <translation>Pokračovat ve fork větvi.</translation> </message> @@ -4589,22 +4589,22 @@ <translation><p>Debugovací backend nelze spustit.</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Parent Process</source> <translation>Rodičovský proces</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Child process</source> <translation>Dětský proces</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Client forking</source> <translation>Větvení klienta</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Select the fork branch to follow.</source> <translation>Pokračovat ve fork větvi.</translation> </message> @@ -5195,62 +5195,62 @@ <translation></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="201"/> + <location filename="UI/DiffDialog.py" line="202"/> <source>Compare</source> <translation>Porovnat</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="202"/> + <location filename="UI/DiffDialog.py" line="203"/> <source>Press to perform the comparison of the two files</source> <translation>Stisknout pro provedení porovnání dvou souborů</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="205"/> - <source>Save</source> - <translation>Uložit</translation> - </message> - <message> <location filename="UI/DiffDialog.py" line="206"/> + <source>Save</source> + <translation>Uložit</translation> + </message> + <message> + <location filename="UI/DiffDialog.py" line="207"/> <source>Save the output to a patch file</source> <translation>Uložit výstup do path souboru</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="310"/> + <location filename="UI/DiffDialog.py" line="311"/> <source>Save Diff</source> <translation>Uložit Diff</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="272"/> + <location filename="UI/DiffDialog.py" line="273"/> <source>Patch Files (*.diff)</source> <translation>Patch soubory (*.diff)</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source>Compare Files</source> <translation>Porovnat soubory</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="444"/> + <location filename="UI/DiffDialog.py" line="445"/> <source>There is no difference.</source> <translation>Žádné rozdíly nebyly nalezeny.</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="463"/> + <location filename="UI/DiffDialog.py" line="464"/> <source>Select file to compare</source> <translation>Výběr souboru pro porovnání</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="289"/> + <location filename="UI/DiffDialog.py" line="290"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation><p>Patch soubor <b>{0}</b> již existuje.</p></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="310"/> + <location filename="UI/DiffDialog.py" line="311"/> <source><p>The patch file <b>{0}</b> could not be saved.<br />Reason: {1}</p></source> <translation><p>Patch soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> @@ -6523,7 +6523,7 @@ <translation>Použít Pygments lexer.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5417"/> + <location filename="QScintilla/Editor.py" line="5418"/> <source>Check spelling...</source> <translation>Zatrhnout kontrolu...</translation> </message> @@ -6533,12 +6533,12 @@ <translation>Zatrhnout výběr kontroly...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5419"/> + <location filename="QScintilla/Editor.py" line="5420"/> <source>Add to dictionary</source> <translation>Přidat do slovníku</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5421"/> + <location filename="QScintilla/Editor.py" line="5422"/> <source>Ignore All</source> <translation>Ignorovat vše</translation> </message> @@ -9799,25 +9799,25 @@ <message> <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Level 1 Header</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Level 2 Header</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Class and Function Header</h2>Standard body text with <a style="color:%(LinkColor)s">some links</a> embedded.</body></html></source> - <translation><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head> <title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Hlavička první úrovně</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Hlavička druhé úrovně</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Hlavička třídy a funkce</h2>Standardní text s různými <a style="color:%(LinkColor)s">odkazy</a> v textu.</body></html></translation> - </message> - <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="257"/> + <translation type="obsolete"><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head> <title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Hlavička první úrovně</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Hlavička druhé úrovně</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Hlavička třídy a funkce</h2>Standardní text s různými <a style="color:%(LinkColor)s">odkazy</a> v textu.</body></html></translation> + </message> + <message> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="260"/> <source>Select output directory</source> <translation>Výběr výstupního adresáře</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="282"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="285"/> <source>Select directory to exclude</source> <translation>Vybrat adresář, který bude vyloučen</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Select CSS style sheet</source> <translation>Vybrat CSS soubor</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Style sheet (*.css);;Všechny soubory (*)</translation> </message> @@ -9897,7 +9897,7 @@ <translation>Zadejte krátký titulek pro vstup nahoře</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="468"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="471"/> <source>Select output directory for QtHelp files</source> <translation>Vybrat výstupní adresář pro soubory QtNápovědy</translation> </message> @@ -9911,6 +9911,11 @@ <source>Generate QtHelp collection files</source> <translation>Generovat kolekci souborů QtNápovědy</translation> </message> + <message> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> + <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title></title></head><body style="background-color:{BodyBgColor};color:{BodyColor}"><h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}">Level 1 Header</h1><h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}">Level 2 Header</h3><h2 style="background-color:{CFBgColor};color:{CFColor}">Class and Function Header</h2>Standard body text with <a style="color:{LinkColor}">some links</a> embedded.</body></html></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EricdocExecDialog</name> @@ -10119,7 +10124,7 @@ <context> <name>ExporterHTML</name> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source>Export source</source> <translation>Zdroj exportu</translation> </message> @@ -10129,7 +10134,7 @@ <translation>HTML soubory (*.html)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Zdroj nemohl být do <b>{0}</b> exportován.</p><p>Důvod: {1}</p></translation> </message> @@ -10137,17 +10142,17 @@ <context> <name>ExporterPDF</name> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="403"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="405"/> <source>PDF Files (*.pdf)</source> <translation>PDF Soubory (*.pdf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source>Export source</source> <translation>Zdroj exportu</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Zdroj nemohl být do <b>{0}</b> exportován.</p><p>Důvod: {1}</p></translation> </message> @@ -10160,12 +10165,12 @@ <translation>RTF Soubory (*.rtf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source>Export source</source> <translation>Zdroj exportu</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Zdroj nemohl být do <b>{0}</b> exportován.</p><p>Důvod: {1}</p></translation> </message> @@ -10173,17 +10178,17 @@ <context> <name>ExporterTEX</name> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="104"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="105"/> <source>TeX Files (*.tex)</source> <translation>TeX soubory (*.tex)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source>Export source</source> <translation>Zdroj exportu</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Zdroj nemohl být do <b>{0}</b> exportován.</p><p>Důvod: {1}</p></translation> </message> @@ -13545,152 +13550,152 @@ <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Mercurial Log</source> <translation>Mercurial log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Select number of entries to show.</source> <translation>Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1451"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1452"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1485"/> <source>Creating branch in the Mercurial repository</source> <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Ověřit integritu Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Showing aliases for remote repositories</source> <translation>Zobrazení aliasů pro vzdálené úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1851"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1507"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1508"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1762"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1865"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1878"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1906"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1649"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1738"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> @@ -22536,12 +22541,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="863"/> + <location filename="Preferences/__init__.py" line="871"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="882"/> + <location filename="Preferences/__init__.py" line="890"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> @@ -28481,7 +28486,12 @@ <message> <location filename="SqlBrowser/SqlBrowser.py" line="62"/> <source>Unable to open connection: %s</source> - <translation>Nelze otevčít spojení: %s</translation> + <translation type="obsolete">Nelze otevčít spojení: %s</translation> + </message> + <message> + <location filename="SqlBrowser/SqlBrowser.py" line="62"/> + <source>Unable to open connection: {0}</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -29461,122 +29471,122 @@ <translation>Synchronizovat se Subversion repozitářem</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="652"/> <source>Adding files/directories to the Subversion repository</source> <translation>Přidat soubory/adresáře do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="725"/> <source>Adding directory trees to the Subversion repository</source> <translation>Přidat strom adresářů do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="760"/> <source>Removing files/directories from the Subversion repository</source> <translation>Odebrat soubory/adresáře ze Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>Subversion Error</source> <translation>Subversion chyba</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="920"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace tagování bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="943"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="944"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace tagování bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1007"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1008"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1032"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1033"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1333"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1334"/> <source>Subversion command</source> <translation>Subversion příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1440"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1441"/> <source>Resolving conficts</source> <translation>Řešení konfliktů</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1547"/> <source>Subversion Set Property</source> <translation>Nastavit Subversion vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1580"/> <source>You have to supply a property name. Aborting.</source> <translation>Musíte doplnit jméno vlastnosti. Zrušeno.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1598"/> <source>Subversion Delete Property</source> <translation>Smazat Subversion vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1419"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1420"/> <source>Enter property name</source> <translation>Zadejte jméno vlastnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Subversion Log</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Select number of entries to show.</source> <translation>Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1782"/> <source>Locking in the Subversion repository</source> <translation>Zamknout v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1820"/> <source>Unlocking in the Subversion repository</source> <translation>Odemknout v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Property set.</source> <translation>Vlastnost nastavena.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> <source>Property deleted.</source> <translation>Vlastnost smazána.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Subversion Lock</source> <translation>Subversion zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Enter lock comment</source> <translation>Zadejte komentář zámku</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1865"/> <source>Relocating</source> <translation></translation> </message> @@ -29741,27 +29751,27 @@ <translation>Nelze spustit svn proces.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Repository Browser</source> <translation>Prohlížeč repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Enter the repository URL.</source> <translation>Zadejte URL repozitáře.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1914"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1915"/> <source>Remove from changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1951"/> <source>Add to changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1940"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1941"/> <source>Enter name of the changelist:</source> <translation>Zadejte název seznamu změn:</translation> </message> @@ -29786,32 +29796,32 @@ <translation>Proces svn skončil exit kódem {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Moving {0}</source> <translation>Přesun {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="978"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="979"/> <source>Tagging {0} in the Subversion repository</source> <translation>Tagování {0} v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1079"/> <source>Switching to {0}</source> <translation>Přepínání do {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1177"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1178"/> <source>Merging {0}</source> <translation>Sloučení {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1297"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1298"/> <source>Cleaning up {0}</source> <translation>Vyčištění {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1479"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1480"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -29827,7 +29837,7 @@ <translation>Zapsaná revize {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1086"/> <source>Revision {0}. </source> <translation>Revize {0}.</translation> @@ -34891,17 +34901,17 @@ <translation>Nápověda šablony</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source>Edit Template Group</source> <translation>Editovat skupinu šablon</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source>Save templates</source> <translation>Uložit šablony</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source>Read templates</source> <translation>Načíst šablony</translation> </message> @@ -34922,22 +34932,22 @@ <p><b>Záznamy šablon</b> jsou aktuální šablony. Jsou seskupeny do skupin. Nápověda jak je definovat je dostupná v dialogu editace šablony. V podadresáři distribuce Eric5 je k prostudování jeden příklad šablony.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source><p>A template group with the name <b>{0}</b> already exists.</p></source> <translation><p>Skupina šablon se jménem <b>{0}</b> již existuje.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source><p>The templates file <b>{0}</b> could not be written.</p></source> <translation><p>Do souboru se šablonami <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="921"/> + <location filename="Templates/TemplateViewer.py" line="919"/> <source><p>The templates file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor se šablonami <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source><p>The templates file <b>{0}</b> has an unsupported format.</p></source> <translation><p>Soubor se šablonami <b>{0}</b> je v nepodporovaném formátu.</p></translation> </message> @@ -42619,12 +42629,12 @@ <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1405"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1409"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> @@ -42647,23 +42657,23 @@ <translation><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1400"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1401"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1415"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -42732,17 +42742,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1374"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1245"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1246"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuální revize</b></td><td>{2}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{3}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{4}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Poslední autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1376"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuální revize</b></td><td>{4}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{6}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{7}</td></tr><tr><td><b>Poslední autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_de.ts Fri Jul 30 12:55:36 2010 +0200 +++ b/i18n/eric5_de.ts Fri Jul 30 18:26:19 2010 +0200 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="1.1" language="de"> <context> <name>AboutDialog</name> <message> @@ -1550,8 +1549,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="146"/> @@ -1601,7 +1600,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="72"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -3402,7 +3401,7 @@ <translation>&Filtere mit:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source>Code Generation</source> <translation>Code Erzeugung</translation> </message> @@ -3417,7 +3416,7 @@ <translation><p>Die Quelltextdatei "{0}" konnte nicht geöffnet werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Die Quelltextdatei "{0}" konnte nicht geschrieben werden.</p><p>Ursache: {1}</p></translation> </message> @@ -4563,22 +4562,22 @@ <translation><p>Der Debugger konnte nicht gestartet werden.</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Parent Process</source> <translation>Vater Prozess</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Child process</source> <translation>Kind Prozess</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Client forking</source> <translation>Client forkt</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Select the fork branch to follow.</source> <translation>Wähle den zu folgenden Fork Pfad.</translation> </message> @@ -4601,22 +4600,22 @@ <translation><p>Der Debugger konnte nicht gestartet werden.</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Parent Process</source> <translation>Vater Prozess</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Child process</source> <translation>Kind Prozess</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Client forking</source> <translation>Client forkt</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Select the fork branch to follow.</source> <translation>Wähle den zu folgenden Fork Pfad.</translation> </message> @@ -5147,37 +5146,37 @@ <context> <name>DiffDialog</name> <message> - <location filename="UI/DiffDialog.py" line="272"/> + <location filename="UI/DiffDialog.py" line="273"/> <source>Patch Files (*.diff)</source> <translation>Patchdateien (*.diff)</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="310"/> + <location filename="UI/DiffDialog.py" line="311"/> <source>Save Diff</source> <translation>Diff speichern</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source>Compare Files</source> <translation>Dateien vergleichen</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="444"/> + <location filename="UI/DiffDialog.py" line="445"/> <source>There is no difference.</source> <translation>Es gibt keinen Unterschied.</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="463"/> + <location filename="UI/DiffDialog.py" line="464"/> <source>Select file to compare</source> <translation>Wähle eine zu vergleichende Datei</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="289"/> + <location filename="UI/DiffDialog.py" line="290"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation><p>Die Patchdatei <b>{0}</b> existiert bereits.</p></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> @@ -5247,27 +5246,27 @@ <translation>Alt+C</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="202"/> + <location filename="UI/DiffDialog.py" line="203"/> <source>Press to perform the comparison of the two files</source> <translation>Drücken, um den Dateivergleich durchzuführen</translation> </message> <message> + <location filename="UI/DiffDialog.py" line="207"/> + <source>Save the output to a patch file</source> + <translation>Speichere die Ausgabe in eine Patchdatei</translation> + </message> + <message> + <location filename="UI/DiffDialog.py" line="311"/> + <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="UI/DiffDialog.py" line="202"/> + <source>Compare</source> + <translation>Vergleichen</translation> + </message> + <message> <location filename="UI/DiffDialog.py" line="206"/> - <source>Save the output to a patch file</source> - <translation>Speichere die Ausgabe in eine Patchdatei</translation> - </message> - <message> - <location filename="UI/DiffDialog.py" line="310"/> - <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="UI/DiffDialog.py" line="201"/> - <source>Compare</source> - <translation>Vergleichen</translation> - </message> - <message> - <location filename="UI/DiffDialog.py" line="205"/> <source>Save</source> <translation>Speichern</translation> </message> @@ -6603,7 +6602,7 @@ <translation>Wähle den anzuwendenden Pygments Lexer.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5417"/> + <location filename="QScintilla/Editor.py" line="5418"/> <source>Check spelling...</source> <translation>Rechtschreibprüfung...</translation> </message> @@ -6613,12 +6612,12 @@ <translation>Rechtschreibprüfung für Auswahl...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5419"/> + <location filename="QScintilla/Editor.py" line="5420"/> <source>Add to dictionary</source> <translation>Zum Wörterbuch hinzufügen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5421"/> + <location filename="QScintilla/Editor.py" line="5422"/> <source>Ignore All</source> <translation>Alle ignorieren</translation> </message> @@ -9599,22 +9598,22 @@ <context> <name>EricdocConfigDialog</name> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="257"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="260"/> <source>Select output directory</source> <translation>Wähle ein Ausgabeverzeichnis</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="282"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="285"/> <source>Select directory to exclude</source> <translation>Wähle ein zu ignorierendes Verzeichnis</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Style Sheet (*.css);;Alle Dateien (*)</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Select CSS style sheet</source> <translation>Wähle ein CSS Style Sheet</translation> </message> @@ -9839,11 +9838,6 @@ <translation>Dies zeigt ein Beispiel für die ausgewählten Farben.</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> - <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Level 1 Header</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Level 2 Header</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Class and Function Header</h2>Standard body text with <a style="color:%(LinkColor)s">some links</a> embedded.</body></html></source> - <translation><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Ebene 1 Titel</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Ebene 2 Titel</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Klassen und Funktionen Titel</h2>Normaler Text mit eingebetteten <a style="color:%(LinkColor)s">Verweisen</a>.</body></html></translation> - </message> - <message> <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="153"/> <source>Exclude Files:</source> <translation>Ignoriere Dateien:</translation> @@ -9919,7 +9913,7 @@ <translation>Gib einen Kurztitel für den obersten Eintrag ein</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="468"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="471"/> <source>Select output directory for QtHelp files</source> <translation>Wähle das Verzeichnis für die QtHelp Dateien</translation> </message> @@ -9933,6 +9927,11 @@ <source>Generate QtHelp collection files</source> <translation>Erzeuge QtHelp Kollektionsdateien</translation> </message> + <message> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> + <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title></title></head><body style="background-color:{BodyBgColor};color:{BodyColor}"><h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}">Level 1 Header</h1><h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}">Level 2 Header</h3><h2 style="background-color:{CFBgColor};color:{CFColor}">Class and Function Header</h2>Standard body text with <a style="color:{LinkColor}">some links</a> embedded.</body></html></source> + <translation><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title></title></head><body style="background-color:{BodyBgColor};color:{BodyColor}"><h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}">Ebene 1 Titel</h1><h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}">Ebene 2 Titel</h3><h2 style="background-color:{CFBgColor};color:{CFColor}">Klassen und Funktionen Titel</h2>Normaler Text mit eingebetteten <a style="color:{LinkColor}">Verweisen</a>.</body></html></translation> + </message> </context> <context> <name>EricdocExecDialog</name> @@ -10147,12 +10146,12 @@ <context> <name>ExporterHTML</name> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source>Export source</source> <translation>Quelltext exportieren</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Der Quelltext konnte nicht nach <b>{0}</b> exportiert werden.</p><p>Ursache: {1}</p></translation> </message> @@ -10165,17 +10164,17 @@ <context> <name>ExporterPDF</name> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="403"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="405"/> <source>PDF Files (*.pdf)</source> <translation>PDF Dateien (*.pdf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source>Export source</source> <translation>Quelltext exportieren</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Der Quelltext konnte nicht nach <b>{0}</b> exportiert werden.</p><p>Ursache: {1}</p></translation> </message> @@ -10188,12 +10187,12 @@ <translation>RTF Dateien (*.rtf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source>Export source</source> <translation>Quelltext exportieren</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Der Quelltext konnte nicht nach <b>{0}</b> exportiert werden.</p><p>Ursache: {1}</p></translation> </message> @@ -10201,17 +10200,17 @@ <context> <name>ExporterTEX</name> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="104"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="105"/> <source>TeX Files (*.tex)</source> <translation>TeX Dateien (*.tex)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source>Export source</source> <translation>Quelltext exportieren</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Der Quelltext konnte nicht nach <b>{0}</b> exportiert werden.</p><p>Ursache: {1}</p></translation> </message> @@ -11151,7 +11150,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="708"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -13574,152 +13573,152 @@ <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pull von einem entfernten Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Pushing to a remote Mercurial repository</source> <translation>Push in ein entferntes Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1451"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1452"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1485"/> <source>Creating branch in the Mercurial repository</source> <translation>Erzeuge Zweig im Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifiziere die Integrität des Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1851"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1507"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1508"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1762"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1865"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1878"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1906"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1649"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Removing files from the Mercurial repository only</source> <translation>Lösche Dateien nur aus dem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1738"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation><p>Die Mercurial Änderungsgruppendatei <b>{0}</b> existiert bereits.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> @@ -22598,12 +22597,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="863"/> + <location filename="Preferences/__init__.py" line="871"/> <source>Export Preferences</source> <translation>Konfiguration exportieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="882"/> + <location filename="Preferences/__init__.py" line="890"/> <source>Import Preferences</source> <translation>Konfiguration importieren</translation> </message> @@ -28601,8 +28600,8 @@ </message> <message> <location filename="SqlBrowser/SqlBrowser.py" line="62"/> - <source>Unable to open connection: %s</source> - <translation>Verbindung konnte nicht geöffnet werden: %s</translation> + <source>Unable to open connection: {0}</source> + <translation>Verbindung konnte nicht geöffnet werden: {0}</translation> </message> </context> <context> @@ -29563,62 +29562,62 @@ <translation>Expotiere das Projekt aus dem Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>Subversion Error</source> <translation>Subversion Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="920"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Die URL des Projektrepositories konnte nicht aus der Arbeitskopie ermittelt werden. Die Tag Operation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="943"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="944"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Die URL des Projektrepositories hat ein ungültiges Format. Die Tag Operation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="978"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="979"/> <source>Tagging {0} in the Subversion repository</source> <translation>Markiere {0} im Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1032"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1033"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Die URL des Projektrepositories konnte nicht aus der Arbeitskopie ermittelt werden. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Die URL des Projektrepositories hat ein ungültiges Format. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1079"/> <source>Switching to {0}</source> <translation>Schalte {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1177"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1178"/> <source>Merging {0}</source> <translation>Arbeite Änderungen in {0} ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1297"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1298"/> <source>Cleaning up {0}</source> <translation>Räume {0} auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1333"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1334"/> <source>Subversion command</source> <translation>Subversion Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1479"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1480"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Moving {0}</source> <translation>Verschiebe {0}</translation> </message> @@ -29633,22 +29632,22 @@ <translation>Subversion Export</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1547"/> <source>Subversion Set Property</source> <translation>Subversion Eigenschaft definieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1580"/> <source>You have to supply a property name. Aborting.</source> <translation>Sie müssen einen Namen für die Eigenschaft angeben. Abbruch.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1598"/> <source>Subversion Delete Property</source> <translation>Subversion Eigenschaft löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1419"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1420"/> <source>Enter property name</source> <translation>Gib den Namen der Eigenschaft ein</translation> </message> @@ -29663,27 +29662,27 @@ <translation>Gleiche mit dem Subversion Repository ab</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="652"/> <source>Adding files/directories to the Subversion repository</source> <translation>Füge Dateien/Verzeichnisse dem Subversion Repository hinzu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="725"/> <source>Adding directory trees to the Subversion repository</source> <translation>Füge Verzeichnisbäume dem Subversion Repository hinzu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="760"/> <source>Removing files/directories from the Subversion repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1007"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1008"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1440"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1441"/> <source>Resolving conficts</source> <translation>Löse Konflikte</translation> </message> @@ -29708,22 +29707,22 @@ <translation>Das Projekt konnte nicht aus dem Repository geladen werden.<br />Stelle das Original wieder her.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Subversion Log</source> <translation>Subversion Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1782"/> <source>Locking in the Subversion repository</source> <translation>Sperren im Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1820"/> <source>Unlocking in the Subversion repository</source> <translation>Entsperren im Subversion Repository</translation> </message> @@ -29733,34 +29732,34 @@ <translation>Revision {0} eingepflegt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1086"/> <source>Revision {0}. </source> <translation>Revision {0}. </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Property set.</source> <translation>Eigenschaft definiert.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> <source>Property deleted.</source> <translation>Eigenschaft gelöscht.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Subversion Lock</source> <translation>Subversion Sperre</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Enter lock comment</source> <translation>Gib eine Kommentar für die Sperre ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1865"/> <source>Relocating</source> <translation>Relozierung</translation> </message> @@ -29937,27 +29936,27 @@ <translation>Das svn Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Repository Browser</source> <translation>Repository Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Enter the repository URL.</source> <translation>Gib die URL des Repository ein.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1914"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1915"/> <source>Remove from changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1951"/> <source>Add to changelist</source> <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1940"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1941"/> <source>Enter name of the changelist:</source> <translation>Gib deb Namen der Änderungsliste ein:</translation> </message> @@ -33875,11 +33874,6 @@ <translation>Gib den Symbolcode ein</translation> </message> <message> - <location filename="UI/SymbolsWidget.ui" line="25"/> - <source>Table:</source> - <translation type="obsolete">Tabelle:</translation> - </message> - <message> <location filename="UI/SymbolsWidget.ui" line="38"/> <source>Select the table to be shown</source> <translation>Wähle die anzuzeigende Tabelle</translation> @@ -35000,7 +34994,7 @@ <context> <name>TemplateViewer</name> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source>Edit Template Group</source> <translation>Vorlagengruppe editieren</translation> </message> @@ -35020,7 +35014,7 @@ <translation>Vorlagen exportieren</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source><p>A template group with the name <b>{0}</b> already exists.</p></source> <translation><p>Eine Vorlagengruppe mit dem Namen <b>{0}</b> existiert bereits.</p></translation> </message> @@ -35085,27 +35079,27 @@ <translation>Vorlagen Dateien (*.e4c);;Alle Dateien (*)</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source>Save templates</source> <translation>Vorlagen speichern</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source><p>The templates file <b>{0}</b> could not be written.</p></source> <translation><p>Die Vorlagendatei <b>{0}</b> konnte nicht geschrieben werden.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source>Read templates</source> <translation>Vorlagen lesen</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="921"/> + <location filename="Templates/TemplateViewer.py" line="919"/> <source><p>The templates file <b>{0}</b> could not be read.</p></source> <translation><p>Die Vorlagendatei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source><p>The templates file <b>{0}</b> has an unsupported format.</p></source> <translation><p>Die Vorlagendatei <b>{0}</b> hat ein nicht unterstütztes Format.</p></translation> </message> @@ -42779,12 +42773,12 @@ <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1405"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1409"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> @@ -42815,24 +42809,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Spitze</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1400"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1401"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1415"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -42904,17 +42898,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1245"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1246"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Repository Informationen</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{2}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{3}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{4}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{5}</td></tr><tr><td><b>Letzter Autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1374"/> - <source>unknown</source> - <translation>Unbekannt</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> + <source>unknown</source> + <translation>Unbekannt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1376"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Repository Informationen</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{4}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{5}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{6}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{7}</td></tr><tr><td><b>Letzter Autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_es.ts Fri Jul 30 12:55:36 2010 +0200 +++ b/i18n/eric5_es.ts Fri Jul 30 18:26:19 2010 +0200 @@ -3406,7 +3406,7 @@ <translation>error de uic</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source>Code Generation</source> <translation>Generación de Código</translation> </message> @@ -3436,7 +3436,7 @@ <translation><p>No se ha podido abrir el archivo de codigo fuente "{0}".</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>No se ha podido escribir en el archivo de codigo fuente "{0}".</p><p>Razón: {1}</p></translation> </message> @@ -4561,22 +4561,22 @@ <translation><p>No ha sido posible lanzar el extremo del depurador.</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Parent Process</source> <translation>Proceso Padre</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Child process</source> <translation>Proceso hijo</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Client forking</source> <translation>Fork del cliente</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Select the fork branch to follow.</source> <translation>Seleccionar la rama de fork para continuar.</translation> </message> @@ -4599,22 +4599,22 @@ <translation><p>No ha sido posible lanzar el extremo del depurador.</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Parent Process</source> <translation>Proceso Padre</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Child process</source> <translation>Proceso hijo</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Client forking</source> <translation>Fork del cliente</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Select the fork branch to follow.</source> <translation>Seleccionar la rama de fork para continuar.</translation> </message> @@ -5209,62 +5209,62 @@ <translation>Alt+N</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="201"/> + <location filename="UI/DiffDialog.py" line="202"/> <source>Compare</source> <translation>Comparar</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="202"/> + <location filename="UI/DiffDialog.py" line="203"/> <source>Press to perform the comparison of the two files</source> <translation>Pulse para realizar la comparación de los dos archivos</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="205"/> - <source>Save</source> - <translation>Guardar</translation> - </message> - <message> <location filename="UI/DiffDialog.py" line="206"/> + <source>Save</source> + <translation>Guardar</translation> + </message> + <message> + <location filename="UI/DiffDialog.py" line="207"/> <source>Save the output to a patch file</source> <translation>Guardar la salida a un fichero de parche</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="310"/> + <location filename="UI/DiffDialog.py" line="311"/> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="272"/> + <location filename="UI/DiffDialog.py" line="273"/> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source>Compare Files</source> <translation>Comparar Archivos</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="444"/> + <location filename="UI/DiffDialog.py" line="445"/> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="463"/> + <location filename="UI/DiffDialog.py" line="464"/> <source>Select file to compare</source> <translation>Seleccione el archivo a comparar</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="289"/> + <location filename="UI/DiffDialog.py" line="290"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation><p>El archivo de parche <b>{0}</b> ya existe.</p></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="310"/> + <location filename="UI/DiffDialog.py" line="311"/> <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="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation> </message> @@ -6539,7 +6539,7 @@ <translation>Seleccionar el Analizador Léxico de Pygments.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5417"/> + <location filename="QScintilla/Editor.py" line="5418"/> <source>Check spelling...</source> <translation>Corrección ortográfica...</translation> </message> @@ -6549,12 +6549,12 @@ <translation>Corrección ortográfica de la selección...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5419"/> + <location filename="QScintilla/Editor.py" line="5420"/> <source>Add to dictionary</source> <translation>Añadir al diccionario</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5421"/> + <location filename="QScintilla/Editor.py" line="5422"/> <source>Ignore All</source> <translation>Ignorar Todo</translation> </message> @@ -9839,25 +9839,25 @@ <message> <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Level 1 Header</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Level 2 Header</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Class and Function Header</h2>Standard body text with <a style="color:%(LinkColor)s">some links</a> embedded.</body></html></source> - <translation><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Encabezamiento de nivel 1</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Encabezamiento de nivel 2</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Clase y encabezamiento de función</h2>Texto estándar del cuerpo con <a style="color:%(LinkColor)s">algunos enlaces </a> embebidos.</body></html></translation> - </message> - <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="257"/> + <translation type="obsolete"><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Encabezamiento de nivel 1</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Encabezamiento de nivel 2</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Clase y encabezamiento de función</h2>Texto estándar del cuerpo con <a style="color:%(LinkColor)s">algunos enlaces </a> embebidos.</body></html></translation> + </message> + <message> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="260"/> <source>Select output directory</source> <translation>Seleccionar Directorio de salida </translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="282"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="285"/> <source>Select directory to exclude</source> <translation>Seleccionar directorios a excluir</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Select CSS style sheet</source> <translation>Seleccionar hoja de estilos CSS</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Hojas de estilos (*.css);; Todos los archivos (*)</translation> </message> @@ -9932,10 +9932,15 @@ <translation>Generar colección de archivos de QtHelp</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="468"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="471"/> <source>Select output directory for QtHelp files</source> <translation>Seleccionar directorio de salida para los archivos de QtHelp</translation> </message> + <message> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> + <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title></title></head><body style="background-color:{BodyBgColor};color:{BodyColor}"><h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}">Level 1 Header</h1><h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}">Level 2 Header</h3><h2 style="background-color:{CFBgColor};color:{CFColor}">Class and Function Header</h2>Standard body text with <a style="color:{LinkColor}">some links</a> embedded.</body></html></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EricdocExecDialog</name> @@ -10151,12 +10156,12 @@ <translation>Archivos HTML (*.html)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source>Export source</source> <translation>Exportar código fuente</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>El código fuente no se ha podido exportar a <b>{0}</b>.</p><p>Razón: {1}</p></translation> </message> @@ -10164,17 +10169,17 @@ <context> <name>ExporterPDF</name> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="403"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="405"/> <source>PDF Files (*.pdf)</source> <translation>Archivos PDF (*.pdf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source>Export source</source> <translation>Exportar código fuente</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>La fuente no se ha podido exportar a <b>{0}</b>.</p><p>Razón: {1}</p></translation> </message> @@ -10187,12 +10192,12 @@ <translation>Archivos RTF (*.rtf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source>Export source</source> <translation>Exportar código fuente</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>La fuente no se ha podido exportar a <b>{0}</b>.</p><p>Razón: {1}</p></translation> </message> @@ -10200,17 +10205,17 @@ <context> <name>ExporterTEX</name> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="104"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="105"/> <source>TeX Files (*.tex)</source> <translation>Archivos TeX (*.tex)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source>Export source</source> <translation>Exportar código fuente</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>La fuente no se ha podido exportar a <b>{0}</b>.</p><p>Razón: {1}</p></translation> </message> @@ -13567,32 +13572,32 @@ <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Select number of entries to show.</source> <translation>Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> <source>Pulling from a remote Mercurial repository</source> <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1451"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1452"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> @@ -13612,122 +13617,122 @@ <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1485"/> <source>Creating branch in the Mercurial repository</source> <translation>Creando branch en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verificando la integridad del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing the combined configuration settings</source> <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1851"/> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1507"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1508"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1762"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1865"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1878"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1906"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1649"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Removing files from the Mercurial repository only</source> <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1738"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> @@ -22606,12 +22611,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="863"/> + <location filename="Preferences/__init__.py" line="871"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="882"/> + <location filename="Preferences/__init__.py" line="890"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> @@ -28580,7 +28585,12 @@ <message> <location filename="SqlBrowser/SqlBrowser.py" line="62"/> <source>Unable to open connection: %s</source> - <translation>No se ha podido abrir la conexión: {0}</translation> + <translation type="obsolete">No se ha podido abrir la conexión: {0}</translation> + </message> + <message> + <location filename="SqlBrowser/SqlBrowser.py" line="62"/> + <source>Unable to open connection: {0}</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -29591,132 +29601,132 @@ <translation>Sincronizando con el repositorio de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="652"/> <source>Adding files/directories to the Subversion repository</source> <translation>Añadiendo archivos/directorios al repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="725"/> <source>Adding directory trees to the Subversion repository</source> <translation>Añadiendo árboles de directorios al repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="760"/> <source>Removing files/directories from the Subversion repository</source> <translation>Eliminando archivos/directorios del repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>Subversion Error</source> <translation>Error de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="920"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>La URL del repositorio del proyecto no ha podido recuperarse de la copia de trabajo. La operación tag se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="943"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="944"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>La URL del repositorio del proyecto tiene un formato no válido. La operación tag se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1007"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1008"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1032"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1033"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>La URL del repositorio del proyecto no ha podido recuperarse de la copia de trabajo. La operación switch se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>La URL del repositorio del proyecto tiene un formato no válido. La operación switch se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1333"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1334"/> <source>Subversion command</source> <translation>Comando de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1440"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1441"/> <source>Resolving conficts</source> <translation>Resolviendo conflictos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1547"/> <source>Subversion Set Property</source> <translation>Asignar Propiedad de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1580"/> <source>You have to supply a property name. Aborting.</source> <translation>Tiene que proporcionar un nombre de propiedad. Abortando.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1598"/> <source>Subversion Delete Property</source> <translation>Borrar Propiedad de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1419"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1420"/> <source>Enter property name</source> <translation>Introducir nombre de la propiedad</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Subversion Log</source> <translation>Log de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Select number of entries to show.</source> <translation>Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1782"/> <source>Locking in the Subversion repository</source> <translation>Bloqueando en el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1820"/> <source>Unlocking in the Subversion repository</source> <translation>Desbloqueando en el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Property set.</source> <translation>Propiedad establecida.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> <source>Property deleted.</source> <translation>Propiedad borrada.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Subversion Lock</source> <translation>Bloqueo de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Enter lock comment</source> <translation>Introducir comentario para el bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1865"/> <source>Relocating</source> <translation>Realojando</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Repository Browser</source> <translation>Navegador de Repositorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Enter the repository URL.</source> <translation>Introducir la URL del repositorio.</translation> </message> @@ -29871,17 +29881,17 @@ <translation>Sin versionar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1914"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1915"/> <source>Remove from changelist</source> <translation>Quitar de la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1951"/> <source>Add to changelist</source> <translation>Añadir a la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1940"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1941"/> <source>Enter name of the changelist:</source> <translation>Introduzca el nombre de la lista de cambios:</translation> </message> @@ -29906,32 +29916,32 @@ <translation>El proceso svn ha terminado con código de salida {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Moving {0}</source> <translation>Moviendo {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="978"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="979"/> <source>Tagging {0} in the Subversion repository</source> <translation>Haciendo un tag {0} en el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1079"/> <source>Switching to {0}</source> <translation>Haciendo un switch a {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1177"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1178"/> <source>Merging {0}</source> <translation>Haciendo un merge de {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1297"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1298"/> <source>Cleaning up {0}</source> <translation>Limpiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1479"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1480"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> @@ -29947,7 +29957,7 @@ <translation>Commit realizado para revisión {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1086"/> <source>Revision {0}. </source> <translation>Revisión {0}.</translation> @@ -35033,17 +35043,17 @@ <translation>Ayuda para la plantilla</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source>Edit Template Group</source> <translation>Editar Grupo de Plantillas</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source>Save templates</source> <translation>Guardar plantillas</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source>Read templates</source> <translation>Leer plantillas</translation> </message> @@ -35063,22 +35073,22 @@ <translation><p><b>Los rupos de plantillas</b> son un medio para agrupar plantillas individuales. Los grupos tienen un atributo que especifica a qué lenguaje de programación se aplican. Para añadir entradas de plantillas tiene que haber definido al menos un grupo.</p><p><b>Las entradas de plantillas</b> son las plantillas en si. Se agrupan en grupos de plantillas. En el diálogo de edición de plantilla hay disponible un texto de ayuda acerca de cómo definirlas. Hay un ejemplo de plantilla disponible en el subdirectorio Examples de la distribución de eric5.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source><p>A template group with the name <b>{0}</b> already exists.</p></source> <translation><p>Un grupo de plantillas con el nombre <b>{0}</b> ya existe.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source><p>The templates file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de plantillas <b>{0}</b> no pudo ser guardado.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="921"/> + <location filename="Templates/TemplateViewer.py" line="919"/> <source><p>The templates file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de plantillas <b>{0}</b> no pudo ser leído.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source><p>The templates file <b>{0}</b> has an unsupported format.</p></source> <translation><p>El archivo de plantillas <b>{0}</b> tiene un formato no soportado.</p></translation> </message> @@ -42735,17 +42745,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1405"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1409"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1415"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -42756,19 +42766,19 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1400"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1401"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> @@ -42867,17 +42877,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1374"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1245"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1246"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Información del repositorio</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Revisión actual</b></td><td>{2}</td></tr><tr><td><b>Revisión enviada</b></td><td>{3}</td></tr><tr><td><b>Fecha de envío</b></td><td>{4}</td></tr><tr><td><b>Hora de envío</b></td><td>{5}</td></tr><tr><td><b>Último autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1376"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Information del repositorio</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Revisión enviada</b></td><td>{5}</td></tr><tr><td><b>Fecha de envío</b></td><td>{6}</td></tr><tr><td><b>Hora de envio</b></td><td>{7}</td></tr><tr><td><b>Último autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_fr.ts Fri Jul 30 12:55:36 2010 +0200 +++ b/i18n/eric5_fr.ts Fri Jul 30 18:26:19 2010 +0200 @@ -3632,7 +3632,7 @@ <translation>Filtrer &avec:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source>Code Generation</source> <translation>Génération de code</translation> </message> @@ -3697,7 +3697,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -4937,22 +4937,22 @@ <translation><p>Impossible de lancer le débogueur en arrière-plan.</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Parent Process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Child process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Client forking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Select the fork branch to follow.</source> <translation type="unfinished"></translation> </message> @@ -4975,22 +4975,22 @@ <translation type="unfinished"><p>Impossible de lancer le débogueur en arrière-plan.</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Parent Process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Child process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Client forking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Select the fork branch to follow.</source> <translation type="unfinished"></translation> </message> @@ -5551,27 +5551,27 @@ <context> <name>DiffDialog</name> <message> - <location filename="UI/DiffDialog.py" line="272"/> + <location filename="UI/DiffDialog.py" line="273"/> <source>Patch Files (*.diff)</source> <translation>Fichiers Patch (*.diff)</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="310"/> + <location filename="UI/DiffDialog.py" line="311"/> <source>Save Diff</source> <translation>Enregistrer Diff</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source>Compare Files</source> <translation>Comparaison de fichiers</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="444"/> + <location filename="UI/DiffDialog.py" line="445"/> <source>There is no difference.</source> <translation>Aucune différence.</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="463"/> + <location filename="UI/DiffDialog.py" line="464"/> <source>Select file to compare</source> <translation>Sélectionner un fichier à comparer</translation> </message> @@ -5651,12 +5651,12 @@ <translation>Alt+N</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="202"/> + <location filename="UI/DiffDialog.py" line="203"/> <source>Press to perform the comparison of the two files</source> <translation>Cliquer pour effectuer la comparaison des fichiers</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="206"/> + <location filename="UI/DiffDialog.py" line="207"/> <source>Save the output to a patch file</source> <translation>Enregistrer dans un fichier patch</translation> </message> @@ -5666,27 +5666,27 @@ <translation type="obsolete"><p>Impossible d'enregistrer le fichier patch <b>%1</b>.<br>Raison: %2</p></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="201"/> + <location filename="UI/DiffDialog.py" line="202"/> <source>Compare</source> <translation>Comparer</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="205"/> + <location filename="UI/DiffDialog.py" line="206"/> <source>Save</source> <translation>Enregistrer</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="289"/> + <location filename="UI/DiffDialog.py" line="290"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="310"/> + <location filename="UI/DiffDialog.py" line="311"/> <source><p>The patch file <b>{0}</b> could not be saved.<br />Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> @@ -7341,7 +7341,7 @@ <translation>Sélectionne l'analyseur Pygments à appliquer.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5417"/> + <location filename="QScintilla/Editor.py" line="5418"/> <source>Check spelling...</source> <translation>Correction orthographique...</translation> </message> @@ -7351,12 +7351,12 @@ <translation>Correction orthographique de la sélection...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5419"/> + <location filename="QScintilla/Editor.py" line="5420"/> <source>Add to dictionary</source> <translation>Ajouter au dictionnaire</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5421"/> + <location filename="QScintilla/Editor.py" line="5422"/> <source>Ignore All</source> <translation>Tout ignorer</translation> </message> @@ -10511,22 +10511,22 @@ <context> <name>EricdocConfigDialog</name> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="257"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="260"/> <source>Select output directory</source> <translation>Sélection du répertoire de sortie</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="282"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="285"/> <source>Select directory to exclude</source> <translation>Sélection des répertoires à exclure</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Feuille de style (*.css);;Tous les fichiers (*)</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Select CSS style sheet</source> <translation>Sélection d'une feuille de style CSS</translation> </message> @@ -10753,7 +10753,7 @@ <message> <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Level 1 Header</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Level 2 Header</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Class and Function Header</h2>Standard body text with <a style="color:%(LinkColor)s">some links</a> embedded.</body></html></source> - <translation><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">En-tête de niveau 1</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">En-tête de niveau 2</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">En-tête de classes et fonctions</h2>Corps de texte standard avec <a style="color:%(LinkColor)s">un lien</a> intégré dans le texte.</body></html></translation> + <translation type="obsolete"><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">En-tête de niveau 1</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">En-tête de niveau 2</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">En-tête de classes et fonctions</h2>Corps de texte standard avec <a style="color:%(LinkColor)s">un lien</a> intégré dans le texte.</body></html></translation> </message> <message> <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="153"/> @@ -10831,7 +10831,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="468"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="471"/> <source>Select output directory for QtHelp files</source> <translation type="unfinished"></translation> </message> @@ -10845,6 +10845,11 @@ <source>Generate QtHelp collection files</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> + <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title></title></head><body style="background-color:{BodyBgColor};color:{BodyColor}"><h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}">Level 1 Header</h1><h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}">Level 2 Header</h3><h2 style="background-color:{CFBgColor};color:{CFColor}">Class and Function Header</h2>Standard body text with <a style="color:{LinkColor}">some links</a> embedded.</body></html></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EricdocExecDialog</name> @@ -11105,7 +11110,7 @@ <context> <name>ExporterHTML</name> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source>Export source</source> <translation>Exportation de source</translation> </message> @@ -11120,7 +11125,7 @@ <translation>Fichiers HTML (*.html)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -11128,12 +11133,12 @@ <context> <name>ExporterPDF</name> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="403"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="405"/> <source>PDF Files (*.pdf)</source> <translation>Fichiers PDF (*.pdf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source>Export source</source> <translation>Exportation de source</translation> </message> @@ -11143,7 +11148,7 @@ <translation type="obsolete"><p>Impossible d'exporter la source <b>%1</b>.</p><p>Raison: %2</p></translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -11156,7 +11161,7 @@ <translation>Fichiers RTF (*.rtf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source>Export source</source> <translation>Exportation de source</translation> </message> @@ -11166,7 +11171,7 @@ <translation type="obsolete"><p>Impossible d'exporter la source <b>%1</b>.</p><p>Raison: %2</p></translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -11174,12 +11179,12 @@ <context> <name>ExporterTEX</name> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="104"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="105"/> <source>TeX Files (*.tex)</source> <translation>Fichiers TeX (*.tex)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source>Export source</source> <translation>Exportation de source</translation> </message> @@ -11189,7 +11194,7 @@ <translation type="obsolete"><p>Impossible d'exporter la source <b>%1</b>.</p><p>Raison: %2</p></translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -14904,152 +14909,152 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Select number of entries to show.</source> <translation type="unfinished">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1451"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1452"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1485"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1851"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1507"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1508"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1762"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1865"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1878"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1906"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1649"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1738"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -24516,12 +24521,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="863"/> + <location filename="Preferences/__init__.py" line="871"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="882"/> + <location filename="Preferences/__init__.py" line="890"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> @@ -31528,7 +31533,7 @@ </message> <message> <location filename="SqlBrowser/SqlBrowser.py" line="62"/> - <source>Unable to open connection: %s</source> + <source>Unable to open connection: {0}</source> <translation type="unfinished"></translation> </message> </context> @@ -32695,17 +32700,17 @@ <translation>Exporter un projet du référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>Subversion Error</source> <translation>Erreur Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="920"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel à partir de la copie locale. Abandon de l'opération d'étiquetage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="943"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="944"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération d'étiquetage</translation> </message> @@ -32715,12 +32720,12 @@ <translation type="obsolete">Etiquetage de %1 dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1032"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1033"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel du projet depuis la copie locale. Abandon de l'opération</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération</translation> </message> @@ -32740,7 +32745,7 @@ <translation type="obsolete">Nettoyage de %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1333"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1334"/> <source>Subversion command</source> <translation>Commande Subversion</translation> </message> @@ -32755,22 +32760,22 @@ <translation type="obsolete">Déplacement de %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1547"/> <source>Subversion Set Property</source> <translation>Propriété Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1580"/> <source>You have to supply a property name. Aborting.</source> <translation>Vous devez donner un nom à la propriété. Abandon.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1598"/> <source>Subversion Delete Property</source> <translation>Suppression d'une propriété Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1419"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1420"/> <source>Enter property name</source> <translation>Entrer le nom de la propriété</translation> </message> @@ -32785,27 +32790,27 @@ <translation>Synchronisation avec le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="652"/> <source>Adding files/directories to the Subversion repository</source> <translation>Ajouter des fichiers/répertoires au référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="725"/> <source>Adding directory trees to the Subversion repository</source> <translation>Ajouter des arborescences de répertoires dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="760"/> <source>Removing files/directories from the Subversion repository</source> <translation>Supprimer des fichiers/répertoires du réferentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1007"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1008"/> <source>Reverting changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1440"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1441"/> <source>Resolving conficts</source> <translation>Résoudre les confits</translation> </message> @@ -32830,22 +32835,22 @@ <translation>Le projet n'a pu être mis à jour à partir du référentiel.<br />Restauration du contenu initial.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Subversion Log</source> <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Select number of entries to show.</source> <translation>Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1782"/> <source>Locking in the Subversion repository</source> <translation>Verrouillage dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1820"/> <source>Unlocking in the Subversion repository</source> <translation>Déverrouillage dans le référentiel Subversion</translation> </message> @@ -32862,27 +32867,27 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Property set.</source> <translation>Propriété définie.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> <source>Property deleted.</source> <translation>Propriété supprimée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Subversion Lock</source> <translation>Verrou Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Enter lock comment</source> <translation>Entrer un commentaire pour le verrou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1865"/> <source>Relocating</source> <translation>Déplacement</translation> </message> @@ -33058,27 +33063,27 @@ <translation>Impossible de lancer l'executable SVN.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Repository Browser</source> <translation>Navigateur de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Enter the repository URL.</source> <translation>Entrer l'URL du référentiel.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1914"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1915"/> <source>Remove from changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1951"/> <source>Add to changelist</source> <translation>Ajouter à la liste des modifications:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1940"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1941"/> <source>Enter name of the changelist:</source> <translation>Entrer le nom de la liste des modifications:</translation> </message> @@ -33103,32 +33108,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Moving {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="978"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="979"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1079"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1177"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1178"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1297"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1298"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1479"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1480"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -33144,7 +33149,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1086"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -38430,7 +38435,7 @@ <context> <name>TemplateViewer</name> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source>Edit Template Group</source> <translation>Edition du Groupe de gabarits</translation> </message> @@ -38525,7 +38530,7 @@ <translation type="obsolete"><p>Les <b>Groupes de gabarits</b> sont des ensembles de gabarits individuels. Les groupes ont un attribut indiquant pour quel langage de programmation ils doivent être appliqués. Pour ajouter des nouveaux gabarits, au moins un groupe doit déjà exister.</p><p>Les entrées <b>Gabarits</b> désignent les gabarits eux-mêmes; ils sont rassemblés dans les groupes de gabarits. Pour savoir comment les définir, consulter l'aide dans la fenêtre d'édition des gabarits. Il y a un exemple de gabarit dans le répertoire Examples du répertoire eric4.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source>Save templates</source> <translation>Enregistrement des gabarits</translation> </message> @@ -38535,7 +38540,7 @@ <translation type="obsolete"><p>Impossible de d'écrire le fichier gabarit <b>%1</b>.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source>Read templates</source> <translation>Lecture des gabarits</translation> </message> @@ -38565,22 +38570,22 @@ <translation type="unfinished"><p>Les <b>Groupes de gabarits</b> sont des ensembles de gabarits individuels. Les groupes ont un attribut indiquant pour quel langage de programmation ils doivent être appliqués. Pour ajouter des nouveaux gabarits, au moins un groupe doit déjà exister.</p><p>Les entrées <b>Gabarits</b> désignent les gabarits eux-mêmes; ils sont rassemblés dans les groupes de gabarits. Pour savoir comment les définir, consulter l'aide dans la fenêtre d'édition des gabarits. Il y a un exemple de gabarit dans le répertoire Examples du répertoire eric4.</p> {5 ?}</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source><p>A template group with the name <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source><p>The templates file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="921"/> + <location filename="Templates/TemplateViewer.py" line="919"/> <source><p>The templates file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source><p>The templates file <b>{0}</b> has an unsupported format.</p></source> <translation type="unfinished"></translation> </message> @@ -47042,12 +47047,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1405"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1409"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -47070,23 +47075,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1400"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1401"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1415"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -47161,7 +47166,7 @@ en cours</b></td><td>%3</td></tr><tr><td><b>Version "commitée"</b></td><td>%4</td></tr><tr><td><b>Date du commit</b></td><td>%5</td></tr><tr><td><b>Heure du commit</b></td><td>%6</td></tr><tr><td><b>Dernier auteur</b></td><td>%7</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1374"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> <source>unknown</source> <translation>inconnu</translation> </message> @@ -47171,12 +47176,12 @@ <translation type="obsolete"><h3>Informations sur le référentiel</h3><table><tr><td><b>PySvn V.</b></td><td>%1</td></tr><tr><td><b>Subversion V.</b></td><td>%2</td></tr><tr><td><b>API Subversion V.</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>Révision actuelle</b></td><td>%5</td></tr><tr><td><b>Révision validée</b></td><td>%6</td></tr><tr><td><b>Date de validation</b></td><td>%7</td></tr><tr><td><b>Heure de validation</b></td><td>%8</td></tr><tr><td><b>Dernier auteur</b></td><td>%9</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1245"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1246"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1376"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Fri Jul 30 12:55:36 2010 +0200 +++ b/i18n/eric5_it.ts Fri Jul 30 18:26:19 2010 +0200 @@ -3401,7 +3401,7 @@ <translation>&Filtra con:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source>Code Generation</source> <translation>Generazione del codice</translation> </message> @@ -3436,7 +3436,7 @@ <translation><p>Non posso aprire il file sorgente "{0}".</p><p>Ragione: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Non posso scrivere il file sorgente "{0}".</p><p>Ragione: {1}</p></translation> </message> @@ -4561,22 +4561,22 @@ <translation><p>Il debugger non può essere avviato.</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Parent Process</source> <translation>Processo padre</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Child process</source> <translation>Processo figlio</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Client forking</source> <translation>Lancio processo figlio in corso</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Select the fork branch to follow.</source> <translation>Seleziona il client da seguire.</translation> </message> @@ -4599,22 +4599,22 @@ <translation><p>Il debugger non può essere avviato.</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Parent Process</source> <translation>Processo padre</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Child process</source> <translation>Processo figlio</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Client forking</source> <translation>Lancio processo figlio in corso</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Select the fork branch to follow.</source> <translation>Seleziona il client da seguire.</translation> </message> @@ -5142,27 +5142,27 @@ <context> <name>DiffDialog</name> <message> - <location filename="UI/DiffDialog.py" line="272"/> + <location filename="UI/DiffDialog.py" line="273"/> <source>Patch Files (*.diff)</source> <translation>File Patch (*.diff)</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="310"/> + <location filename="UI/DiffDialog.py" line="311"/> <source>Save Diff</source> <translation>Salva Diff</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source>Compare Files</source> <translation>Confronta File</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="444"/> + <location filename="UI/DiffDialog.py" line="445"/> <source>There is no difference.</source> <translation>Non ci sono differenze.</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="463"/> + <location filename="UI/DiffDialog.py" line="464"/> <source>Select file to compare</source> <translation>Seleziona file da confrontare</translation> </message> @@ -5232,37 +5232,37 @@ <translation>Alt+N</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="202"/> + <location filename="UI/DiffDialog.py" line="203"/> <source>Press to perform the comparison of the two files</source> <translation>Premi per effettuare il confronto tra due file</translation> </message> <message> + <location filename="UI/DiffDialog.py" line="207"/> + <source>Save the output to a patch file</source> + <translation>Salve l'output in un file patch</translation> + </message> + <message> + <location filename="UI/DiffDialog.py" line="202"/> + <source>Compare</source> + <translation>Confronta</translation> + </message> + <message> <location filename="UI/DiffDialog.py" line="206"/> - <source>Save the output to a patch file</source> - <translation>Salve l'output in un file patch</translation> - </message> - <message> - <location filename="UI/DiffDialog.py" line="201"/> - <source>Compare</source> - <translation>Confronta</translation> - </message> - <message> - <location filename="UI/DiffDialog.py" line="205"/> <source>Save</source> <translation>Salva</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="289"/> + <location filename="UI/DiffDialog.py" line="290"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation><p>Il file patch <b>{0}</b> esiste già.</p></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="310"/> + <location filename="UI/DiffDialog.py" line="311"/> <source><p>The patch file <b>{0}</b> could not be saved.<br />Reason: {1}</p></source> <translation><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Il file <b>{0}</b> non può essere letto.</p></translation> </message> @@ -6536,7 +6536,7 @@ <translation>Selezione l'analizzatore lessicale di Pygments da applicare.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5417"/> + <location filename="QScintilla/Editor.py" line="5418"/> <source>Check spelling...</source> <translation>Controllo sillabazione...</translation> </message> @@ -6546,12 +6546,12 @@ <translation>Controllo sillabazione della selezione...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5419"/> + <location filename="QScintilla/Editor.py" line="5420"/> <source>Add to dictionary</source> <translation>Aggiungi al dizionario</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5421"/> + <location filename="QScintilla/Editor.py" line="5422"/> <source>Ignore All</source> <translation>Ignora tutto</translation> </message> @@ -9603,22 +9603,22 @@ <context> <name>EricdocConfigDialog</name> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="257"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="260"/> <source>Select output directory</source> <translation>Seleziona la directory di output</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="282"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="285"/> <source>Select directory to exclude</source> <translation>Seleziona una directory da escludere</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Fogli di stile (*.css);;Tutti i file (*)</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Select CSS style sheet</source> <translation>Seleziona un foglio di stile CSS</translation> </message> @@ -9845,7 +9845,7 @@ <message> <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Level 1 Header</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Level 2 Header</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Class and Function Header</h2>Standard body text with <a style="color:%(LinkColor)s">some links</a> embedded.</body></html></source> - <translation><xml></translation> + <translation type="obsolete"><xml></translation> </message> <message> <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="153"/> @@ -9933,10 +9933,15 @@ <translation>Genera i file QtHelp collection</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="468"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="471"/> <source>Select output directory for QtHelp files</source> <translation>Seleziona la directory di destinazione per i file QtHelp</translation> </message> + <message> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> + <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title></title></head><body style="background-color:{BodyBgColor};color:{BodyColor}"><h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}">Level 1 Header</h1><h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}">Level 2 Header</h3><h2 style="background-color:{CFBgColor};color:{CFColor}">Class and Function Header</h2>Standard body text with <a style="color:{LinkColor}">some links</a> embedded.</body></html></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EricdocExecDialog</name> @@ -10151,7 +10156,7 @@ <context> <name>ExporterHTML</name> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source>Export source</source> <translation>Esporta sorgenti</translation> </message> @@ -10161,7 +10166,7 @@ <translation>File HTML (*.html)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Il sorgente non può essere esportato a <b>{0}</b>.</p><p>Motivo: {1}</p></translation> </message> @@ -10169,17 +10174,17 @@ <context> <name>ExporterPDF</name> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="403"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="405"/> <source>PDF Files (*.pdf)</source> <translation>File PDF (*.pdf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source>Export source</source> <translation>Esporta sorgenti</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Il sorgente non può essere esportato a <b>{0}</b>.</p><p>Motivo: {1}</p></translation> </message> @@ -10192,12 +10197,12 @@ <translation>File RTF (*.rtf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source>Export source</source> <translation>Esporta sorgenti</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Il sorgente non può essere esportato a <b>{0}</b>.</p><p>Motivo: {1}</p></translation> </message> @@ -10205,17 +10210,17 @@ <context> <name>ExporterTEX</name> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="104"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="105"/> <source>TeX Files (*.tex)</source> <translation>File TeX (*.tex)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source>Export source</source> <translation>Esporta sorgenti</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Il sorgente non può essere esportato a <b>{0}</b>.</p><p>Motivo: {1}</p></translation> </message> @@ -13577,152 +13582,152 @@ <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Select number of entries to show.</source> <translation>Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pulling da un repository Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Pushing to a remote Mercurial repository</source> <translation>Pushing in un repository Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1451"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1452"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1485"/> <source>Creating branch in the Mercurial repository</source> <translation>Creazione Branch nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifica dell'integrità del repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing the combined configuration settings</source> <translation>Visualizzazione combinata della impostazioni di configurazione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Showing aliases for remote repositories</source> <translation>Visualizzazione degli alias per i repository remoti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1851"/> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1507"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1508"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1762"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1865"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1878"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1906"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1649"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Removing files from the Mercurial repository only</source> <translation>Rimozione di file dal solo repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1738"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation><p>Il file per i changegroup Mercurial <b>{0}</b> esiste già.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> @@ -22601,12 +22606,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="863"/> + <location filename="Preferences/__init__.py" line="871"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="882"/> + <location filename="Preferences/__init__.py" line="890"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> @@ -28579,7 +28584,12 @@ <message> <location filename="SqlBrowser/SqlBrowser.py" line="62"/> <source>Unable to open connection: %s</source> - <translation>Non posso aprire la connessione: %s</translation> + <translation type="obsolete">Non posso aprire la connessione: %s</translation> + </message> + <message> + <location filename="SqlBrowser/SqlBrowser.py" line="62"/> + <source>Unable to open connection: {0}</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -29550,52 +29560,52 @@ <translation>Esportazione del progetto dal repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>Subversion Error</source> <translation>Subversion Error</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="920"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>L'URL del repository del progetto non può essere recuperato dalla copia di lavoro. L'operazione di tag verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="943"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="944"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>L'URL del repository del progetto a un formato non valido. L'operazione di tag verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1032"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1033"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>L'URL del repository del progetto non può essere recuperato dalla copia di lavoro. L'operazione di switch verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>L'URL del repository del progetto ha un formato non valido. L'operazione di switch verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1333"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1334"/> <source>Subversion command</source> <translation>comando Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1547"/> <source>Subversion Set Property</source> <translation>Subversion Set Property</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1580"/> <source>You have to supply a property name. Aborting.</source> <translation>Devi fornire un nome per la proprietà. Interrompo.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1598"/> <source>Subversion Delete Property</source> <translation>Subversion Delete Property</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1419"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1420"/> <source>Enter property name</source> <translation>Inserisci nome proprietà</translation> </message> @@ -29610,27 +29620,27 @@ <translation>Sincronizzazione con il repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="652"/> <source>Adding files/directories to the Subversion repository</source> <translation>Aggiunta di file/directory al repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="725"/> <source>Adding directory trees to the Subversion repository</source> <translation>Aggiunta di alberi di directory al repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="760"/> <source>Removing files/directories from the Subversion repository</source> <translation>Rimozione di file/directory al repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1007"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1008"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1440"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1441"/> <source>Resolving conficts</source> <translation>Risoluzione conflitti</translation> </message> @@ -29655,47 +29665,47 @@ <translation>Il progetto non può essere checked out dal repository.<br />Ripristisno dei contenuti originali.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Subversion Log</source> <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Select number of entries to show.</source> <translation>Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1782"/> <source>Locking in the Subversion repository</source> <translation>Blocco nel repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1820"/> <source>Unlocking in the Subversion repository</source> <translation>Sblocco del repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Property set.</source> <translation>Proprietà impostata.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> <source>Property deleted.</source> <translation>Proprietà cancellata.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Subversion Lock</source> <translation>Lock Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Enter lock comment</source> <translation>Inserico commento del lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1865"/> <source>Relocating</source> <translation>Movimentazione</translation> </message> @@ -29860,27 +29870,27 @@ <translation>Non posso avviare l'eseguibile svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Repository Browser</source> <translation>Browser Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Enter the repository URL.</source> <translation>Inserisci l'URL del repository.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1914"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1915"/> <source>Remove from changelist</source> <translation>Rimuovi dalla changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1951"/> <source>Add to changelist</source> <translation>Aggiungi alla changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1940"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1941"/> <source>Enter name of the changelist:</source> <translation>Inserisci il nome della changelist:</translation> </message> @@ -29905,32 +29915,32 @@ <translation>Il processo svn è terminato con codice di uscita {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Moving {0}</source> <translation>Spostamento di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="978"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="979"/> <source>Tagging {0} in the Subversion repository</source> <translation>Tag di{0} nel repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1079"/> <source>Switching to {0}</source> <translation>Switch a {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1177"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1178"/> <source>Merging {0}</source> <translation>Merge di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1297"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1298"/> <source>Cleaning up {0}</source> <translation>Pulizia di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1479"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1480"/> <source>Copying {0}</source> <translation>copia di {0}</translation> </message> @@ -29946,7 +29956,7 @@ <translation>Committata la revisione {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1086"/> <source>Revision {0}. </source> <translation>Revisione {0}. @@ -34975,7 +34985,7 @@ <context> <name>TemplateViewer</name> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source>Edit Template Group</source> <translation>Modifica gruppo template</translation> </message> @@ -35050,12 +35060,12 @@ <translation>Templates Files (*.e4c);; All Files (*)</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source>Save templates</source> <translation>Salva template</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source>Read templates</source> <translation>Leggi template</translation> </message> @@ -35075,22 +35085,22 @@ <translation><p><b>I Template groups</b> sono un modo di raggruppare i singoli template. I gruppi hanno un attributo che specifica per quale linguaggio di programmazione si applicano. Per aggiunte dei template, almeno un gruppo deve essere definito.</p><p<b>Template entries</b> sono i template. Sono raggruppati dai template groups. Supoprto su come definirli è disponibile nel dialogo di modifica dei template. C'è un esempiodi template disponibile nella sottodirectory Examples della distribuzione di eric4.</p> {5 ?}</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source><p>A template group with the name <b>{0}</b> already exists.</p></source> <translation><p>Un gruppo di template con il nome <b>{0}</b> esite già.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source><p>The templates file <b>{0}</b> could not be written.</p></source> <translation><p>Il file template <b>{0}</b> non può essere scritto.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="921"/> + <location filename="Templates/TemplateViewer.py" line="919"/> <source><p>The templates file <b>{0}</b> could not be read.</p></source> <translation><p>Il file template <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source><p>The templates file <b>{0}</b> has an unsupported format.</p></source> <translation><p>Il file template <b>{0}</b> è di un formato non supportato.</p></translation> </message> @@ -42756,12 +42766,12 @@ <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1405"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1409"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> @@ -42792,24 +42802,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1400"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1401"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1415"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -42880,17 +42890,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1374"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1245"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1246"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Informazioni Repository</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Revisione corrente </b></td><td>{2}</td></tr><tr><td><b>Revisione committata</b></td><td>{3}</td></tr><tr><td><b>Data della commit</b></td><td>{4}</td></tr><tr><td><b>Ora della commit</b></td><td>{5}</td></tr><tr><td><b>Ultimo autore</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1376"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informazioni Repository</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Revisione corrente</b></td><td>{4}</td></tr><tr><td><b>Revisione Committata</b></td><td>{5}</td></tr><tr><td><b>Data della commit</b></td><td>{6}</td></tr><tr><td><b>Ora della commit</b></td><td>{7}</td></tr><tr><td><b>Ultimo autore</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_ru.ts Fri Jul 30 12:55:36 2010 +0200 +++ b/i18n/eric5_ru.ts Fri Jul 30 18:26:19 2010 +0200 @@ -3409,7 +3409,7 @@ <translation>Фильтровать &по:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source>Code Generation</source> <translation>Генерация кода</translation> </message> @@ -3424,7 +3424,7 @@ <translation><p>Невозможно открыть файл с исходными текстами <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Невозможно записать файл с исходными текстами <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> @@ -4590,22 +4590,22 @@ <translation><p>Невозможно запустить отладчик</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Parent Process</source> <translation>Родительский процесс</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Child process</source> <translation>Порожденный процесс</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Client forking</source> <translation>Порождение процесса</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Select the fork branch to follow.</source> <translation>Выберите какой процесс отслеживать - родительский или порожденный.</translation> </message> @@ -4628,22 +4628,22 @@ <translation><p>Невозможно запустить отладчик</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Parent Process</source> <translation>Родительский процесс</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Child process</source> <translation>Порожденный процесс</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Client forking</source> <translation>Порождение процесса</translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Select the fork branch to follow.</source> <translation>Выберите какой процесс отслеживать - родительский или порожденный.</translation> </message> @@ -5174,37 +5174,37 @@ <context> <name>DiffDialog</name> <message> - <location filename="UI/DiffDialog.py" line="272"/> + <location filename="UI/DiffDialog.py" line="273"/> <source>Patch Files (*.diff)</source> <translation>Файлы изменений (*.diff)</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="310"/> + <location filename="UI/DiffDialog.py" line="311"/> <source>Save Diff</source> <translation>Сохранить изменения</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source>Compare Files</source> <translation>Сравнить файлы</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="444"/> + <location filename="UI/DiffDialog.py" line="445"/> <source>There is no difference.</source> <translation>Различий нет.</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="463"/> + <location filename="UI/DiffDialog.py" line="464"/> <source>Select file to compare</source> <translation>Задайте файл для сравнения</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="289"/> + <location filename="UI/DiffDialog.py" line="290"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation><p>Файл с патчем <b>{0}</b> уже существует.</p></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл: <b>{0}</b></p></translation> </message> @@ -5274,27 +5274,27 @@ <translation>Alt+N</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="202"/> + <location filename="UI/DiffDialog.py" line="203"/> <source>Press to perform the comparison of the two files</source> <translation>Выполнить сравнение двух файлов</translation> </message> <message> + <location filename="UI/DiffDialog.py" line="207"/> + <source>Save the output to a patch file</source> + <translation>Сохранить вывод как файл изменений</translation> + </message> + <message> + <location filename="UI/DiffDialog.py" line="311"/> + <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="UI/DiffDialog.py" line="202"/> + <source>Compare</source> + <translation>Сравнить</translation> + </message> + <message> <location filename="UI/DiffDialog.py" line="206"/> - <source>Save the output to a patch file</source> - <translation>Сохранить вывод как файл изменений</translation> - </message> - <message> - <location filename="UI/DiffDialog.py" line="310"/> - <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="UI/DiffDialog.py" line="201"/> - <source>Compare</source> - <translation>Сравнить</translation> - </message> - <message> - <location filename="UI/DiffDialog.py" line="205"/> <source>Save</source> <translation>Сохранить</translation> </message> @@ -6628,7 +6628,7 @@ <translation>Задайте язык лексического анализатора.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5417"/> + <location filename="QScintilla/Editor.py" line="5418"/> <source>Check spelling...</source> <translation>Проверка орфографии...</translation> </message> @@ -6638,12 +6638,12 @@ <translation>Проверка орфографии подсвеченного участка...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5419"/> + <location filename="QScintilla/Editor.py" line="5420"/> <source>Add to dictionary</source> <translation>Добавить в слварь</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5421"/> + <location filename="QScintilla/Editor.py" line="5422"/> <source>Ignore All</source> <translation>Игнорировать всё</translation> </message> @@ -9635,22 +9635,22 @@ <context> <name>EricdocConfigDialog</name> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="257"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="260"/> <source>Select output directory</source> <translation>Выберите целевой каталог</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="282"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="285"/> <source>Select directory to exclude</source> <translation>Выберите исключаемый каталог</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Стили CSS (*.css);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Select CSS style sheet</source> <translation>Выберите стиль CSS</translation> </message> @@ -9877,7 +9877,7 @@ <message> <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Level 1 Header</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Level 2 Header</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Class and Function Header</h2>Standard body text with <a style="color:%(LinkColor)s">some links</a> embedded.</body></html></source> - <translation><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Заголовок 1 уровня</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Заголовок 2 уровня</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Заголовок класса и функции</h2>стандартное содержимое со <a style="color:%(LinkColor)s">ссылками</a>.</body></html></translation> + <translation type="obsolete"><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Заголовок 1 уровня</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Заголовок 2 уровня</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Заголовок класса и функции</h2>стандартное содержимое со <a style="color:%(LinkColor)s">ссылками</a>.</body></html></translation> </message> <message> <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="153"/> @@ -9955,7 +9955,7 @@ <translation>Введите краткий заголовок для точки входа</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="468"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="471"/> <source>Select output directory for QtHelp files</source> <translation>Введите имя каталога назначения для файлов Qt Помощи</translation> </message> @@ -9969,6 +9969,11 @@ <source>Generate QtHelp collection files</source> <translation>Генерировать файлы коллекций Qt Помощи</translation> </message> + <message> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> + <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title></title></head><body style="background-color:{BodyBgColor};color:{BodyColor}"><h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}">Level 1 Header</h1><h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}">Level 2 Header</h3><h2 style="background-color:{CFBgColor};color:{CFColor}">Class and Function Header</h2>Standard body text with <a style="color:{LinkColor}">some links</a> embedded.</body></html></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EricdocExecDialog</name> @@ -10184,12 +10189,12 @@ <context> <name>ExporterHTML</name> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source>Export source</source> <translation>Экспортировать исходник</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Невозможно экспортировать источник в файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> @@ -10202,17 +10207,17 @@ <context> <name>ExporterPDF</name> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="403"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="405"/> <source>PDF Files (*.pdf)</source> <translation>Файлы PDF (*.pdf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source>Export source</source> <translation>Экспортировать исходник</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Невозможно экспортировать источник в файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> @@ -10225,12 +10230,12 @@ <translation>Файлы RTF (*.rtf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source>Export source</source> <translation>Экспортировать исходник</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Невозможно экспортировать источник в файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> @@ -10238,17 +10243,17 @@ <context> <name>ExporterTEX</name> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="104"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="105"/> <source>TeX Files (*.tex)</source> <translation>Файлы TeX (*.tex)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source>Export source</source> <translation>Экспортировать исходник</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Невозможно экспортировать источник в файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> @@ -13615,32 +13620,32 @@ <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Mercurial Log</source> <translation>лог</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Select number of entries to show.</source> <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1451"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1452"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> @@ -13660,122 +13665,122 @@ <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1485"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1851"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1507"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1508"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1762"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1865"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1878"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1906"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1649"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1738"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation><p>Файл изменений <b>{0}</b> уже существует.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> @@ -22670,12 +22675,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="863"/> + <location filename="Preferences/__init__.py" line="871"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="882"/> + <location filename="Preferences/__init__.py" line="890"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> @@ -28648,7 +28653,12 @@ <message> <location filename="SqlBrowser/SqlBrowser.py" line="62"/> <source>Unable to open connection: %s</source> - <translation>Не могу соединениться с %s</translation> + <translation type="obsolete">Не могу соединениться с %s</translation> + </message> + <message> + <location filename="SqlBrowser/SqlBrowser.py" line="62"/> + <source>Unable to open connection: {0}</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -29618,82 +29628,82 @@ <translation>Экспорт файлов из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>Subversion Error</source> <translation>Ошибка Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="920"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>URL репозитория проекта недоступен из рабочей копии. Операция кстановки тега будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="943"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="944"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Неверный формат URL репозитория. Операция установки тега будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="978"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="979"/> <source>Tagging {0} in the Subversion repository</source> <translation>Изменение тегов '{0}' в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1032"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1033"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>URL репозитория проекта недоступен из рабочей копии. Операция переключения будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Неверный формат URL репозитория. Операция переключения будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1079"/> <source>Switching to {0}</source> <translation>Преключение на '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1177"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1178"/> <source>Merging {0}</source> <translation>Слияние с '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1297"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1298"/> <source>Cleaning up {0}</source> <translation>Очистка {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1333"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1334"/> <source>Subversion command</source> <translation>Команда Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1479"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1480"/> <source>Copying {0}</source> <translation>Копирование '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Moving {0}</source> <translation>Перемещение {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1547"/> <source>Subversion Set Property</source> <translation>Установить свойство Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1580"/> <source>You have to supply a property name. Aborting.</source> <translation>Необходимо задать имя свойства. Прервано.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1598"/> <source>Subversion Delete Property</source> <translation>Удалить свойство Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1419"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1420"/> <source>Enter property name</source> <translation>Задайте имя свойства</translation> </message> @@ -29708,27 +29718,27 @@ <translation>Синхронизация с репозиторием Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="652"/> <source>Adding files/directories to the Subversion repository</source> <translation>Добавляю файлы/каталоги в репозиторий Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="725"/> <source>Adding directory trees to the Subversion repository</source> <translation>Добавляю деревья каталогов в репозиторий Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="760"/> <source>Removing files/directories from the Subversion repository</source> <translation>Удаляю файлы/каталоги из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1007"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1008"/> <source>Reverting changes</source> <translation>Отменяю изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1440"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1441"/> <source>Resolving conficts</source> <translation>Разрешаю конфликт</translation> </message> @@ -29753,22 +29763,22 @@ <translation>Невозможно загрузить проект из репозитория. <br />Восстанавливаю предыдущее содержимое.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Subversion Log</source> <translation>Журнал Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Select number of entries to show.</source> <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1782"/> <source>Locking in the Subversion repository</source> <translation>Захватываю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1820"/> <source>Unlocking in the Subversion repository</source> <translation>Освобождаю файл/каталог в репозитории Subversion</translation> </message> @@ -29778,33 +29788,33 @@ <translation>Сохранена ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1086"/> <source>Revision {0}. </source> <translation>Ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Property set.</source> <translation>Свойство установлено.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> <source>Property deleted.</source> <translation>Свойство удалено.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Subversion Lock</source> <translation>Запереть</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Enter lock comment</source> <translation>Задайте комментарий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1865"/> <source>Relocating</source> <translation>Перемещаю</translation> </message> @@ -29980,27 +29990,27 @@ <translation>Невозможно запустить исполняемый файл svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Repository Browser</source> <translation>Проводник репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Enter the repository URL.</source> <translation>Задайте URL репозитория.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1914"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1915"/> <source>Remove from changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1951"/> <source>Add to changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1940"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1941"/> <source>Enter name of the changelist:</source> <translation>Введите имя списка изменений:</translation> </message> @@ -35059,7 +35069,7 @@ <context> <name>TemplateViewer</name> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source>Edit Template Group</source> <translation>Редактировать группу шаблонов</translation> </message> @@ -35079,7 +35089,7 @@ <translation>Экспорт шаблонов</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source><p>A template group with the name <b>{0}</b> already exists.</p></source> <translation><p>Группа шаблонов с именем <b>{0}</b> уже существует.</p></translation> </message> @@ -35144,27 +35154,27 @@ <translation>Файлы шаблонов (*.e4c);; Все файлы (*)</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source>Save templates</source> <translation>Сохранить шаблоны</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source><p>The templates file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл шаблонов: <b>{0}</b></p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source>Read templates</source> <translation>Прочитать шаблоны</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="921"/> + <location filename="Templates/TemplateViewer.py" line="919"/> <source><p>The templates file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл шаблонов: <b>{0}</b></p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source><p>The templates file <b>{0}</b> has an unsupported format.</p></source> <translation><p>Файл шаблонов <b>{0}</b> в неподдерживаемом формате.</p></translation> </message> @@ -42911,17 +42921,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1405"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Метки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1409"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1415"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -42932,18 +42942,18 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1400"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1401"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Изменения</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> @@ -43043,17 +43053,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1374"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> <source>unknown</source> <translation>неизвестный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1245"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1246"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>Версия Subversion:</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{2}</td></tr><tr><td><b>Зафиксированная ревизия (committed)</b></td><td>{3}</td></tr><tr><td><b>Дата сохранения</b></td><td>{4}</td></tr><tr><td><b>Время сохранения</b></td><td>{5}</td></tr><tr><td><b>Последний автор</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1376"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{4}</td></tr><tr><td><b>Зафиксированная ревизия</b></td><td>{5}</td></tr><tr><td><b>Дата сохранения</b></td><td>{6}</td></tr><tr><td><b>Время сохранения</b></td><td>{7}</td></tr><tr><td><b>Автор последней ревизии</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_tr.ts Fri Jul 30 12:55:36 2010 +0200 +++ b/i18n/eric5_tr.ts Fri Jul 30 18:26:19 2010 +0200 @@ -3642,7 +3642,7 @@ <translation type="obsolete"><p> <b>%1</b>form dosyası yüklenirken bir hata oldu.</p><p>%2</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source>Code Generation</source> <translation>Kod üretici</translation> </message> @@ -3687,7 +3687,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -4898,22 +4898,22 @@ <translation><p>Hata ayıklayıcıbaşlatılamadı.</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Parent Process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Child process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Client forking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Select the fork branch to follow.</source> <translation type="unfinished"></translation> </message> @@ -4936,22 +4936,22 @@ <translation type="unfinished"><p>Hata ayıklayıcıbaşlatılamadı.</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Parent Process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Child process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Client forking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Select the fork branch to follow.</source> <translation type="unfinished"></translation> </message> @@ -5576,32 +5576,32 @@ <translation>Alt+N</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="201"/> + <location filename="UI/DiffDialog.py" line="202"/> <source>Compare</source> <translation>Karşılaştırma</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="202"/> + <location filename="UI/DiffDialog.py" line="203"/> <source>Press to perform the comparison of the two files</source> <translation>İki dosya arasındaki karşılaştırmayı başlatmak için basınız</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="205"/> - <source>Save</source> - <translation>Kaydet</translation> - </message> - <message> <location filename="UI/DiffDialog.py" line="206"/> + <source>Save</source> + <translation>Kaydet</translation> + </message> + <message> + <location filename="UI/DiffDialog.py" line="207"/> <source>Save the output to a patch file</source> <translation>Çıktıyı yama dosyasına kaydet</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="310"/> + <location filename="UI/DiffDialog.py" line="311"/> <source>Save Diff</source> <translation>Farklılıkları Kaydet</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="272"/> + <location filename="UI/DiffDialog.py" line="273"/> <source>Patch Files (*.diff)</source> <translation>Patch Dosyaları (*.diff)</translation> </message> @@ -5616,7 +5616,7 @@ <translation type="obsolete"><p>Yama dosyası <b>%1</b> kaydedilemedi.<br>Sebep: %2</p></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source>Compare Files</source> <translation>Dosyaları Karşılaştır</translation> </message> @@ -5626,27 +5626,27 @@ <translation type="obsolete"><p> <b>%1</b>dosyası okunamıyor.</p></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="444"/> + <location filename="UI/DiffDialog.py" line="445"/> <source>There is no difference.</source> <translation>Herhangi bir farklılık bulunamadı.</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="463"/> + <location filename="UI/DiffDialog.py" line="464"/> <source>Select file to compare</source> <translation>Karşılaştırma için dosya seç</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="289"/> + <location filename="UI/DiffDialog.py" line="290"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="310"/> + <location filename="UI/DiffDialog.py" line="311"/> <source><p>The patch file <b>{0}</b> could not be saved.<br />Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> @@ -6635,7 +6635,7 @@ <translation>Tüm seçimi iptal et</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5417"/> + <location filename="QScintilla/Editor.py" line="5418"/> <source>Check spelling...</source> <translation>Yazım denetimi ...</translation> </message> @@ -7320,12 +7320,12 @@ <translation>Modül isimleri dahil edilsin mi?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5419"/> + <location filename="QScintilla/Editor.py" line="5420"/> <source>Add to dictionary</source> <translation>Sözlüğe ekle</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5421"/> + <location filename="QScintilla/Editor.py" line="5422"/> <source>Ignore All</source> <translation>Hepsini Görmezden Gel</translation> </message> @@ -10666,27 +10666,22 @@ <translation>Bu seçilen renklerin örneklerini gösterir.</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> - <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Level 1 Header</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Level 2 Header</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Class and Function Header</h2>Standard body text with <a style="color:%(LinkColor)s">some links</a> embedded.</body></html></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="257"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="260"/> <source>Select output directory</source> <translation>Çıktı dizinini seç</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="282"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="285"/> <source>Select directory to exclude</source> <translation>Dışırıda tutulacak dizinleri seçiniz</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Select CSS style sheet</source> <translation>CSS sayfa stilini seç</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Sayfa stili (*.css);;Tüm dosyalar (*)</translation> </message> @@ -10751,7 +10746,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="468"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="471"/> <source>Select output directory for QtHelp files</source> <translation type="unfinished"></translation> </message> @@ -10765,6 +10760,11 @@ <source>Generate QtHelp collection files</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> + <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title></title></head><body style="background-color:{BodyBgColor};color:{BodyColor}"><h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}">Level 1 Header</h1><h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}">Level 2 Header</h3><h2 style="background-color:{CFBgColor};color:{CFColor}">Class and Function Header</h2>Standard body text with <a style="color:{LinkColor}">some links</a> embedded.</body></html></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EricdocExecDialog</name> @@ -11027,7 +11027,7 @@ <translation>HTML Dosyaları (*.html)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source>Export source</source> <translation>Kaynağı dışaktar</translation> </message> @@ -11037,7 +11037,7 @@ <translation type="obsolete"><p>Kaynak <b>%1</b>'ya dışaaktarılamıyor.</p><p>Sebep: %2</p></translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -11045,12 +11045,12 @@ <context> <name>ExporterPDF</name> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="403"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="405"/> <source>PDF Files (*.pdf)</source> <translation>PDF Dosyaları (*.pdf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source>Export source</source> <translation>Kaynağı dışaktar</translation> </message> @@ -11060,7 +11060,7 @@ <translation type="obsolete"><p>Kaynak <b>%1</b>'ya dışaaktarılamıyor.</p><p>Sebep: %2</p></translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -11073,7 +11073,7 @@ <translation>RTF Dosyaları (*.rtf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source>Export source</source> <translation>Kaynağı dışaktar</translation> </message> @@ -11083,7 +11083,7 @@ <translation type="obsolete"><p>Kaynak <b>%1</b>'ya dışaaktarılamıyor.</p><p>Sebep: %2</p></translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -11091,12 +11091,12 @@ <context> <name>ExporterTEX</name> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="104"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="105"/> <source>TeX Files (*.tex)</source> <translation>TeX Dosyaları (*.tex)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source>Export source</source> <translation>Kaynağı dışaktar</translation> </message> @@ -11106,7 +11106,7 @@ <translation type="obsolete"><p>Kaynak <b>%1</b>'ya dışaaktarılamıyor.</p><p>Sebep: %2</p></translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -14831,152 +14831,152 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Select number of entries to show.</source> <translation type="unfinished">gösterilecek giriş miktarını seç.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1451"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1452"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1485"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1851"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1507"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1508"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1762"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1865"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1878"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1906"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1649"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1738"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -24357,12 +24357,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="863"/> + <location filename="Preferences/__init__.py" line="871"/> <source>Export Preferences</source> <translation>Tercihleri Dışarı Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="882"/> + <location filename="Preferences/__init__.py" line="890"/> <source>Import Preferences</source> <translation>Tercihleri İçe Aktar</translation> </message> @@ -31020,7 +31020,7 @@ </message> <message> <location filename="SqlBrowser/SqlBrowser.py" line="62"/> - <source>Unable to open connection: %s</source> + <source>Unable to open connection: {0}</source> <translation type="unfinished"></translation> </message> </context> @@ -32091,17 +32091,17 @@ <translation>Altsürüm kaynak havuzu ile senkronize ediliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="652"/> <source>Adding files/directories to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="725"/> <source>Adding directory trees to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="760"/> <source>Removing files/directories from the Subversion repository</source> <translation type="unfinished"></translation> </message> @@ -32111,32 +32111,32 @@ <translation type="obsolete">%1 'i taşınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>Subversion Error</source> <translation>Altsürüm Hatası</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="920"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="943"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="944"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1007"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1008"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1032"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1033"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> @@ -32151,12 +32151,12 @@ <translation type="obsolete">%1 Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1333"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1334"/> <source>Subversion command</source> <translation>Altsürüm komutu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1440"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1441"/> <source>Resolving conficts</source> <translation type="unfinished"></translation> </message> @@ -32166,72 +32166,72 @@ <translation type="obsolete">%1 kopyalanıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1547"/> <source>Subversion Set Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1580"/> <source>You have to supply a property name. Aborting.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1598"/> <source>Subversion Delete Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1419"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1420"/> <source>Enter property name</source> <translation>Özellik adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Subversion Log</source> <translation>Altsürüm Kayıtı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Select number of entries to show.</source> <translation>gösterilecek giriş miktarını seç.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1782"/> <source>Locking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1820"/> <source>Unlocking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1865"/> <source>Relocating</source> <translation>Yeniden Konmlandırılıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Repository Browser</source> <translation>Kaynak Havuzu Gözatıcısı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Enter the repository URL.</source> <translation>Kaynak havuzu URL'sini gir.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1914"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1915"/> <source>Remove from changelist</source> <translation>Değişiklik listesinden kaldır</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1951"/> <source>Add to changelist</source> <translation>Değişiklik listesine ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1940"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1941"/> <source>Enter name of the changelist:</source> <translation>Değişiklik listesinin adını giriniz:</translation> </message> @@ -32255,22 +32255,22 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Property set.</source> <translation>Özellik ayarlandı.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> <source>Property deleted.</source> <translation>Özellik silindi.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Subversion Lock</source> <translation>Altsürüm Kilidi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Enter lock comment</source> <translation>Yorumlayıcı kilidi gir</translation> </message> @@ -32445,32 +32445,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Moving {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="978"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="979"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1079"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1177"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1178"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1297"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1298"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1479"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1480"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -32486,7 +32486,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1086"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -37773,7 +37773,7 @@ <translation>Şablon Yardımı</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source>Edit Template Group</source> <translation>Şablon Grubunu Düzenle</translation> </message> @@ -37783,7 +37783,7 @@ <translation type="obsolete"><p> <b>%1</b>adında bir şablon grubu var.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source>Save templates</source> <translation>Geçicileri kaydet</translation> </message> @@ -37793,7 +37793,7 @@ <translation type="obsolete"><p><b>%1</b> Şablon dosyası yazılamıyor.</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source>Read templates</source> <translation>Şablonları Oku</translation> </message> @@ -37818,22 +37818,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source><p>A template group with the name <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source><p>The templates file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="921"/> + <location filename="Templates/TemplateViewer.py" line="919"/> <source><p>The templates file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source><p>The templates file <b>{0}</b> has an unsupported format.</p></source> <translation type="unfinished"></translation> </message> @@ -46148,12 +46148,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1405"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1409"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -46176,23 +46176,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1400"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1401"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1415"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -46266,7 +46266,7 @@ <translation type="obsolete"><h3>Kaynak Havuzu Bilgisi</h3><table><tr><td><b>Altsürüm S.</b></td><td>%1</td></tr><tr><td><b>URL</b></td><td>%2</td></tr><tr><td><b>Geçerli Güncelleme</b></td><td>%3</td></tr><tr><td><b>Teslim Edilen </b></td><td>%4</td></tr><tr><td><b>TKeslim Tarihi</b></td><td>%5</td></tr><tr><td><b>Teslim Zamanı</b></td><td>%6</td></tr><tr><td><b>Son Yazar</b></td><td>%7</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1374"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> <source>unknown</source> <translation>bilinmeyen</translation> </message> @@ -46276,12 +46276,12 @@ <translation type="obsolete"><h3>Kaynak Havuzu Bilgisi</h3><table><tr><td><b>PySvn S.</b></td><td>%1</td></tr><tr><td><b>Altsürüm S.</b></td><td>%2</td></tr><tr><td><b>Altsürüm API S.</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>Geçerli Güncelleme</b></td><td>%5</td></tr><tr><td><b>Teslim edilen güncelleme</b></td><td>%6</td></tr><tr><td><b>Teslim Tarihi</b></td><td>%7</td></tr><tr><td><b>Teslim Zamanı</b></td><td>%8</td></tr><tr><td><b>Son Yazar</b></td><td>%9</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1245"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1246"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1376"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Fri Jul 30 12:55:36 2010 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Fri Jul 30 18:26:19 2010 +0200 @@ -3644,7 +3644,7 @@ <translation type="obsolete"><p>载入窗体 <b>%1</b>出错。</p><p>%2</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source>Code Generation</source> <translation>代码生成</translation> </message> @@ -3689,7 +3689,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="405"/> + <location filename="Project/CreateDialogCodeDialog.py" line="406"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -4931,22 +4931,22 @@ <translation><p>调试器后端无法启动。</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Parent Process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="720"/> <source>Child process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Client forking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython.py" line="719"/> + <location filename="Debugger/DebuggerInterfacePython.py" line="721"/> <source>Select the fork branch to follow.</source> <translation type="unfinished"></translation> </message> @@ -4969,22 +4969,22 @@ <translation type="unfinished"><p>调试器后端无法启动。</p></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Parent Process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="717"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="719"/> <source>Child process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Client forking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebuggerInterfacePython3.py" line="718"/> + <location filename="Debugger/DebuggerInterfacePython3.py" line="720"/> <source>Select the fork branch to follow.</source> <translation type="unfinished"></translation> </message> @@ -5610,32 +5610,32 @@ <translation>Alt+N</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="201"/> + <location filename="UI/DiffDialog.py" line="202"/> <source>Compare</source> <translation>比较</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="202"/> + <location filename="UI/DiffDialog.py" line="203"/> <source>Press to perform the comparison of the two files</source> <translation>点击比较两个文件</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="205"/> - <source>Save</source> - <translation>保存</translation> - </message> - <message> <location filename="UI/DiffDialog.py" line="206"/> + <source>Save</source> + <translation>保存</translation> + </message> + <message> + <location filename="UI/DiffDialog.py" line="207"/> <source>Save the output to a patch file</source> <translation>将输出保存到补丁文件中</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="310"/> + <location filename="UI/DiffDialog.py" line="311"/> <source>Save Diff</source> <translation>保存差异</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="272"/> + <location filename="UI/DiffDialog.py" line="273"/> <source>Patch Files (*.diff)</source> <translation>补丁文件 (*.diff)</translation> </message> @@ -5650,7 +5650,7 @@ <translation type="obsolete"><p>补丁文件 <b>%1</b> 无法保存。<br />原因： %2</p></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source>Compare Files</source> <translation>比较文件</translation> </message> @@ -5660,27 +5660,27 @@ <translation type="obsolete"><p>文件 <b>%1</b> 无法读取。</p></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="444"/> + <location filename="UI/DiffDialog.py" line="445"/> <source>There is no difference.</source> <translation>没有差异。</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="463"/> + <location filename="UI/DiffDialog.py" line="464"/> <source>Select file to compare</source> <translation>选择要比较的文件</translation> </message> <message> - <location filename="UI/DiffDialog.py" line="289"/> + <location filename="UI/DiffDialog.py" line="290"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="310"/> + <location filename="UI/DiffDialog.py" line="311"/> <source><p>The patch file <b>{0}</b> could not be saved.<br />Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.py" line="346"/> + <location filename="UI/DiffDialog.py" line="347"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> @@ -6643,7 +6643,7 @@ <translation>全部取消选择</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5417"/> + <location filename="QScintilla/Editor.py" line="5418"/> <source>Check spelling...</source> <translation>正在进行拼写检查……</translation> </message> @@ -7323,12 +7323,12 @@ <translation>包含模块名？</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5419"/> + <location filename="QScintilla/Editor.py" line="5420"/> <source>Add to dictionary</source> <translation>添加到文件夹</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5421"/> + <location filename="QScintilla/Editor.py" line="5422"/> <source>Ignore All</source> <translation>全部忽略</translation> </message> @@ -10707,25 +10707,25 @@ <message> <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Level 1 Header</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Level 2 Header</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Class and Function Header</h2>Standard body text with <a style="color:%(LinkColor)s">some links</a> embedded.</body></html></source> - <translation><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Level 1 Header</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Level 2 Header</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Class and Function Header</h2>Standard body text with <a style="color:%(LinkColor)s">some links</a> embedded.</body></html></translation> - </message> - <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="257"/> + <translation type="obsolete"><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Level 1 Header</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Level 2 Header</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Class and Function Header</h2>Standard body text with <a style="color:%(LinkColor)s">some links</a> embedded.</body></html></translation> + </message> + <message> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="260"/> <source>Select output directory</source> <translation>选择输出文件夹</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="282"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="285"/> <source>Select directory to exclude</source> <translation>选择要排除的文件夹</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Select CSS style sheet</source> <translation>选择 CSS 样式表</translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="320"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="323"/> <source>Style sheet (*.css);;All files (*)</source> <translation>样式表 (*.css);;所有文件 (*)</translation> </message> @@ -10790,7 +10790,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="468"/> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="471"/> <source>Select output directory for QtHelp files</source> <translation type="unfinished"></translation> </message> @@ -10804,6 +10804,11 @@ <source>Generate QtHelp collection files</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="44"/> + <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title></title></head><body style="background-color:{BodyBgColor};color:{BodyColor}"><h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}">Level 1 Header</h1><h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}">Level 2 Header</h3><h2 style="background-color:{CFBgColor};color:{CFColor}">Class and Function Header</h2>Standard body text with <a style="color:{LinkColor}">some links</a> embedded.</body></html></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EricdocExecDialog</name> @@ -11067,7 +11072,7 @@ <translation>HTML 文件 (*.html)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source>Export source</source> <translation>导出源代码</translation> </message> @@ -11077,7 +11082,7 @@ <translation type="obsolete"><p>源代码无法导出到 <b>%1</b>。</p><p>原因： %2</p></translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterHTML.py" line="355"/> + <location filename="QScintilla/Exporters/ExporterHTML.py" line="357"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -11085,12 +11090,12 @@ <context> <name>ExporterPDF</name> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="403"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="405"/> <source>PDF Files (*.pdf)</source> <translation>PDF 文件 (*.pdf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source>Export source</source> <translation>导出源代码</translation> </message> @@ -11100,7 +11105,7 @@ <translation type="obsolete"><p>源代码无法导出到 <b>%1</b>。</p><p>原因： %2</p></translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterPDF.py" line="579"/> + <location filename="QScintilla/Exporters/ExporterPDF.py" line="581"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -11113,7 +11118,7 @@ <translation>RTF 文件 (*.rtf)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source>Export source</source> <translation>导出源代码</translation> </message> @@ -11123,7 +11128,7 @@ <translation type="obsolete"><p>源代码无法导出到 <b>%1</b>。</p><p>原因： %2</p></translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterRTF.py" line="332"/> + <location filename="QScintilla/Exporters/ExporterRTF.py" line="337"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -11131,12 +11136,12 @@ <context> <name>ExporterTEX</name> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="104"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="105"/> <source>TeX Files (*.tex)</source> <translation>TeX 文件 (*.tex)</translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source>Export source</source> <translation>导出源代码</translation> </message> @@ -11146,7 +11151,7 @@ <translation type="obsolete"><p>源代码无法导出到 <b>%1</b>。</p><p>原因： %2</p></translation> </message> <message> - <location filename="QScintilla/Exporters/ExporterTEX.py" line="254"/> + <location filename="QScintilla/Exporters/ExporterTEX.py" line="256"/> <source><p>The source could not be exported to <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -14876,152 +14881,152 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1242"/> <source>Select number of entries to show.</source> <translation type="unfinished">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1451"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1452"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1474"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1485"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1851"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1507"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1508"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1762"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1865"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1878"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1906"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1649"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1738"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -24494,12 +24499,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="863"/> + <location filename="Preferences/__init__.py" line="871"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="882"/> + <location filename="Preferences/__init__.py" line="890"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> @@ -31504,7 +31509,7 @@ </message> <message> <location filename="SqlBrowser/SqlBrowser.py" line="62"/> - <source>Unable to open connection: %s</source> + <source>Unable to open connection: {0}</source> <translation type="unfinished"></translation> </message> </context> @@ -32720,17 +32725,17 @@ <translation>正在与版本控制储存库同步</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="652"/> <source>Adding files/directories to the Subversion repository</source> <translation>将文件或文件夹添加到版本控制储存库</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="725"/> <source>Adding directory trees to the Subversion repository</source> <translation>将目录树添加到版本控制储存库</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="760"/> <source>Removing files/directories from the Subversion repository</source> <translation>从版本控制储存库移除文件或文件夹</translation> </message> @@ -32740,17 +32745,17 @@ <translation type="obsolete">正在移动 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>Subversion Error</source> <translation>版本控制错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="920"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>项目储存库的 URL 无法从工作拷贝中检索。标签操作将被终止</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="943"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="944"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>项目储存库的 URL 包含无效格式。标签操作将被终止</translation> </message> @@ -32760,17 +32765,17 @@ <translation type="obsolete">在版本控制储存库中标记 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1007"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1008"/> <source>Reverting changes</source> <translation>还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1032"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1033"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>项目储存库的 URL 无法从工作拷贝中检索。转换操作将被终止</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1056"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1057"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>项目储存库的 URL 包含无效格式。转换操作将被终止</translation> </message> @@ -32790,12 +32795,12 @@ <translation type="obsolete">清除 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1333"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1334"/> <source>Subversion command</source> <translation>版本控制命令</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1440"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1441"/> <source>Resolving conficts</source> <translation>解析冲突</translation> </message> @@ -32805,72 +32810,72 @@ <translation type="obsolete">复制 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1547"/> <source>Subversion Set Property</source> <translation>版本控制设置属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1580"/> <source>You have to supply a property name. Aborting.</source> <translation>必须提供一个属性名。终止。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1598"/> <source>Subversion Delete Property</source> <translation>版本控制删除属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1419"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1420"/> <source>Enter property name</source> <translation>输入属性名</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Subversion Log</source> <translation>版本控制日志</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1730"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1731"/> <source>Select number of entries to show.</source> <translation>选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1782"/> <source>Locking in the Subversion repository</source> <translation>在版本控制储存库中锁定</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1820"/> <source>Unlocking in the Subversion repository</source> <translation>在版本控制储存库中解锁</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1864"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1865"/> <source>Relocating</source> <translation>重新定位</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Repository Browser</source> <translation>储存库浏览器</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1890"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1891"/> <source>Enter the repository URL.</source> <translation>输入储存库 URL。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1914"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1915"/> <source>Remove from changelist</source> <translation>从更改列表中移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1951"/> <source>Add to changelist</source> <translation>添加更改列表</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1940"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1941"/> <source>Enter name of the changelist:</source> <translation>输入更改列表名称：</translation> </message> @@ -32894,22 +32899,22 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Property set.</source> <translation>属性设置。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> <source>Property deleted.</source> <translation>属性已删除。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Subversion Lock</source> <translation>版本控制锁定</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1762"/> <source>Enter lock comment</source> <translation>输入锁定注释</translation> </message> @@ -33084,32 +33089,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Moving {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="978"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="979"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1079"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1177"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1178"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1297"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1298"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1479"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1480"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -33125,7 +33130,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1086"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -38503,7 +38508,7 @@ <translation type="obsolete"><p><b>模板组</b> 表示成组的单个模板。组具有一个特殊属性，应用于编程语言。要添加模板条目，至少须要定义一个组。</p><p><b>模板条目</b> 就是实际的模板。模板条目以模板组进行分组。关于如何进行定义的帮助可以在模板编辑对话框中找到。在安装 Eric4 的 Examples 子文件夹中也可以找到模板的范例。</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source>Edit Template Group</source> <translation>编辑模板组</translation> </message> @@ -38513,7 +38518,7 @@ <translation type="obsolete"><p>具有名称 <b>%1</b> 的模板组已存在。</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source>Save templates</source> <translation>保存模板</translation> </message> @@ -38523,7 +38528,7 @@ <translation type="obsolete"><p>无法写入模板文件 <b>%1</b> 。</p></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source>Read templates</source> <translation>写入模板</translation> </message> @@ -38548,22 +38553,22 @@ <translation type="unfinished"><p><b>模板组</b> 表示成组的单个模板。组具有一个特殊属性，应用于编程语言。要添加模板条目，至少须要定义一个组。</p><p><b>模板条目</b> 就是实际的模板。模板条目以模板组进行分组。关于如何进行定义的帮助可以在模板编辑对话框中找到。在安装 Eric4 的 Examples 子文件夹中也可以找到模板的范例。</p> {5 ?}</translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="776"/> + <location filename="Templates/TemplateViewer.py" line="774"/> <source><p>A template group with the name <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="871"/> + <location filename="Templates/TemplateViewer.py" line="869"/> <source><p>The templates file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="921"/> + <location filename="Templates/TemplateViewer.py" line="919"/> <source><p>The templates file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Templates/TemplateViewer.py" line="931"/> + <location filename="Templates/TemplateViewer.py" line="929"/> <source><p>The templates file <b>{0}</b> has an unsupported format.</p></source> <translation type="unfinished"></translation> </message> @@ -47013,12 +47018,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1405"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1409"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -47041,23 +47046,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1400"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1401"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1415"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -47131,7 +47136,7 @@ <translation type="obsolete"><h3>储存库信息</h3><table><tr><td><b>版本控制版本</b></td><td>%1</td></tr><tr><td><b>URL</b></td><td>%2</td></tr><tr><td><b>当前修订</b></td><td>%3</td></tr><tr><td><b>已提交的修订</b></td><td>%4</td></tr><tr><td><b>提交日期</b></td><td>%5</td></tr><tr><td><b>提交时间</b></td><td>%6</td></tr><tr><td><b>最终作者</b></td><td>%7</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1374"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> <source>unknown</source> <translation>未知</translation> </message> @@ -47141,12 +47146,12 @@ <translation type="obsolete"><h3>储存库信息</h3><table><tr><td><b>PySvn 版本</b></td><td>%1</td></tr><tr><td><b>版本控制版本</b></td><td>%2</td></tr><tr><td><b>版本控制 API 版本</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>当前修订</b></td><td>%5</td></tr><tr><td><b>已提交的修订</b></td><td>%6</td></tr><tr><td><b>提交日期</b></td><td>%7</td></tr><tr><td><b>提交时间</b></td><td>%8</td></tr><tr><td><b>最终作者</b></td><td>%9</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1245"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1246"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1376"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
