Mercurial Repositories > eric / changeset
changeset
Updated translations.
Thu, 03 Apr 2014 19:02:33 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 03 Apr 2014 19:02:33 +0200
- changeset 3473
- 533226ce6c1e
- parent 3472
- 9ea593813385
- child 3475
- 852dc7d65ff0
Updated translations.
| i18n/eric5_cs.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_de.qm | file | annotate | diff | comparison | revisions | |
| i18n/eric5_de.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric5_en.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 Thu Apr 03 18:58:08 2014 +0200 +++ b/i18n/eric5_cs.ts Thu Apr 03 19:02:33 2014 +0200 @@ -20411,12 +20411,12 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -23203,12 +23203,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> <source>Show difference</source> - <translation>Zobrazit odlišnosti</translation> + <translation type="obsolete">Zobrazit odlišnosti</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Show difference (extended)</source> - <translation>Zobrazit odlišnosti (rozšířeně)</translation> + <translation type="obsolete">Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> @@ -23261,11 +23261,6 @@ <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> - <source>Conflict resolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="523"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> @@ -23276,18 +23271,33 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="328"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> + <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="337"/> - <source>Show difference side-by-side (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> - <source>Extensions</source> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> </context> @@ -23526,7 +23536,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show difference</source> - <translation>Zobrazit odlišnosti</translation> + <translation type="obsolete">Zobrazit odlišnosti</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> @@ -23541,12 +23551,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation><b>Zobrazit odlišnosti</b><p>Zobrazí odlišnosti mezi lokálním projektem a repozitářem.</p></translation> + <translation type="obsolete"><b>Zobrazit odlišnosti</b><p>Zobrazí odlišnosti mezi lokálním projektem a repozitářem.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show difference (extended)</source> - <translation>Zobrazit odlišnosti (rozšířeně)</translation> + <translation type="obsolete">Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> @@ -23556,7 +23566,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation><b>Zobrazit odlišnosti (rozšířeně)</b><p>Zobrazují se odlišnosti vybraných revizí vůči projektu.</p></translation> + <translation type="obsolete"><b>Zobrazit odlišnosti (rozšířeně)</b><p>Zobrazují se odlišnosti vybraných revizí vůči projektu.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> @@ -24593,6 +24603,26 @@ <source>Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -31810,302 +31840,302 @@ <translation type="obsolete">Python</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <location filename="../QScintilla/Lexers/__init__.py" line="129"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> <source>SQL</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>TeX</source> - <translation></translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="135"/> + <source>TeX</source> + <translation></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="137"/> <source>VHDL</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="498"/> + <location filename="../QScintilla/Lexers/__init__.py" line="503"/> <source>Pyrex Files (*.pyx)</source> <translation>Pyrex soubory (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="501"/> + <location filename="../QScintilla/Lexers/__init__.py" line="506"/> <source>Quixote Template Files (*.ptl)</source> <translation>Quixote Template soubory (*.ptl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="504"/> + <location filename="../QScintilla/Lexers/__init__.py" line="509"/> <source>Ruby Files (*.rb)</source> <translation>Ruby soubory (*.rb)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="507"/> + <location filename="../QScintilla/Lexers/__init__.py" line="512"/> <source>IDL Files (*.idl)</source> <translation>IDL soubory (*.idl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="348"/> + <location filename="../QScintilla/Lexers/__init__.py" line="353"/> <source>C Files (*.h *.c)</source> <translation>C soubory (*.h *.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="351"/> + <location filename="../QScintilla/Lexers/__init__.py" line="356"/> <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> <translation>C++ soubory (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="519"/> + <location filename="../QScintilla/Lexers/__init__.py" line="524"/> <source>C# Files (*.cs)</source> <translation>C# soubory (*.cs)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="357"/> + <location filename="../QScintilla/Lexers/__init__.py" line="362"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation>HTML soubory (*.html *.htm *.asp *.shtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="531"/> + <location filename="../QScintilla/Lexers/__init__.py" line="536"/> <source>CSS Files (*.css)</source> <translation>CSS soubory (*.css)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="534"/> + <location filename="../QScintilla/Lexers/__init__.py" line="539"/> <source>QSS Files (*.qss)</source> <translation>QSS soubory (*.qss)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="366"/> + <location filename="../QScintilla/Lexers/__init__.py" line="371"/> <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> <translation>PHP soubory (*.php *.php3 *.php4 *.php5 *.phtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="546"/> + <location filename="../QScintilla/Lexers/__init__.py" line="551"/> <source>Qt Resource Files (*.qrc)</source> <translation>Qt Resource soubory (*.qrc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <location filename="../QScintilla/Lexers/__init__.py" line="380"/> <source>D Files (*.d *.di)</source> <translation>D soubory (*.d *.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="555"/> + <location filename="../QScintilla/Lexers/__init__.py" line="560"/> <source>Java Files (*.java)</source> <translation>Java soubory (*.java)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="558"/> + <location filename="../QScintilla/Lexers/__init__.py" line="563"/> <source>JavaScript Files (*.js)</source> <translation>JavaScript soubory (*.js)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="561"/> + <location filename="../QScintilla/Lexers/__init__.py" line="566"/> <source>SQL Files (*.sql)</source> <translation>SQL soubory (*.sql)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="564"/> + <location filename="../QScintilla/Lexers/__init__.py" line="569"/> <source>Docbook Files (*.docbook)</source> <translation>Docbook soubory (*.docbook)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="390"/> + <location filename="../QScintilla/Lexers/__init__.py" line="395"/> <source>Perl Files (*.pl *.pm *.ph)</source> <translation>Perl soubory (*.pl *.pm *.ph)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="573"/> + <location filename="../QScintilla/Lexers/__init__.py" line="578"/> <source>Lua Files (*.lua)</source> <translation>Lua soubory (*.lua)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <location filename="../QScintilla/Lexers/__init__.py" line="401"/> <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> <translation>Tex soubory (*.tex *.sty *.aux *.toc *.idx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="576"/> + <location filename="../QScintilla/Lexers/__init__.py" line="581"/> <source>Shell Files (*.sh)</source> <translation>Shell soubory (*.sh)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="402"/> + <location filename="../QScintilla/Lexers/__init__.py" line="407"/> <source>Batch Files (*.bat *.cmd)</source> <translation>Batch soubory (*.bat *.cmd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="405"/> + <location filename="../QScintilla/Lexers/__init__.py" line="410"/> <source>Diff Files (*.diff *.patch)</source> <translation>Diff soubory (*.diff *.patch)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="408"/> + <location filename="../QScintilla/Lexers/__init__.py" line="413"/> <source>Makefiles (*.mak)</source> <translation>Makefiles (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <location filename="../QScintilla/Lexers/__init__.py" line="416"/> <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> <translation>Properties soubory (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="600"/> + <location filename="../QScintilla/Lexers/__init__.py" line="605"/> <source>Povray Files (*.pov)</source> <translation>Povray soubory (*.pov)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="418"/> + <location filename="../QScintilla/Lexers/__init__.py" line="423"/> <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> <translation>CMake soubory (CMakeLists.txt *.cmake *.ctest)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="421"/> + <location filename="../QScintilla/Lexers/__init__.py" line="426"/> <source>VHDL Files (*.vhd *.vhdl)</source> <translation>VHDL soubory (*.vhd *.vhdl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <location filename="../QScintilla/Lexers/__init__.py" line="660"/> <source>All Files (*)</source> <translation>Všechny soubory (*)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>TCL</source> <translation>TCL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="424"/> + <location filename="../QScintilla/Lexers/__init__.py" line="429"/> <source>TCL/Tk Files (*.tcl *.tk)</source> <translation>TCL/Tk soubory (*.tcl *.tk)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="510"/> + <location filename="../QScintilla/Lexers/__init__.py" line="515"/> <source>C Files (*.c)</source> <translation>C soubory (*.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="513"/> + <location filename="../QScintilla/Lexers/__init__.py" line="518"/> <source>C++ Files (*.cpp)</source> <translation>C++ soubory (*.cpp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="516"/> + <location filename="../QScintilla/Lexers/__init__.py" line="521"/> <source>C++/C Header Files (*.h)</source> <translation>C++/C hlavičkové soubory (*.h)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="522"/> + <location filename="../QScintilla/Lexers/__init__.py" line="527"/> <source>HTML Files (*.html)</source> <translation>HTML soubory (*.html)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="525"/> + <location filename="../QScintilla/Lexers/__init__.py" line="530"/> <source>PHP Files (*.php)</source> <translation>PHP soubory (*.php)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="528"/> + <location filename="../QScintilla/Lexers/__init__.py" line="533"/> <source>ASP Files (*.asp)</source> <translation>ASP soubory (*.asp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="537"/> + <location filename="../QScintilla/Lexers/__init__.py" line="542"/> <source>XML Files (*.xml)</source> <translation>XML soubory (*.xml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="540"/> + <location filename="../QScintilla/Lexers/__init__.py" line="545"/> <source>XSL Files (*.xsl)</source> <translation>XSL soubory (*.xsl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="543"/> + <location filename="../QScintilla/Lexers/__init__.py" line="548"/> <source>DTD Files (*.dtd)</source> <translation>DTD soubory (*.dtd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="549"/> + <location filename="../QScintilla/Lexers/__init__.py" line="554"/> <source>D Files (*.d)</source> <translation>D soubory (*.d)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="552"/> + <location filename="../QScintilla/Lexers/__init__.py" line="557"/> <source>D Interface Files (*.di)</source> <translation>D Interface soubory (*.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="567"/> + <location filename="../QScintilla/Lexers/__init__.py" line="572"/> <source>Perl Files (*.pl)</source> <translation>Perl soubory (*.pl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="570"/> + <location filename="../QScintilla/Lexers/__init__.py" line="575"/> <source>Perl Module Files (*.pm)</source> <translation>Perl Module soubory (*.pm)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="579"/> + <location filename="../QScintilla/Lexers/__init__.py" line="584"/> <source>Batch Files (*.bat)</source> <translation>Batch soubory (*.bat)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="582"/> + <location filename="../QScintilla/Lexers/__init__.py" line="587"/> <source>TeX Files (*.tex)</source> <translation>TeX soubory (*.tex)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="585"/> + <location filename="../QScintilla/Lexers/__init__.py" line="590"/> <source>TeX Template Files (*.sty)</source> <translation>TeX Template soubory (*.sty)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="588"/> + <location filename="../QScintilla/Lexers/__init__.py" line="593"/> <source>Diff Files (*.diff)</source> <translation>Diff soubory (*.diff)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="591"/> + <location filename="../QScintilla/Lexers/__init__.py" line="596"/> <source>Make Files (*.mak)</source> <translation>Make soubory (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="594"/> + <location filename="../QScintilla/Lexers/__init__.py" line="599"/> <source>Properties Files (*.ini)</source> <translation>Properties soubory (*.ini)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="597"/> + <location filename="../QScintilla/Lexers/__init__.py" line="602"/> <source>Configuration Files (*.cfg)</source> <translation>Konfigurační soubory (*.cfg)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="603"/> + <location filename="../QScintilla/Lexers/__init__.py" line="608"/> <source>CMake Files (CMakeLists.txt)</source> <translation>CMake soubory (CMakeLists.txt)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="606"/> + <location filename="../QScintilla/Lexers/__init__.py" line="611"/> <source>CMake Macro Files (*.cmake)</source> <translation>CMake makro soubory (*.cmake)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="609"/> + <location filename="../QScintilla/Lexers/__init__.py" line="614"/> <source>VHDL Files (*.vhd)</source> <translation>VHDL soubory (*.vhd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="612"/> + <location filename="../QScintilla/Lexers/__init__.py" line="617"/> <source>TCL Files (*.tcl)</source> <translation>TCL soubory (*.tcl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="615"/> + <location filename="../QScintilla/Lexers/__init__.py" line="620"/> <source>Tk Files (*.tk)</source> <translation>Tk soubory (*.tk)</translation> </message> @@ -32125,32 +32155,32 @@ <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="427"/> + <location filename="../QScintilla/Lexers/__init__.py" line="432"/> <source>Fortran Files (*.f90 *.f95 *.f2k)</source> <translation>Fortran soubory (*.f90 *.f95 *.f2k)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="430"/> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> <source>Fortran77 Files (*.f *.for)</source> <translation>Fortran77 soubory (*.f *.for)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="433"/> + <location filename="../QScintilla/Lexers/__init__.py" line="438"/> <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> <translation>Pascal soubory (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="618"/> + <location filename="../QScintilla/Lexers/__init__.py" line="623"/> <source>Fortran Files (*.f95)</source> <translation>Fortran soubory (*.f95)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="621"/> + <location filename="../QScintilla/Lexers/__init__.py" line="626"/> <source>Fortran77 Files (*.f)</source> <translation>Fortran77 soubory (*.f)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="624"/> + <location filename="../QScintilla/Lexers/__init__.py" line="629"/> <source>Pascal Files (*.pas)</source> <translation>Pascal soubory (*.pas)</translation> </message> @@ -32160,47 +32190,47 @@ <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="137"/> + <location filename="../QScintilla/Lexers/__init__.py" line="139"/> <source>XML</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="139"/> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>YAML</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="369"/> + <location filename="../QScintilla/Lexers/__init__.py" line="374"/> <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> <translation>XML soubory (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="627"/> + <location filename="../QScintilla/Lexers/__init__.py" line="632"/> <source>PostScript Files (*.ps)</source> <translation>PostScript soubory (*.ps)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="439"/> + <location filename="../QScintilla/Lexers/__init__.py" line="444"/> <source>YAML Files (*.yaml *.yml)</source> <translation>YAML soubory (*.yaml *.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="630"/> + <location filename="../QScintilla/Lexers/__init__.py" line="635"/> <source>YAML Files (*.yml)</source> <translation>YAML soubory (*.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="159"/> <source>Pygments</source> <translation>Pygments</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="330"/> + <location filename="../QScintilla/Lexers/__init__.py" line="335"/> <source>Python Files (*.py *.py2 *.py3)</source> <translation>Python soubory (*.py *.py2 *.py3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="333"/> + <location filename="../QScintilla/Lexers/__init__.py" line="338"/> <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> <translation>Python GUI soubory (*.pyw *.pyw2 *.pyw3)</translation> </message> @@ -32210,7 +32240,7 @@ <translation type="obsolete">Python soubory (*.py2)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="489"/> + <location filename="../QScintilla/Lexers/__init__.py" line="494"/> <source>Python3 Files (*.py)</source> <translation>Python3 soubory (*.py)</translation> </message> @@ -32220,17 +32250,17 @@ <translation type="obsolete">Python GUI soubory (*.pyw2)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="495"/> + <location filename="../QScintilla/Lexers/__init__.py" line="500"/> <source>Python3 GUI Files (*.pyw)</source> <translation>Python3 GUI soubory (*.pyw)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="486"/> + <location filename="../QScintilla/Lexers/__init__.py" line="491"/> <source>Python2 Files (*.py2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="492"/> + <location filename="../QScintilla/Lexers/__init__.py" line="497"/> <source>Python2 GUI Files (*.pyw2)</source> <translation type="unfinished"></translation> </message> @@ -32245,35 +32275,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Matlab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Octave</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Matlab Files (*.m *.m.matlab)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Matlab Files (*.m)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Octave Files (*.m.octave)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Octave Files (*.m *.m.octave)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <source>QSS</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -36888,6 +36923,44 @@ </message> </context> <context> + <name>PreviewerQSS</name> + <message> + <location filename="../UI/Previewers/PreviewerQSS.ui" line="27"/> + <source>Preview Style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="36"/> + <source>Action 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="38"/> + <source>Action 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="42"/> + <source>MDI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Python</source> + <translation type="unfinished">Python</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Ruby</source> + <translation type="unfinished">Ruby</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>JavaScript</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Printer</name> <message> <location filename="../QScintilla/Printer.py" line="63"/> @@ -50945,12 +51018,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> <source>Show difference</source> - <translation>Zobrazit odlišnosti</translation> + <translation type="obsolete">Zobrazit odlišnosti</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> <source>Show difference (extended)</source> - <translation>Zobrazit odlišnosti (rozšířeně)</translation> + <translation type="obsolete">Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="293"/> @@ -51035,7 +51108,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> <source>Show difference (URLs)</source> - <translation>Zobrazit odlišnosti (URL)</translation> + <translation type="obsolete">Zobrazit odlišnosti (URL)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="568"/> @@ -51058,11 +51131,6 @@ <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> - <source>Conflict resolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="549"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> @@ -51073,13 +51141,33 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="274"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> + <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="283"/> - <source>Show difference side-by-side (extended)</source> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> </context> @@ -51223,7 +51311,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> <source>Show difference</source> - <translation>Zobrazit odlišnosti</translation> + <translation type="obsolete">Zobrazit odlišnosti</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> @@ -51238,12 +51326,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation><b>Zobrazit odlišnosti</b><p>Zobrazí odlišnosti mezi lokálním projektem a repozitářem.</p></translation> + <translation type="obsolete"><b>Zobrazit odlišnosti</b><p>Zobrazí odlišnosti mezi lokálním projektem a repozitářem.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> <source>Show difference (extended)</source> - <translation>Zobrazit odlišnosti (rozšířeně)</translation> + <translation type="obsolete">Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="149"/> @@ -51253,7 +51341,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation><b>Zobrazit odlišnosti (rozšířeně)</b><p>Zobrazují se odlišnosti vybraných revizí vůči projektu.</p></translation> + <translation type="obsolete"><b>Zobrazit odlišnosti (rozšířeně)</b><p>Zobrazují se odlišnosti vybraných revizí vůči projektu.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/> @@ -51613,7 +51701,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> <source>Show difference (URLs)</source> - <translation>Zobrazit odlišnosti (na URL)</translation> + <translation type="obsolete">Zobrazit odlišnosti (na URL)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> @@ -51623,7 +51711,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> - <translation><b>Zobrazit odlišnosti (na URL)</b><p>Zobrazují se odlišnosti v projektu mezi dvěma repozitáři na URL.</p></translation> + <translation type="obsolete"><b>Zobrazit odlišnosti (na URL)</b><p>Zobrazují se odlišnosti v projektu mezi dvěma repozitáři na URL.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="455"/> @@ -51735,6 +51823,36 @@ <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name>
--- a/i18n/eric5_de.ts Thu Apr 03 18:58:08 2014 +0200 +++ b/i18n/eric5_de.ts Thu Apr 03 19:02:33 2014 +0200 @@ -19510,12 +19510,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> @@ -22241,16 +22241,6 @@ <translation>Status anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> - <source>Show difference</source> - <translation>Unterschiede anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> - <source>Show difference (extended)</source> - <translation>Unterschiede anzeigen (erweitert)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> <source>Show annotated file</source> <translation>Zeige kommentierte Datei</translation> @@ -22291,11 +22281,6 @@ <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> - <source>Conflict resolved</source> - <translation>Konflikt gelöst</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="523"/> <source>Copy</source> <translation>Kopieren</translation> @@ -22306,19 +22291,34 @@ <translation>Verschieben</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> + <source>Extensions</source> + <translation>Erweiterungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> + <source>Show differences</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="328"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> <translation>Unterschiede nebeneinander anzeigen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> + <source>Show differences (extended)</source> + <translation>Unterschiede anzeigen (erweitert)</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="337"/> - <source>Show difference side-by-side (extended)</source> + <source>Show differences side-by-side (extended)</source> <translation>Unterschiede nebeneinander anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> - <source>Extensions</source> - <translation>Erweiterungen</translation> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <source>Conflicts resolved</source> + <translation>Konflikte gelöst</translation> </message> </context> <context> @@ -22500,11 +22500,6 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show difference</source> - <translation>Unterschiede anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation>&Unterschiede anzeigen</translation> </message> @@ -22514,26 +22509,11 @@ <translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> - <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation><b>Unterschiede anzeigen</b><p>Dies zeigt den Unterschied des lokalen Projektes zum Repository an.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> - <source>Show difference (extended)</source> - <translation>Unterschiede anzeigen (erweitert)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zeigt den Unterschied von Revisionen des Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> - <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt den Unterschied von Revisionen des Projektes an.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show status</source> <translation>Status anzeigen</translation> @@ -23448,6 +23428,26 @@ <source>Administration</source> <translation>Verwaltung</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> + <source>Show differences</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> + <source>Show differences (extended)</source> + <translation>Unterschiede anzeigen (erweitert)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation><b>Unterschiede anzeigen</b><p>Dies zeigt Unterschiede des lokalen Projektes zum Repository an.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt Unterschiede von Revisionen des Projektes an.</p></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -30448,302 +30448,302 @@ <translation>Einstellungen</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <location filename="../QScintilla/Lexers/__init__.py" line="129"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> <source>SQL</source> <translation>SQL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>TeX</source> - <translation>TeX</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="135"/> + <source>TeX</source> + <translation>TeX</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="137"/> <source>VHDL</source> <translation>VHDL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="498"/> + <location filename="../QScintilla/Lexers/__init__.py" line="503"/> <source>Pyrex Files (*.pyx)</source> <translation>Pyrex-Dateien (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="501"/> + <location filename="../QScintilla/Lexers/__init__.py" line="506"/> <source>Quixote Template Files (*.ptl)</source> <translation>Quixote-Templatedateien (*.ptl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="504"/> + <location filename="../QScintilla/Lexers/__init__.py" line="509"/> <source>Ruby Files (*.rb)</source> <translation>Ruby-Dateien (*.rb)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="507"/> + <location filename="../QScintilla/Lexers/__init__.py" line="512"/> <source>IDL Files (*.idl)</source> <translation>IDL-Dateien (*.idl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="348"/> + <location filename="../QScintilla/Lexers/__init__.py" line="353"/> <source>C Files (*.h *.c)</source> <translation>C-Dateien (*.h *.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="351"/> + <location filename="../QScintilla/Lexers/__init__.py" line="356"/> <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> <translation>C++-Dateien (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="519"/> + <location filename="../QScintilla/Lexers/__init__.py" line="524"/> <source>C# Files (*.cs)</source> <translation>C#-Dateien (*.cs)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="357"/> + <location filename="../QScintilla/Lexers/__init__.py" line="362"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation>HTML-Dateien (*.html *.htm *.asp *.shtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="531"/> + <location filename="../QScintilla/Lexers/__init__.py" line="536"/> <source>CSS Files (*.css)</source> <translation>CSS-Dateien (*.css)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="534"/> + <location filename="../QScintilla/Lexers/__init__.py" line="539"/> <source>QSS Files (*.qss)</source> <translation>QSS-Dateien (*.qss)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="366"/> + <location filename="../QScintilla/Lexers/__init__.py" line="371"/> <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> <translation>PHP-Dateien (*.php *.php3 *.php4 *.php5 *.phtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="546"/> + <location filename="../QScintilla/Lexers/__init__.py" line="551"/> <source>Qt Resource Files (*.qrc)</source> <translation>Qt-Ressourcendateien (*.qrc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <location filename="../QScintilla/Lexers/__init__.py" line="380"/> <source>D Files (*.d *.di)</source> <translation>D-Dateien (*.d *.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="555"/> + <location filename="../QScintilla/Lexers/__init__.py" line="560"/> <source>Java Files (*.java)</source> <translation>Java-Dateien (*.java)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="558"/> + <location filename="../QScintilla/Lexers/__init__.py" line="563"/> <source>JavaScript Files (*.js)</source> <translation>JavaScript-Dateien (*.js)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="561"/> + <location filename="../QScintilla/Lexers/__init__.py" line="566"/> <source>SQL Files (*.sql)</source> <translation>SQL-Dateien (*.sql)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="564"/> + <location filename="../QScintilla/Lexers/__init__.py" line="569"/> <source>Docbook Files (*.docbook)</source> <translation>Docbook-Dateien (*.docbook)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="390"/> + <location filename="../QScintilla/Lexers/__init__.py" line="395"/> <source>Perl Files (*.pl *.pm *.ph)</source> <translation>Perl-Dateien (*.pl *,pm *.ph)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="573"/> + <location filename="../QScintilla/Lexers/__init__.py" line="578"/> <source>Lua Files (*.lua)</source> <translation>Lua-Dateien (*.lua)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <location filename="../QScintilla/Lexers/__init__.py" line="401"/> <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> <translation>TeX-Dateien (*.tex *.sty *.aux *.toc *.idx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="576"/> + <location filename="../QScintilla/Lexers/__init__.py" line="581"/> <source>Shell Files (*.sh)</source> <translation>Shell dateien (*.sh)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="402"/> + <location filename="../QScintilla/Lexers/__init__.py" line="407"/> <source>Batch Files (*.bat *.cmd)</source> <translation>Batch-Dateien (*.bat *.cmd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="405"/> + <location filename="../QScintilla/Lexers/__init__.py" line="410"/> <source>Diff Files (*.diff *.patch)</source> <translation>Diff-Dateien (*.diff *.patch)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="408"/> + <location filename="../QScintilla/Lexers/__init__.py" line="413"/> <source>Makefiles (*.mak)</source> <translation>Make-Dateien (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <location filename="../QScintilla/Lexers/__init__.py" line="416"/> <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> <translation>Properties-Dateien (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="600"/> + <location filename="../QScintilla/Lexers/__init__.py" line="605"/> <source>Povray Files (*.pov)</source> <translation>Povray-Dateien (*.pov)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="418"/> + <location filename="../QScintilla/Lexers/__init__.py" line="423"/> <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> <translation>CMakeDateien (CMakeLists.txt *.cmake *.ctest)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="421"/> + <location filename="../QScintilla/Lexers/__init__.py" line="426"/> <source>VHDL Files (*.vhd *.vhdl)</source> <translation>VHDLDateien (*.vhd *.vhdl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <location filename="../QScintilla/Lexers/__init__.py" line="660"/> <source>All Files (*)</source> <translation>Alle Dateien (*)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>TCL</source> <translation>TCL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="424"/> + <location filename="../QScintilla/Lexers/__init__.py" line="429"/> <source>TCL/Tk Files (*.tcl *.tk)</source> <translation>TCL-/Tk-Dateien (*.tcl *.tk)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="510"/> + <location filename="../QScintilla/Lexers/__init__.py" line="515"/> <source>C Files (*.c)</source> <translation>C-Dateien (*.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="513"/> + <location filename="../QScintilla/Lexers/__init__.py" line="518"/> <source>C++ Files (*.cpp)</source> <translation>C++-Dateien (*.cpp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="516"/> + <location filename="../QScintilla/Lexers/__init__.py" line="521"/> <source>C++/C Header Files (*.h)</source> <translation>C++-/C-Header Dateien (*.h)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="522"/> + <location filename="../QScintilla/Lexers/__init__.py" line="527"/> <source>HTML Files (*.html)</source> <translation>HTML-Dateien (*.html)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="525"/> + <location filename="../QScintilla/Lexers/__init__.py" line="530"/> <source>PHP Files (*.php)</source> <translation>PHP-Dateien (*.php)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="528"/> + <location filename="../QScintilla/Lexers/__init__.py" line="533"/> <source>ASP Files (*.asp)</source> <translation>ASP-Dateien (*.asp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="537"/> + <location filename="../QScintilla/Lexers/__init__.py" line="542"/> <source>XML Files (*.xml)</source> <translation>XML-Dateien (*.xml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="540"/> + <location filename="../QScintilla/Lexers/__init__.py" line="545"/> <source>XSL Files (*.xsl)</source> <translation>XSL-Dateien (*.xsl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="543"/> + <location filename="../QScintilla/Lexers/__init__.py" line="548"/> <source>DTD Files (*.dtd)</source> <translation>DTD-Dateien (*.dtd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="549"/> + <location filename="../QScintilla/Lexers/__init__.py" line="554"/> <source>D Files (*.d)</source> <translation>D-Dateien (*.d)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="552"/> + <location filename="../QScintilla/Lexers/__init__.py" line="557"/> <source>D Interface Files (*.di)</source> <translation>D-Interfacedateien (*.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="567"/> + <location filename="../QScintilla/Lexers/__init__.py" line="572"/> <source>Perl Files (*.pl)</source> <translation>Perl-Dateien (*.pl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="570"/> + <location filename="../QScintilla/Lexers/__init__.py" line="575"/> <source>Perl Module Files (*.pm)</source> <translation>Perl-Moduldateien (*.pm)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="579"/> + <location filename="../QScintilla/Lexers/__init__.py" line="584"/> <source>Batch Files (*.bat)</source> <translation>Batch-Dateien (*.bat)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="582"/> + <location filename="../QScintilla/Lexers/__init__.py" line="587"/> <source>TeX Files (*.tex)</source> <translation>TeX-Dateien (*.tex)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="585"/> + <location filename="../QScintilla/Lexers/__init__.py" line="590"/> <source>TeX Template Files (*.sty)</source> <translation>TeX-Templatedateien (*.sty)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="588"/> + <location filename="../QScintilla/Lexers/__init__.py" line="593"/> <source>Diff Files (*.diff)</source> <translation>Diff-Dateien (*.diff)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="591"/> + <location filename="../QScintilla/Lexers/__init__.py" line="596"/> <source>Make Files (*.mak)</source> <translation>Make-Dateien (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="594"/> + <location filename="../QScintilla/Lexers/__init__.py" line="599"/> <source>Properties Files (*.ini)</source> <translation>Properties-Dateien (*.ini)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="597"/> + <location filename="../QScintilla/Lexers/__init__.py" line="602"/> <source>Configuration Files (*.cfg)</source> <translation>Konfigurationsdateien (*.cfg)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="603"/> + <location filename="../QScintilla/Lexers/__init__.py" line="608"/> <source>CMake Files (CMakeLists.txt)</source> <translation>CMake-Dateien (CMakeLists.txt)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="606"/> + <location filename="../QScintilla/Lexers/__init__.py" line="611"/> <source>CMake Macro Files (*.cmake)</source> <translation>CMake-Makrodateien (*.cmake)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="609"/> + <location filename="../QScintilla/Lexers/__init__.py" line="614"/> <source>VHDL Files (*.vhd)</source> <translation>VHDL-Dateien (*.vhd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="612"/> + <location filename="../QScintilla/Lexers/__init__.py" line="617"/> <source>TCL Files (*.tcl)</source> <translation>TCL-Dateien (*.tcl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="615"/> + <location filename="../QScintilla/Lexers/__init__.py" line="620"/> <source>Tk Files (*.tk)</source> <translation>Tk-Dateien (*.tk)</translation> </message> @@ -30763,32 +30763,32 @@ <translation>Pascal</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="427"/> + <location filename="../QScintilla/Lexers/__init__.py" line="432"/> <source>Fortran Files (*.f90 *.f95 *.f2k)</source> <translation>Fortran-Dateien (*.f90 *.f95 *.f2k)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="430"/> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> <source>Fortran77 Files (*.f *.for)</source> <translation>Fortran77-Dateien (*.f *.for)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="433"/> + <location filename="../QScintilla/Lexers/__init__.py" line="438"/> <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> <translation>Pascal-Dateien (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="618"/> + <location filename="../QScintilla/Lexers/__init__.py" line="623"/> <source>Fortran Files (*.f95)</source> <translation>Fortran-Dateien (*.f95)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="621"/> + <location filename="../QScintilla/Lexers/__init__.py" line="626"/> <source>Fortran77 Files (*.f)</source> <translation>Fortran77-Dateien (*.f)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="624"/> + <location filename="../QScintilla/Lexers/__init__.py" line="629"/> <source>Pascal Files (*.pas)</source> <translation>Pascal-Dateien (*.pas)</translation> </message> @@ -30798,67 +30798,67 @@ <translation>PostScript</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="137"/> + <location filename="../QScintilla/Lexers/__init__.py" line="139"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="139"/> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>YAML</source> <translation>YAML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="369"/> + <location filename="../QScintilla/Lexers/__init__.py" line="374"/> <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> <translation>XML-Dateien (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="627"/> + <location filename="../QScintilla/Lexers/__init__.py" line="632"/> <source>PostScript Files (*.ps)</source> <translation>PostScript-Dateien (*.ps)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="439"/> + <location filename="../QScintilla/Lexers/__init__.py" line="444"/> <source>YAML Files (*.yaml *.yml)</source> <translation>YAML-Dateien (*.yaml *.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="630"/> + <location filename="../QScintilla/Lexers/__init__.py" line="635"/> <source>YAML Files (*.yml)</source> <translation>YAML-Dateien (*.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="159"/> <source>Pygments</source> <translation>Pygments</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="330"/> + <location filename="../QScintilla/Lexers/__init__.py" line="335"/> <source>Python Files (*.py *.py2 *.py3)</source> <translation>Python-Dateien (*.py *.py2 *.py3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="333"/> + <location filename="../QScintilla/Lexers/__init__.py" line="338"/> <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> <translation>Python-GUI-Dateien (*.pyw *.pyw2 *.pyw3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="489"/> + <location filename="../QScintilla/Lexers/__init__.py" line="494"/> <source>Python3 Files (*.py)</source> <translation>Python 3-Dateien (*.py)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="495"/> + <location filename="../QScintilla/Lexers/__init__.py" line="500"/> <source>Python3 GUI Files (*.pyw)</source> <translation>Python 3-GUI-Dateien (*.pyw)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="486"/> + <location filename="../QScintilla/Lexers/__init__.py" line="491"/> <source>Python2 Files (*.py2)</source> <translation>Python 2-Dateien (*.py2)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="492"/> + <location filename="../QScintilla/Lexers/__init__.py" line="497"/> <source>Python2 GUI Files (*.pyw2)</source> <translation>Python 2-GUI-Dateien (*.pyw2)</translation> </message> @@ -30873,35 +30873,40 @@ <translation>Python 3</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Matlab</source> <translation>Matlab</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Octave</source> <translation>Octave</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Matlab Files (*.m *.m.matlab)</source> <translation>Matlab-Dateien (*.m *.m.matlab)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Matlab Files (*.m)</source> <translation>Matlab-Dateien (*.m)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Octave Files (*.m.octave)</source> <translation>Octave-Dateien (*.m.octave)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Octave Files (*.m *.m.octave)</source> <translation>Octave-Dateien (*.m *.m.octave)</translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <source>QSS</source> + <translation>QSS</translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -34962,6 +34967,44 @@ </message> </context> <context> + <name>PreviewerQSS</name> + <message> + <location filename="../UI/Previewers/PreviewerQSS.ui" line="27"/> + <source>Preview Style</source> + <translation>Stilvorschau</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="36"/> + <source>Action 1</source> + <translation>Aktion 1</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="38"/> + <source>Action 2</source> + <translation>Aktion 2</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="42"/> + <source>MDI</source> + <translation>MDI</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Python</source> + <translation>Python</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Ruby</source> + <translation>Ruby</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>JavaScript</source> + <translation>JavaScript</translation> + </message> +</context> +<context> <name>Printer</name> <message> <location filename="../QScintilla/Printer.py" line="63"/> @@ -48521,16 +48564,6 @@ <translation>Status anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> - <source>Show difference</source> - <translation>Unterschiede anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> - <source>Show difference (extended)</source> - <translation>Unterschiede anzeigen (erweitert)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="705"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> @@ -48611,11 +48644,6 @@ <translation>Zeige Repositoryinformationen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> - <source>Show difference (URLs)</source> - <translation>Unterschiede anzeigen (URLs)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="568"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> @@ -48636,11 +48664,6 @@ <translation>Von Änderungsliste entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> - <source>Conflict resolved</source> - <translation>Konflikt gelöst</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="549"/> <source>Copy</source> <translation>Kopieren</translation> @@ -48651,15 +48674,35 @@ <translation>Verschieben</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> + <source>Show differences</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="274"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> <translation>Unterschiede nebeneinander anzeigen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> + <source>Show differences (extended)</source> + <translation>Unterschiede anzeigen (erweitert)</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="283"/> - <source>Show difference side-by-side (extended)</source> + <source>Show differences side-by-side (extended)</source> <translation>Unterschiede nebeneinander anzeigen (erweitert)</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> + <source>Show differences (URLs)</source> + <translation>Unterschiede anzeigen (URLs)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> + <source>Conflicts resolved</source> + <translation>Konflikte gelöst</translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -48745,11 +48788,6 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> - <source>Show difference</source> - <translation>Unterschiede anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> <source>Show &difference</source> <translation>&Unterschiede anzeigen</translation> </message> @@ -48759,26 +48797,11 @@ <translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> - <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation><b>Unterschiede anzeigen</b><p>Dies zeigt den Unterschied des lokalen Projektes zum Repository an.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> - <source>Show difference (extended)</source> - <translation>Unterschiede anzeigen (erweitert)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="149"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zeigt den Unterschied von Revisionen des Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> - <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt den Unterschied von Revisionen des Projektes an.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/> <source>Show status</source> <translation>Status anzeigen</translation> @@ -49114,21 +49137,11 @@ <translation><b>Zeige Repositoryinformationen</b><p>Dies zeigt repositorybezogene Informationen des lokalen Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> - <source>Show difference (URLs)</source> - <translation>Unterschiede anzeigen (URLs)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> <source>Show the difference of the project between two repository URLs</source> <translation>Zeigt den Unterschied des Projektes zwischen zwei Repository-URLs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> - <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> - <translation><b>Unterschiede anzeigen (URLs)</b><p>Dies zeigt den Unterschied des Projektes zwischen zwei Repository-URLs.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="455"/> <source>Repository Browser</source> <translation>Repositorybrowser</translation> @@ -49238,6 +49251,36 @@ <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation><b>Modernisieren</b><p>Ändert das Format der Arbeitskopie in das aktuelle Format.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> + <source>Show differences</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> + <source>Show differences (extended)</source> + <translation>Unterschiede anzeigen (erweitert)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> + <source>Show differences (URLs)</source> + <translation>Unterschiede anzeigen (URLs)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation><b>Unterschiede anzeigen</b><p>Dies zeigt Unterschiede des lokalen Projektes zum Repository an.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt Unterschiede von Revisionen des Projektes an.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> + <translation><b>Unterschiede anzeigen (URLs)</b><p>Dies zeigt Unterschiede des Projektes zwischen zwei Repository-URLs.</p></translation> + </message> </context> <context> <name>SvnPropDelDialog</name>
--- a/i18n/eric5_en.ts Thu Apr 03 18:58:08 2014 +0200 +++ b/i18n/eric5_en.ts Thu Apr 03 19:02:33 2014 +0200 @@ -19406,12 +19406,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -22101,16 +22101,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> - <source>Show difference</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> - <source>Show difference (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> <source>Show annotated file</source> <translation type="unfinished"></translation> @@ -22146,11 +22136,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> - <source>Conflict resolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="523"/> <source>Copy</source> <translation type="unfinished"></translation> @@ -22161,18 +22146,33 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="328"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> + <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="337"/> - <source>Show difference side-by-side (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> - <source>Extensions</source> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> </context> @@ -22370,11 +22370,6 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show difference</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation type="unfinished"></translation> </message> @@ -22384,26 +22379,11 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> - <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> - <source>Show difference (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> - <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show status</source> <translation type="unfinished"></translation> @@ -23303,6 +23283,26 @@ <source>Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -30313,397 +30313,397 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <location filename="../QScintilla/Lexers/__init__.py" line="129"/> <source>Ruby</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="129"/> - <source>SQL</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="131"/> - <source>TCL</source> + <source>SQL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>TeX</source> + <source>TCL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="135"/> - <source>VHDL</source> + <source>TeX</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="137"/> - <source>XML</source> + <source>VHDL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="139"/> + <source>XML</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>YAML</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="159"/> <source>Pygments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="330"/> + <location filename="../QScintilla/Lexers/__init__.py" line="335"/> <source>Python Files (*.py *.py2 *.py3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="333"/> + <location filename="../QScintilla/Lexers/__init__.py" line="338"/> <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="498"/> + <location filename="../QScintilla/Lexers/__init__.py" line="503"/> <source>Pyrex Files (*.pyx)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="501"/> + <location filename="../QScintilla/Lexers/__init__.py" line="506"/> <source>Quixote Template Files (*.ptl)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="504"/> + <location filename="../QScintilla/Lexers/__init__.py" line="509"/> <source>Ruby Files (*.rb)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="507"/> + <location filename="../QScintilla/Lexers/__init__.py" line="512"/> <source>IDL Files (*.idl)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="348"/> + <location filename="../QScintilla/Lexers/__init__.py" line="353"/> <source>C Files (*.h *.c)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="351"/> + <location filename="../QScintilla/Lexers/__init__.py" line="356"/> <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="519"/> + <location filename="../QScintilla/Lexers/__init__.py" line="524"/> <source>C# Files (*.cs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="357"/> + <location filename="../QScintilla/Lexers/__init__.py" line="362"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="531"/> + <location filename="../QScintilla/Lexers/__init__.py" line="536"/> <source>CSS Files (*.css)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="534"/> + <location filename="../QScintilla/Lexers/__init__.py" line="539"/> <source>QSS Files (*.qss)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="366"/> + <location filename="../QScintilla/Lexers/__init__.py" line="371"/> <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="369"/> + <location filename="../QScintilla/Lexers/__init__.py" line="374"/> <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="546"/> + <location filename="../QScintilla/Lexers/__init__.py" line="551"/> <source>Qt Resource Files (*.qrc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <location filename="../QScintilla/Lexers/__init__.py" line="380"/> <source>D Files (*.d *.di)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="555"/> + <location filename="../QScintilla/Lexers/__init__.py" line="560"/> <source>Java Files (*.java)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="558"/> + <location filename="../QScintilla/Lexers/__init__.py" line="563"/> <source>JavaScript Files (*.js)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="561"/> + <location filename="../QScintilla/Lexers/__init__.py" line="566"/> <source>SQL Files (*.sql)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="564"/> + <location filename="../QScintilla/Lexers/__init__.py" line="569"/> <source>Docbook Files (*.docbook)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="390"/> + <location filename="../QScintilla/Lexers/__init__.py" line="395"/> <source>Perl Files (*.pl *.pm *.ph)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="573"/> + <location filename="../QScintilla/Lexers/__init__.py" line="578"/> <source>Lua Files (*.lua)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <location filename="../QScintilla/Lexers/__init__.py" line="401"/> <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="576"/> + <location filename="../QScintilla/Lexers/__init__.py" line="581"/> <source>Shell Files (*.sh)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="402"/> + <location filename="../QScintilla/Lexers/__init__.py" line="407"/> <source>Batch Files (*.bat *.cmd)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="405"/> + <location filename="../QScintilla/Lexers/__init__.py" line="410"/> <source>Diff Files (*.diff *.patch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="408"/> + <location filename="../QScintilla/Lexers/__init__.py" line="413"/> <source>Makefiles (*.mak)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <location filename="../QScintilla/Lexers/__init__.py" line="416"/> <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="600"/> + <location filename="../QScintilla/Lexers/__init__.py" line="605"/> <source>Povray Files (*.pov)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="418"/> + <location filename="../QScintilla/Lexers/__init__.py" line="423"/> <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="421"/> + <location filename="../QScintilla/Lexers/__init__.py" line="426"/> <source>VHDL Files (*.vhd *.vhdl)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="424"/> + <location filename="../QScintilla/Lexers/__init__.py" line="429"/> <source>TCL/Tk Files (*.tcl *.tk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="427"/> + <location filename="../QScintilla/Lexers/__init__.py" line="432"/> <source>Fortran Files (*.f90 *.f95 *.f2k)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="430"/> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> <source>Fortran77 Files (*.f *.for)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="433"/> + <location filename="../QScintilla/Lexers/__init__.py" line="438"/> <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="627"/> + <location filename="../QScintilla/Lexers/__init__.py" line="632"/> <source>PostScript Files (*.ps)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="439"/> + <location filename="../QScintilla/Lexers/__init__.py" line="444"/> <source>YAML Files (*.yaml *.yml)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <location filename="../QScintilla/Lexers/__init__.py" line="660"/> <source>All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="489"/> + <location filename="../QScintilla/Lexers/__init__.py" line="494"/> <source>Python3 Files (*.py)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="495"/> + <location filename="../QScintilla/Lexers/__init__.py" line="500"/> <source>Python3 GUI Files (*.pyw)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="510"/> + <location filename="../QScintilla/Lexers/__init__.py" line="515"/> <source>C Files (*.c)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="513"/> + <location filename="../QScintilla/Lexers/__init__.py" line="518"/> <source>C++ Files (*.cpp)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="516"/> + <location filename="../QScintilla/Lexers/__init__.py" line="521"/> <source>C++/C Header Files (*.h)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="522"/> + <location filename="../QScintilla/Lexers/__init__.py" line="527"/> <source>HTML Files (*.html)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="525"/> + <location filename="../QScintilla/Lexers/__init__.py" line="530"/> <source>PHP Files (*.php)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="528"/> + <location filename="../QScintilla/Lexers/__init__.py" line="533"/> <source>ASP Files (*.asp)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="537"/> + <location filename="../QScintilla/Lexers/__init__.py" line="542"/> <source>XML Files (*.xml)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="540"/> + <location filename="../QScintilla/Lexers/__init__.py" line="545"/> <source>XSL Files (*.xsl)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="543"/> + <location filename="../QScintilla/Lexers/__init__.py" line="548"/> <source>DTD Files (*.dtd)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="549"/> + <location filename="../QScintilla/Lexers/__init__.py" line="554"/> <source>D Files (*.d)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="552"/> + <location filename="../QScintilla/Lexers/__init__.py" line="557"/> <source>D Interface Files (*.di)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="567"/> + <location filename="../QScintilla/Lexers/__init__.py" line="572"/> <source>Perl Files (*.pl)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="570"/> + <location filename="../QScintilla/Lexers/__init__.py" line="575"/> <source>Perl Module Files (*.pm)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="579"/> + <location filename="../QScintilla/Lexers/__init__.py" line="584"/> <source>Batch Files (*.bat)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="582"/> + <location filename="../QScintilla/Lexers/__init__.py" line="587"/> <source>TeX Files (*.tex)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="585"/> + <location filename="../QScintilla/Lexers/__init__.py" line="590"/> <source>TeX Template Files (*.sty)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="588"/> + <location filename="../QScintilla/Lexers/__init__.py" line="593"/> <source>Diff Files (*.diff)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="591"/> + <location filename="../QScintilla/Lexers/__init__.py" line="596"/> <source>Make Files (*.mak)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="594"/> + <location filename="../QScintilla/Lexers/__init__.py" line="599"/> <source>Properties Files (*.ini)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="597"/> + <location filename="../QScintilla/Lexers/__init__.py" line="602"/> <source>Configuration Files (*.cfg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="603"/> + <location filename="../QScintilla/Lexers/__init__.py" line="608"/> <source>CMake Files (CMakeLists.txt)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="606"/> + <location filename="../QScintilla/Lexers/__init__.py" line="611"/> <source>CMake Macro Files (*.cmake)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="609"/> + <location filename="../QScintilla/Lexers/__init__.py" line="614"/> <source>VHDL Files (*.vhd)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="612"/> + <location filename="../QScintilla/Lexers/__init__.py" line="617"/> <source>TCL Files (*.tcl)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="615"/> + <location filename="../QScintilla/Lexers/__init__.py" line="620"/> <source>Tk Files (*.tk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="618"/> + <location filename="../QScintilla/Lexers/__init__.py" line="623"/> <source>Fortran Files (*.f95)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="621"/> + <location filename="../QScintilla/Lexers/__init__.py" line="626"/> <source>Fortran77 Files (*.f)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="624"/> + <location filename="../QScintilla/Lexers/__init__.py" line="629"/> <source>Pascal Files (*.pas)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="630"/> + <location filename="../QScintilla/Lexers/__init__.py" line="635"/> <source>YAML Files (*.yml)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="486"/> + <location filename="../QScintilla/Lexers/__init__.py" line="491"/> <source>Python2 Files (*.py2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="492"/> + <location filename="../QScintilla/Lexers/__init__.py" line="497"/> <source>Python2 GUI Files (*.pyw2)</source> <translation type="unfinished"></translation> </message> @@ -30718,35 +30718,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Matlab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Octave</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Matlab Files (*.m *.m.matlab)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Matlab Files (*.m)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Octave Files (*.m.octave)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Octave Files (*.m *.m.octave)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <source>QSS</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -34796,6 +34801,44 @@ </message> </context> <context> + <name>PreviewerQSS</name> + <message> + <location filename="../UI/Previewers/PreviewerQSS.ui" line="27"/> + <source>Preview Style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="36"/> + <source>Action 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="38"/> + <source>Action 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="42"/> + <source>MDI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Python</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Ruby</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>JavaScript</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Printer</name> <message> <location filename="../QScintilla/Printer.py" line="63"/> @@ -48073,21 +48116,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> - <source>Show difference</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> - <source>Show difference (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> - <source>Show difference (URLs)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="293"/> <source>Show annotated file</source> <translation type="unfinished"></translation> @@ -48168,11 +48196,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> - <source>Conflict resolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="549"/> <source>Copy</source> <translation type="unfinished"></translation> @@ -48183,13 +48206,33 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="274"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> + <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="283"/> - <source>Show difference side-by-side (extended)</source> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> </context> @@ -48292,11 +48335,6 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> - <source>Show difference</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> <source>Show &difference</source> <translation type="unfinished"></translation> </message> @@ -48306,41 +48344,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> - <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> - <source>Show difference (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="149"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> - <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> - <source>Show difference (URLs)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> - <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/> <source>Show status</source> <translation type="unfinished"></translation> @@ -48770,6 +48783,36 @@ <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name>
--- a/i18n/eric5_es.ts Thu Apr 03 18:58:08 2014 +0200 +++ b/i18n/eric5_es.ts Thu Apr 03 19:02:33 2014 +0200 @@ -19515,12 +19515,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -22245,12 +22245,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> <source>Show difference</source> - <translation>Mostrar diferencia</translation> + <translation type="obsolete">Mostrar diferencia</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Show difference (extended)</source> - <translation>Mostrar diferencia (extendida)</translation> + <translation type="obsolete">Mostrar diferencia (extendida)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> @@ -22300,7 +22300,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Conflict resolved</source> - <translation>Conflicto resuelto</translation> + <translation type="obsolete">Conflicto resuelto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="523"/> @@ -22315,18 +22315,43 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="328"/> <source>Show difference side-by-side</source> - <translation>Mostrar diferencias lado a lado</translation> + <translation type="obsolete">Mostrar diferencias lado a lado</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="337"/> <source>Show difference side-by-side (extended)</source> - <translation>Mostrar diferencias lado a lado (extendido)</translation> + <translation type="obsolete">Mostrar diferencias lado a lado (extendido)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> <source>Extensions</source> <translation>Extensiones</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> + <source>Show differences</source> + <translation type="unfinished">Mostrar diferencias</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="328"/> + <source>Show differences side-by-side</source> + <translation type="unfinished">Mostrar diferencias lado a lado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="337"/> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <source>Conflicts resolved</source> + <translation type="unfinished">Conflictos resueltos</translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -22508,7 +22533,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show difference</source> - <translation>Mostrar diferencia</translation> + <translation type="obsolete">Mostrar diferencia</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> @@ -22523,12 +22548,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation><b>Mostrar direfencia</b><p>Muestra la diferencia que hay entre el proyecto local y el repositorio.</p></translation> + <translation type="obsolete"><b>Mostrar direfencia</b><p>Muestra la diferencia que hay entre el proyecto local y el repositorio.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show difference (extended)</source> - <translation>Mostrar diferencia (extendida)</translation> + <translation type="obsolete">Mostrar diferencia (extendida)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> @@ -22538,7 +22563,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation><b>Mostrar direfencia (extendida)</b><p>Muestra la diferencia entre revisiones seleccionables del proyecto.</p></translation> + <translation type="obsolete"><b>Mostrar direfencia (extendida)</b><p>Muestra la diferencia entre revisiones seleccionables del proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> @@ -23475,6 +23500,26 @@ <source>Administration</source> <translation>Administración</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> + <source>Show differences</source> + <translation type="unfinished">Mostrar diferencias</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -30475,302 +30520,302 @@ <translation>Propiedades</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <location filename="../QScintilla/Lexers/__init__.py" line="129"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> <source>SQL</source> <translation>SQL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>TeX</source> - <translation>TeX</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="135"/> + <source>TeX</source> + <translation>TeX</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="137"/> <source>VHDL</source> <translation>VHDL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="498"/> + <location filename="../QScintilla/Lexers/__init__.py" line="503"/> <source>Pyrex Files (*.pyx)</source> <translation>Archivos Pyrex(*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="501"/> + <location filename="../QScintilla/Lexers/__init__.py" line="506"/> <source>Quixote Template Files (*.ptl)</source> <translation>Archivos de Plantilla Quixote (*.ptl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="504"/> + <location filename="../QScintilla/Lexers/__init__.py" line="509"/> <source>Ruby Files (*.rb)</source> <translation>Archivos Ruby (*.rb)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="507"/> + <location filename="../QScintilla/Lexers/__init__.py" line="512"/> <source>IDL Files (*.idl)</source> <translation>Archivos IDL (*.idl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="348"/> + <location filename="../QScintilla/Lexers/__init__.py" line="353"/> <source>C Files (*.h *.c)</source> <translation>Archivos C (*.h *.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="351"/> + <location filename="../QScintilla/Lexers/__init__.py" line="356"/> <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> <translation>Archivos C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="519"/> + <location filename="../QScintilla/Lexers/__init__.py" line="524"/> <source>C# Files (*.cs)</source> <translation>Archivos C# (*.cs)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="357"/> + <location filename="../QScintilla/Lexers/__init__.py" line="362"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation>Archivos HTML (*.html *.htm *.asp *.shtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="531"/> + <location filename="../QScintilla/Lexers/__init__.py" line="536"/> <source>CSS Files (*.css)</source> <translation>Archivos CSS (*.css)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="534"/> + <location filename="../QScintilla/Lexers/__init__.py" line="539"/> <source>QSS Files (*.qss)</source> <translation>Archivos QSS (*.qss)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="366"/> + <location filename="../QScintilla/Lexers/__init__.py" line="371"/> <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> <translation>Archivos PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="546"/> + <location filename="../QScintilla/Lexers/__init__.py" line="551"/> <source>Qt Resource Files (*.qrc)</source> <translation>Archivos de Recursos Qt (*.qrc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <location filename="../QScintilla/Lexers/__init__.py" line="380"/> <source>D Files (*.d *.di)</source> <translation>Archivos D (*.d *.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="555"/> + <location filename="../QScintilla/Lexers/__init__.py" line="560"/> <source>Java Files (*.java)</source> <translation>Archivos Java (*.java)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="558"/> + <location filename="../QScintilla/Lexers/__init__.py" line="563"/> <source>JavaScript Files (*.js)</source> <translation>Archivos JavaScript (*.js)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="561"/> + <location filename="../QScintilla/Lexers/__init__.py" line="566"/> <source>SQL Files (*.sql)</source> <translation>Archivos SQL (*.sql)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="564"/> + <location filename="../QScintilla/Lexers/__init__.py" line="569"/> <source>Docbook Files (*.docbook)</source> <translation>Archivos DocBook (*.docbook)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="390"/> + <location filename="../QScintilla/Lexers/__init__.py" line="395"/> <source>Perl Files (*.pl *.pm *.ph)</source> <translation>Archivos Perl (*.pl *.pm *.ph)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="573"/> + <location filename="../QScintilla/Lexers/__init__.py" line="578"/> <source>Lua Files (*.lua)</source> <translation>Archivos Lua (^.lua)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <location filename="../QScintilla/Lexers/__init__.py" line="401"/> <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> <translation>Archivos TeX (*.tex *.sty *.aux *.toc *.idx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="576"/> + <location filename="../QScintilla/Lexers/__init__.py" line="581"/> <source>Shell Files (*.sh)</source> <translation>Archivos Shell (*.sh)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="402"/> + <location filename="../QScintilla/Lexers/__init__.py" line="407"/> <source>Batch Files (*.bat *.cmd)</source> <translation>Archivos Batch (*.bat *.cmd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="405"/> + <location filename="../QScintilla/Lexers/__init__.py" line="410"/> <source>Diff Files (*.diff *.patch)</source> <translation>Archivos Diff (*.diff *.patch)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="408"/> + <location filename="../QScintilla/Lexers/__init__.py" line="413"/> <source>Makefiles (*.mak)</source> <translation>Makefiles (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <location filename="../QScintilla/Lexers/__init__.py" line="416"/> <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> <translation>Archivos de Propiedades (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="600"/> + <location filename="../QScintilla/Lexers/__init__.py" line="605"/> <source>Povray Files (*.pov)</source> <translation>Archivos Povray (*.pov)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="418"/> + <location filename="../QScintilla/Lexers/__init__.py" line="423"/> <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> <translation>Archivos CMake (CMakeLists.txt *.cmake *.ctest)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="421"/> + <location filename="../QScintilla/Lexers/__init__.py" line="426"/> <source>VHDL Files (*.vhd *.vhdl)</source> <translation>Archivos VHDL (*.vhd *.vhdl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <location filename="../QScintilla/Lexers/__init__.py" line="660"/> <source>All Files (*)</source> <translation>Todos los archivos (*)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>TCL</source> <translation>TCL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="424"/> + <location filename="../QScintilla/Lexers/__init__.py" line="429"/> <source>TCL/Tk Files (*.tcl *.tk)</source> <translation>Archivos TCL/Tk (*.tcl *.tk)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="510"/> + <location filename="../QScintilla/Lexers/__init__.py" line="515"/> <source>C Files (*.c)</source> <translation>Archivos C (*.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="513"/> + <location filename="../QScintilla/Lexers/__init__.py" line="518"/> <source>C++ Files (*.cpp)</source> <translation>Archivos C++ (*.cpp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="516"/> + <location filename="../QScintilla/Lexers/__init__.py" line="521"/> <source>C++/C Header Files (*.h)</source> <translation>Archivos de cabecera C++ (*.h )</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="522"/> + <location filename="../QScintilla/Lexers/__init__.py" line="527"/> <source>HTML Files (*.html)</source> <translation>Archivos HTML (*.html)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="525"/> + <location filename="../QScintilla/Lexers/__init__.py" line="530"/> <source>PHP Files (*.php)</source> <translation>Archivos PHP (*.php)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="528"/> + <location filename="../QScintilla/Lexers/__init__.py" line="533"/> <source>ASP Files (*.asp)</source> <translation>Archivos ASP (*.asp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="537"/> + <location filename="../QScintilla/Lexers/__init__.py" line="542"/> <source>XML Files (*.xml)</source> <translation>Archivos XML (*.xml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="540"/> + <location filename="../QScintilla/Lexers/__init__.py" line="545"/> <source>XSL Files (*.xsl)</source> <translation>Archivos XSL (*.xsl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="543"/> + <location filename="../QScintilla/Lexers/__init__.py" line="548"/> <source>DTD Files (*.dtd)</source> <translation>Archivos DTD (*.dtd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="549"/> + <location filename="../QScintilla/Lexers/__init__.py" line="554"/> <source>D Files (*.d)</source> <translation>Archivos D (*.d)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="552"/> + <location filename="../QScintilla/Lexers/__init__.py" line="557"/> <source>D Interface Files (*.di)</source> <translation>Archivos de interfaces D (*.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="567"/> + <location filename="../QScintilla/Lexers/__init__.py" line="572"/> <source>Perl Files (*.pl)</source> <translation>Archivos Perl (*.pl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="570"/> + <location filename="../QScintilla/Lexers/__init__.py" line="575"/> <source>Perl Module Files (*.pm)</source> <translation>Archivos de módulo Perl (*.pm)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="579"/> + <location filename="../QScintilla/Lexers/__init__.py" line="584"/> <source>Batch Files (*.bat)</source> <translation>Archivos Batch (*.bat)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="582"/> + <location filename="../QScintilla/Lexers/__init__.py" line="587"/> <source>TeX Files (*.tex)</source> <translation>Archivos TeX (*.tex)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="585"/> + <location filename="../QScintilla/Lexers/__init__.py" line="590"/> <source>TeX Template Files (*.sty)</source> <translation>Archivos de plantilla TeX (*.sty)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="588"/> + <location filename="../QScintilla/Lexers/__init__.py" line="593"/> <source>Diff Files (*.diff)</source> <translation>Archivos Diff (*.diff)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="591"/> + <location filename="../QScintilla/Lexers/__init__.py" line="596"/> <source>Make Files (*.mak)</source> <translation>Archivos Make (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="594"/> + <location filename="../QScintilla/Lexers/__init__.py" line="599"/> <source>Properties Files (*.ini)</source> <translation>Archivos de Propiedades (*.ini)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="597"/> + <location filename="../QScintilla/Lexers/__init__.py" line="602"/> <source>Configuration Files (*.cfg)</source> <translation>Archivos de Configuración (*.cfg)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="603"/> + <location filename="../QScintilla/Lexers/__init__.py" line="608"/> <source>CMake Files (CMakeLists.txt)</source> <translation>Archivos CMake (CMakeLists.txt)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="606"/> + <location filename="../QScintilla/Lexers/__init__.py" line="611"/> <source>CMake Macro Files (*.cmake)</source> <translation>Archivos de Macro CMake (*.cmake)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="609"/> + <location filename="../QScintilla/Lexers/__init__.py" line="614"/> <source>VHDL Files (*.vhd)</source> <translation>Archivos VHDL (*.vhd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="612"/> + <location filename="../QScintilla/Lexers/__init__.py" line="617"/> <source>TCL Files (*.tcl)</source> <translation>Archivos TCL (*.tcl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="615"/> + <location filename="../QScintilla/Lexers/__init__.py" line="620"/> <source>Tk Files (*.tk)</source> <translation>Archivos Tk (*.tk)</translation> </message> @@ -30795,97 +30840,97 @@ <translation>PostScript</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="137"/> + <location filename="../QScintilla/Lexers/__init__.py" line="139"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="139"/> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>YAML</source> <translation>YAML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="369"/> + <location filename="../QScintilla/Lexers/__init__.py" line="374"/> <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> <translation>Archivos XML (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="427"/> + <location filename="../QScintilla/Lexers/__init__.py" line="432"/> <source>Fortran Files (*.f90 *.f95 *.f2k)</source> <translation>Archivos Fortran (*.f90 *.f95 *.f2k)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="430"/> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> <source>Fortran77 Files (*.f *.for)</source> <translation>Archivos Fortran77 (*.f *.for)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="433"/> + <location filename="../QScintilla/Lexers/__init__.py" line="438"/> <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> <translation>Archivos Pascal (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="627"/> + <location filename="../QScintilla/Lexers/__init__.py" line="632"/> <source>PostScript Files (*.ps)</source> <translation>Archivos PostScript (*.ps)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="439"/> + <location filename="../QScintilla/Lexers/__init__.py" line="444"/> <source>YAML Files (*.yaml *.yml)</source> <translation>Archivos YAML (*.yaml *.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="618"/> + <location filename="../QScintilla/Lexers/__init__.py" line="623"/> <source>Fortran Files (*.f95)</source> <translation>Archivos Fortran (*.f95)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="621"/> + <location filename="../QScintilla/Lexers/__init__.py" line="626"/> <source>Fortran77 Files (*.f)</source> <translation>Archivos Fortran77 (*.f)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="624"/> + <location filename="../QScintilla/Lexers/__init__.py" line="629"/> <source>Pascal Files (*.pas)</source> <translation>Archivos Pascal (*.pas)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="630"/> + <location filename="../QScintilla/Lexers/__init__.py" line="635"/> <source>YAML Files (*.yml)</source> <translation>Archivos YAML (*.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="159"/> <source>Pygments</source> <translation>Pygments</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="330"/> + <location filename="../QScintilla/Lexers/__init__.py" line="335"/> <source>Python Files (*.py *.py2 *.py3)</source> <translation>Archivos Python (*.py *.py2 *.py3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="333"/> + <location filename="../QScintilla/Lexers/__init__.py" line="338"/> <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> <translation>Archivos de GUI Python (*.pyw *.pyw2 *.pyw3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="489"/> + <location filename="../QScintilla/Lexers/__init__.py" line="494"/> <source>Python3 Files (*.py)</source> <translation>Archivos Python (*.py3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="495"/> + <location filename="../QScintilla/Lexers/__init__.py" line="500"/> <source>Python3 GUI Files (*.pyw)</source> <translation>Archivos de GUI Python3 (*.pyw)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="486"/> + <location filename="../QScintilla/Lexers/__init__.py" line="491"/> <source>Python2 Files (*.py2)</source> <translation>Archivos Python2 (*.py2)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="492"/> + <location filename="../QScintilla/Lexers/__init__.py" line="497"/> <source>Python2 GUI Files (*.pyw2)</source> <translation>Archivos de GUI Python2 (*.pyw2)</translation> </message> @@ -30900,35 +30945,40 @@ <translation>Python3</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Matlab</source> <translation>Matlab</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Octave</source> <translation>Octave</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Matlab Files (*.m *.m.matlab)</source> <translation>Archivos Matlab (*.m *.m.matlab)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Matlab Files (*.m)</source> <translation>Archivos Matlab (*.m)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Octave Files (*.m.octave)</source> <translation>Archivos Octave (*.m.octave)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Octave Files (*.m *.m.octave)</source> <translation>Archivos Octave (*.m *.m.octave)</translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <source>QSS</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -35031,6 +35081,44 @@ </message> </context> <context> + <name>PreviewerQSS</name> + <message> + <location filename="../UI/Previewers/PreviewerQSS.ui" line="27"/> + <source>Preview Style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="36"/> + <source>Action 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="38"/> + <source>Action 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="42"/> + <source>MDI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Python</source> + <translation type="unfinished">Python</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Ruby</source> + <translation type="unfinished">Ruby</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>JavaScript</source> + <translation type="unfinished">JavaScript</translation> + </message> +</context> +<context> <name>Printer</name> <message> <location filename="../QScintilla/Printer.py" line="63"/> @@ -48554,17 +48642,17 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> <source>Show difference</source> - <translation>Mostrar diferencia</translation> + <translation type="obsolete">Mostrar diferencia</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> <source>Show difference (extended)</source> - <translation>Mostrar diferencia (extendida)</translation> + <translation type="obsolete">Mostrar diferencia (extendida)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> <source>Show difference (URLs)</source> - <translation>Mostrar diferencia (URLs)</translation> + <translation type="obsolete">Mostrar diferencia (URLs)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="293"/> @@ -48664,7 +48752,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> <source>Conflict resolved</source> - <translation>Conflicto resuelto</translation> + <translation type="obsolete">Conflicto resuelto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="549"/> @@ -48679,12 +48767,42 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="274"/> <source>Show difference side-by-side</source> - <translation>Mostrar diferencias lado a lado</translation> + <translation type="obsolete">Mostrar diferencias lado a lado</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="283"/> <source>Show difference side-by-side (extended)</source> - <translation>Mostrar diferencias lado a lado (extendido)</translation> + <translation type="obsolete">Mostrar diferencias lado a lado (extendido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> + <source>Show differences</source> + <translation type="unfinished">Mostrar diferencias</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="274"/> + <source>Show differences side-by-side</source> + <translation type="unfinished">Mostrar diferencias lado a lado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="283"/> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> + <source>Conflicts resolved</source> + <translation type="unfinished">Conflictos resueltos</translation> </message> </context> <context> @@ -48772,7 +48890,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> <source>Show difference</source> - <translation>Mostrar diferencia</translation> + <translation type="obsolete">Mostrar diferencia</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> @@ -48787,12 +48905,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation><b>Mostrar direfencia</b><p>Muestra la diferencia que hay entre el proyecto local y el repositorio.</p></translation> + <translation type="obsolete"><b>Mostrar direfencia</b><p>Muestra la diferencia que hay entre el proyecto local y el repositorio.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> <source>Show difference (extended)</source> - <translation>Mostrar diferencia (extendida)</translation> + <translation type="obsolete">Mostrar diferencia (extendida)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="149"/> @@ -48802,12 +48920,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation><b>Mostrar direfencia (extendida)</b><p>Muestra la diferencia entre revisiones seleccionables del proyecto.</p></translation> + <translation type="obsolete"><b>Mostrar direfencia (extendida)</b><p>Muestra la diferencia entre revisiones seleccionables del proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> <source>Show difference (URLs)</source> - <translation>Mostrar diferencia (URLs)</translation> + <translation type="obsolete">Mostrar diferencia (URLs)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> @@ -48817,7 +48935,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> - <translation><b>Mostrar direfencia (URLs)</b><p>Muestra la diferencia del proyecto entre dos URLs de repositorios.</p></translation> + <translation type="obsolete"><b>Mostrar direfencia (URLs)</b><p>Muestra la diferencia del proyecto entre dos URLs de repositorios.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/> @@ -49264,6 +49382,36 @@ <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation><b>Actualizar versión</b><p>Actualiza la versión de la copia de trabajo al formato actual.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> + <source>Show differences</source> + <translation type="unfinished">Mostrar diferencias</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name>
--- a/i18n/eric5_fr.ts Thu Apr 03 18:58:08 2014 +0200 +++ b/i18n/eric5_fr.ts Thu Apr 03 19:02:33 2014 +0200 @@ -21390,12 +21390,12 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> @@ -24168,12 +24168,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> <source>Show difference</source> - <translation type="unfinished">Afficher les différences</translation> + <translation type="obsolete">Afficher les différences</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Show difference (extended)</source> - <translation type="unfinished">Afficher les différences (étendu)</translation> + <translation type="obsolete">Afficher les différences (étendu)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> @@ -24221,11 +24221,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> - <source>Conflict resolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="523"/> <source>Copy</source> <translation type="unfinished">Copier</translation> @@ -24236,18 +24231,33 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="328"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> + <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="337"/> - <source>Show difference side-by-side (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> - <source>Extensions</source> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> </context> @@ -24461,7 +24471,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show difference</source> - <translation type="unfinished">Afficher les différences</translation> + <translation type="obsolete">Afficher les différences</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> @@ -24476,12 +24486,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation type="unfinished"><b>Afficher les différences</b><p>Affiche les différences du projet local avec le référentiel.</p></translation> + <translation type="obsolete"><b>Afficher les différences</b><p>Affiche les différences du projet local avec le référentiel.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show difference (extended)</source> - <translation type="unfinished">Afficher les différences (étendu)</translation> + <translation type="obsolete">Afficher les différences (étendu)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> @@ -24491,7 +24501,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation type="unfinished"><b>Afficher les différences (etendu)</b><p>Affiche les différences du projet entre différentes révisions.</p></translation> + <translation type="obsolete"><b>Afficher les différences (etendu)</b><p>Affiche les différences du projet entre différentes révisions.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> @@ -25443,6 +25453,26 @@ <source>Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -32745,22 +32775,22 @@ <translation type="obsolete">Python</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <location filename="../QScintilla/Lexers/__init__.py" line="129"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> <source>SQL</source> <translation>SQL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>TeX</source> - <translation>TeX</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="135"/> + <source>TeX</source> + <translation>TeX</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="137"/> <source>VHDL</source> <translation>VHDL</translation> </message> @@ -32775,282 +32805,282 @@ <translation type="obsolete">Fichiers Python win32 (*.pyw)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="498"/> + <location filename="../QScintilla/Lexers/__init__.py" line="503"/> <source>Pyrex Files (*.pyx)</source> <translation>Fichiers Pyrex (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="501"/> + <location filename="../QScintilla/Lexers/__init__.py" line="506"/> <source>Quixote Template Files (*.ptl)</source> <translation>Fichiers gabarits Quixote (*.ptl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="504"/> + <location filename="../QScintilla/Lexers/__init__.py" line="509"/> <source>Ruby Files (*.rb)</source> <translation>Fichiers Ruby (*.rb)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="507"/> + <location filename="../QScintilla/Lexers/__init__.py" line="512"/> <source>IDL Files (*.idl)</source> <translation>Fichiers IDL (*.idl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="348"/> + <location filename="../QScintilla/Lexers/__init__.py" line="353"/> <source>C Files (*.h *.c)</source> <translation>Fichiers C (*.h *.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="351"/> + <location filename="../QScintilla/Lexers/__init__.py" line="356"/> <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> <translation>Fichiers C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="519"/> + <location filename="../QScintilla/Lexers/__init__.py" line="524"/> <source>C# Files (*.cs)</source> <translation>Fichiers C# (*.cs)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="357"/> + <location filename="../QScintilla/Lexers/__init__.py" line="362"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation>Fichiers HTML (*.html *.htm *.asp *.shtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="531"/> + <location filename="../QScintilla/Lexers/__init__.py" line="536"/> <source>CSS Files (*.css)</source> <translation>Fichiers CSS (*.css)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="534"/> + <location filename="../QScintilla/Lexers/__init__.py" line="539"/> <source>QSS Files (*.qss)</source> <translation>Fichiers QSS (*.qss)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="366"/> + <location filename="../QScintilla/Lexers/__init__.py" line="371"/> <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> <translation>Fichiers PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="546"/> + <location filename="../QScintilla/Lexers/__init__.py" line="551"/> <source>Qt Resource Files (*.qrc)</source> <translation>Fichiers Qt Resource (*.qrc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <location filename="../QScintilla/Lexers/__init__.py" line="380"/> <source>D Files (*.d *.di)</source> <translation>Fichiers D (*.d *.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="555"/> + <location filename="../QScintilla/Lexers/__init__.py" line="560"/> <source>Java Files (*.java)</source> <translation>Fichiers Java (*.java)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="558"/> + <location filename="../QScintilla/Lexers/__init__.py" line="563"/> <source>JavaScript Files (*.js)</source> <translation>Fichiers JavaScript (*.js)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="561"/> + <location filename="../QScintilla/Lexers/__init__.py" line="566"/> <source>SQL Files (*.sql)</source> <translation>Fichiers SQL (*.sql)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="564"/> + <location filename="../QScintilla/Lexers/__init__.py" line="569"/> <source>Docbook Files (*.docbook)</source> <translation>Fichiers Docbook (*.docbook)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="390"/> + <location filename="../QScintilla/Lexers/__init__.py" line="395"/> <source>Perl Files (*.pl *.pm *.ph)</source> <translation>Fichiers Perl (*.pl *.pm *.ph)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="573"/> + <location filename="../QScintilla/Lexers/__init__.py" line="578"/> <source>Lua Files (*.lua)</source> <translation>Fichiers Lua (*.lua)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <location filename="../QScintilla/Lexers/__init__.py" line="401"/> <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> <translation>Fichiers Tex (*.tex *.sty *.aux *.toc *.idx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="576"/> + <location filename="../QScintilla/Lexers/__init__.py" line="581"/> <source>Shell Files (*.sh)</source> <translation>Fichiers Shell (*.sh)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="402"/> + <location filename="../QScintilla/Lexers/__init__.py" line="407"/> <source>Batch Files (*.bat *.cmd)</source> <translation>Fichiers Batch (*.bat *.cmd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="405"/> + <location filename="../QScintilla/Lexers/__init__.py" line="410"/> <source>Diff Files (*.diff *.patch)</source> <translation>Fichiers Diff (*.diff *.patch)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="408"/> + <location filename="../QScintilla/Lexers/__init__.py" line="413"/> <source>Makefiles (*.mak)</source> <translation>Makefiles (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <location filename="../QScintilla/Lexers/__init__.py" line="416"/> <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> <translation>Fichiers de configuration (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="600"/> + <location filename="../QScintilla/Lexers/__init__.py" line="605"/> <source>Povray Files (*.pov)</source> <translation>Fichiers Povray (*.pov)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="418"/> + <location filename="../QScintilla/Lexers/__init__.py" line="423"/> <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> <translation>Fichiers CMake (CMakeLists.txt *.cmake *.ctest)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="421"/> + <location filename="../QScintilla/Lexers/__init__.py" line="426"/> <source>VHDL Files (*.vhd *.vhdl)</source> <translation>Fichiers VHDL (*.vhd *.vhdl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <location filename="../QScintilla/Lexers/__init__.py" line="660"/> <source>All Files (*)</source> <translation>Tous fichiers (*)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>TCL</source> <translation>TCL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="424"/> + <location filename="../QScintilla/Lexers/__init__.py" line="429"/> <source>TCL/Tk Files (*.tcl *.tk)</source> <translation>Fichiers TCL/Tk (*.tcl *.tk)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="510"/> + <location filename="../QScintilla/Lexers/__init__.py" line="515"/> <source>C Files (*.c)</source> <translation>Fichiers C (*.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="513"/> + <location filename="../QScintilla/Lexers/__init__.py" line="518"/> <source>C++ Files (*.cpp)</source> <translation>Fichiers C++ (*.cpp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="516"/> + <location filename="../QScintilla/Lexers/__init__.py" line="521"/> <source>C++/C Header Files (*.h)</source> <translation>Fichiers headers C++/C (*.h)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="522"/> + <location filename="../QScintilla/Lexers/__init__.py" line="527"/> <source>HTML Files (*.html)</source> <translation>Fichiers HTML (*.html)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="525"/> + <location filename="../QScintilla/Lexers/__init__.py" line="530"/> <source>PHP Files (*.php)</source> <translation>Fichiers PHP (*.php)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="528"/> + <location filename="../QScintilla/Lexers/__init__.py" line="533"/> <source>ASP Files (*.asp)</source> <translation>Fichiers ASP (*.asp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="537"/> + <location filename="../QScintilla/Lexers/__init__.py" line="542"/> <source>XML Files (*.xml)</source> <translation>Fichiers XML (*.xml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="540"/> + <location filename="../QScintilla/Lexers/__init__.py" line="545"/> <source>XSL Files (*.xsl)</source> <translation>Fichiers XSL (*.xsl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="543"/> + <location filename="../QScintilla/Lexers/__init__.py" line="548"/> <source>DTD Files (*.dtd)</source> <translation>Fichiers DTD (*.dtd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="549"/> + <location filename="../QScintilla/Lexers/__init__.py" line="554"/> <source>D Files (*.d)</source> <translation>Fichiers D (*.d)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="552"/> + <location filename="../QScintilla/Lexers/__init__.py" line="557"/> <source>D Interface Files (*.di)</source> <translation>Fichiers Interface D (*.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="567"/> + <location filename="../QScintilla/Lexers/__init__.py" line="572"/> <source>Perl Files (*.pl)</source> <translation>Fichiers Perl (*.pl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="570"/> + <location filename="../QScintilla/Lexers/__init__.py" line="575"/> <source>Perl Module Files (*.pm)</source> <translation>Fichiers module Perl (*.pm)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="579"/> + <location filename="../QScintilla/Lexers/__init__.py" line="584"/> <source>Batch Files (*.bat)</source> <translation>Fichiers Batch (*.bat)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="582"/> + <location filename="../QScintilla/Lexers/__init__.py" line="587"/> <source>TeX Files (*.tex)</source> <translation>Fichiers TeX (*.tex)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="585"/> + <location filename="../QScintilla/Lexers/__init__.py" line="590"/> <source>TeX Template Files (*.sty)</source> <translation>Fichiers Template TeX (*.sty)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="588"/> + <location filename="../QScintilla/Lexers/__init__.py" line="593"/> <source>Diff Files (*.diff)</source> <translation>Fichiers Diff (*.diff)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="591"/> + <location filename="../QScintilla/Lexers/__init__.py" line="596"/> <source>Make Files (*.mak)</source> <translation>Fichiers Make (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="594"/> + <location filename="../QScintilla/Lexers/__init__.py" line="599"/> <source>Properties Files (*.ini)</source> <translation>Fichiers de propriétés (*.ini)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="597"/> + <location filename="../QScintilla/Lexers/__init__.py" line="602"/> <source>Configuration Files (*.cfg)</source> <translation>Fichiers de configuration (*.cfg)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="603"/> + <location filename="../QScintilla/Lexers/__init__.py" line="608"/> <source>CMake Files (CMakeLists.txt)</source> <translation>Fichiers CMake (CMakeLists.txt)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="606"/> + <location filename="../QScintilla/Lexers/__init__.py" line="611"/> <source>CMake Macro Files (*.cmake)</source> <translation>Fichiers Macro CMake (*.cmake)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="609"/> + <location filename="../QScintilla/Lexers/__init__.py" line="614"/> <source>VHDL Files (*.vhd)</source> <translation>Fichiers VHDL (*.vhd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="612"/> + <location filename="../QScintilla/Lexers/__init__.py" line="617"/> <source>TCL Files (*.tcl)</source> <translation>Fichiers TCL (*.tcl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="615"/> + <location filename="../QScintilla/Lexers/__init__.py" line="620"/> <source>Tk Files (*.tk)</source> <translation>Fichiers Tk (*.tk)</translation> </message> @@ -33075,97 +33105,97 @@ <translation>PostScript</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="137"/> + <location filename="../QScintilla/Lexers/__init__.py" line="139"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="139"/> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>YAML</source> <translation>YAML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="369"/> + <location filename="../QScintilla/Lexers/__init__.py" line="374"/> <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> <translation>Fichiers XML (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="427"/> + <location filename="../QScintilla/Lexers/__init__.py" line="432"/> <source>Fortran Files (*.f90 *.f95 *.f2k)</source> <translation>Fichiers Fortran (*.f90 *.f95 *.f2k)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="430"/> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> <source>Fortran77 Files (*.f *.for)</source> <translation>Fichiers Fortran77 (*.f *.for)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="433"/> + <location filename="../QScintilla/Lexers/__init__.py" line="438"/> <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> <translation>Fichiers Pascal (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="627"/> + <location filename="../QScintilla/Lexers/__init__.py" line="632"/> <source>PostScript Files (*.ps)</source> <translation>Fichiers PostScript (*.ps)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="439"/> + <location filename="../QScintilla/Lexers/__init__.py" line="444"/> <source>YAML Files (*.yaml *.yml)</source> <translation>Fichiers YAML (*.yaml *.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="618"/> + <location filename="../QScintilla/Lexers/__init__.py" line="623"/> <source>Fortran Files (*.f95)</source> <translation>Fichiers Fortran (*.f95)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="621"/> + <location filename="../QScintilla/Lexers/__init__.py" line="626"/> <source>Fortran77 Files (*.f)</source> <translation>Fichiers Fortran77 (*.f)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="624"/> + <location filename="../QScintilla/Lexers/__init__.py" line="629"/> <source>Pascal Files (*.pas)</source> <translation>Fichiers Pascal (*.pas)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="630"/> + <location filename="../QScintilla/Lexers/__init__.py" line="635"/> <source>YAML Files (*.yml)</source> <translation>Fichiers YAML (*.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="159"/> <source>Pygments</source> <translation>Pygments</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="330"/> + <location filename="../QScintilla/Lexers/__init__.py" line="335"/> <source>Python Files (*.py *.py2 *.py3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="333"/> + <location filename="../QScintilla/Lexers/__init__.py" line="338"/> <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="489"/> + <location filename="../QScintilla/Lexers/__init__.py" line="494"/> <source>Python3 Files (*.py)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="495"/> + <location filename="../QScintilla/Lexers/__init__.py" line="500"/> <source>Python3 GUI Files (*.pyw)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="486"/> + <location filename="../QScintilla/Lexers/__init__.py" line="491"/> <source>Python2 Files (*.py2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="492"/> + <location filename="../QScintilla/Lexers/__init__.py" line="497"/> <source>Python2 GUI Files (*.pyw2)</source> <translation type="unfinished"></translation> </message> @@ -33180,35 +33210,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Matlab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Octave</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Matlab Files (*.m *.m.matlab)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Matlab Files (*.m)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Octave Files (*.m.octave)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Octave Files (*.m *.m.octave)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <source>QSS</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -38111,6 +38146,44 @@ </message> </context> <context> + <name>PreviewerQSS</name> + <message> + <location filename="../UI/Previewers/PreviewerQSS.ui" line="27"/> + <source>Preview Style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="36"/> + <source>Action 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="38"/> + <source>Action 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="42"/> + <source>MDI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Python</source> + <translation type="unfinished">Python</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Ruby</source> + <translation type="unfinished">Ruby</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>JavaScript</source> + <translation type="unfinished">JavaScript</translation> + </message> +</context> +<context> <name>Printer</name> <message> <location filename="QScintilla/Printer.py" line="53"/> @@ -53688,12 +53761,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> <source>Show difference</source> - <translation>Afficher les différences</translation> + <translation type="obsolete">Afficher les différences</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> <source>Show difference (extended)</source> - <translation>Afficher les différences (étendu)</translation> + <translation type="obsolete">Afficher les différences (étendu)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="705"/> @@ -53788,7 +53861,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> <source>Show difference (URLs)</source> - <translation>Afficher les différences (URLs)</translation> + <translation type="obsolete">Afficher les différences (URLs)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="568"/> @@ -53811,11 +53884,6 @@ <translation>Supprimer de la liste des modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> - <source>Conflict resolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="549"/> <source>Copy</source> <translation type="unfinished">Copier</translation> @@ -53826,13 +53894,33 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="274"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> + <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="283"/> - <source>Show difference side-by-side (extended)</source> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> </context> @@ -53961,7 +54049,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> <source>Show difference</source> - <translation>Afficher les différences</translation> + <translation type="obsolete">Afficher les différences</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> @@ -53976,12 +54064,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation><b>Afficher les différences</b><p>Affiche les différences du projet local avec le référentiel.</p></translation> + <translation type="obsolete"><b>Afficher les différences</b><p>Affiche les différences du projet local avec le référentiel.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> <source>Show difference (extended)</source> - <translation>Afficher les différences (étendu)</translation> + <translation type="obsolete">Afficher les différences (étendu)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="149"/> @@ -53991,7 +54079,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation><b>Afficher les différences (etendu)</b><p>Affiche les différences du projet entre différentes révisions.</p></translation> + <translation type="obsolete"><b>Afficher les différences (etendu)</b><p>Affiche les différences du projet entre différentes révisions.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/> @@ -54366,7 +54454,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> <source>Show difference (URLs)</source> - <translation>Afficher les différences (URLs)</translation> + <translation type="obsolete">Afficher les différences (URLs)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> @@ -54376,7 +54464,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> - <translation><b>Affiche les différences (URLs)</b><p>Affiche les différences du projet entre deux référentiels indiqués par leurs URLs.</p></translation> + <translation type="obsolete"><b>Affiche les différences (URLs)</b><p>Affiche les différences du projet entre deux référentiels indiqués par leurs URLs.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/> @@ -54488,6 +54576,36 @@ <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name>
--- a/i18n/eric5_it.ts Thu Apr 03 18:58:08 2014 +0200 +++ b/i18n/eric5_it.ts Thu Apr 03 19:02:33 2014 +0200 @@ -20331,12 +20331,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -23132,12 +23132,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> <source>Show difference</source> - <translation>Mostra differenza</translation> + <translation type="obsolete">Mostra differenza</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Show difference (extended)</source> - <translation>Mostra differenza (esteso)</translation> + <translation type="obsolete">Mostra differenza (esteso)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> @@ -23192,7 +23192,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Conflict resolved</source> - <translation>Conflitto risolto</translation> + <translation type="obsolete">Conflitto risolto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="523"/> @@ -23207,18 +23207,43 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="328"/> <source>Show difference side-by-side</source> - <translation>Mostra differenze fianco a fianco</translation> + <translation type="obsolete">Mostra differenze fianco a fianco</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="337"/> <source>Show difference side-by-side (extended)</source> - <translation>Mostra differenze fianco a fianco (esteso)</translation> + <translation type="obsolete">Mostra differenze fianco a fianco (esteso)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> <source>Extensions</source> <translation>Estensioni</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="328"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="337"/> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -23455,7 +23480,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show difference</source> - <translation>Mostra differenza</translation> + <translation type="obsolete">Mostra differenza</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> @@ -23470,12 +23495,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation><b>Mostra differenze</b><p>Mostra le differenze tra il progetto locale e il repository.</p></translation> + <translation type="obsolete"><b>Mostra differenze</b><p>Mostra le differenze tra il progetto locale e il repository.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show difference (extended)</source> - <translation>Mostra differenza (esteso)</translation> + <translation type="obsolete">Mostra differenza (esteso)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> @@ -23485,7 +23510,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation><b>Mostra differenze (esteso)</b><p>Mostra le differenze di una revisione selezionabile del progetto.</p></translation> + <translation type="obsolete"><b>Mostra differenze (esteso)</b><p>Mostra le differenze di una revisione selezionabile del progetto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> @@ -24522,6 +24547,26 @@ <source>Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -31711,302 +31756,302 @@ <translation>Proprietà</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <location filename="../QScintilla/Lexers/__init__.py" line="129"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> <source>SQL</source> <translation>SQL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>TeX</source> - <translation>TeX</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="135"/> + <source>TeX</source> + <translation>TeX</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="137"/> <source>VHDL</source> <translation>VHDL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="498"/> + <location filename="../QScintilla/Lexers/__init__.py" line="503"/> <source>Pyrex Files (*.pyx)</source> <translation>File Pyrex (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="501"/> + <location filename="../QScintilla/Lexers/__init__.py" line="506"/> <source>Quixote Template Files (*.ptl)</source> <translation>File template Quixote</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="504"/> + <location filename="../QScintilla/Lexers/__init__.py" line="509"/> <source>Ruby Files (*.rb)</source> <translation>File Ruby (*.rb)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="507"/> + <location filename="../QScintilla/Lexers/__init__.py" line="512"/> <source>IDL Files (*.idl)</source> <translation>File IDL (*.idl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="348"/> + <location filename="../QScintilla/Lexers/__init__.py" line="353"/> <source>C Files (*.h *.c)</source> <translation>File C (*.h *.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="351"/> + <location filename="../QScintilla/Lexers/__init__.py" line="356"/> <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> <translation>File C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="519"/> + <location filename="../QScintilla/Lexers/__init__.py" line="524"/> <source>C# Files (*.cs)</source> <translation>File C# (*.cs)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="357"/> + <location filename="../QScintilla/Lexers/__init__.py" line="362"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation>File HTML (*.html *.htm *.asp *.shtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="531"/> + <location filename="../QScintilla/Lexers/__init__.py" line="536"/> <source>CSS Files (*.css)</source> <translation>File CSS (*.css)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="534"/> + <location filename="../QScintilla/Lexers/__init__.py" line="539"/> <source>QSS Files (*.qss)</source> <translation>File QSS (*.qss)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="366"/> + <location filename="../QScintilla/Lexers/__init__.py" line="371"/> <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> <translation>File PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="546"/> + <location filename="../QScintilla/Lexers/__init__.py" line="551"/> <source>Qt Resource Files (*.qrc)</source> <translation>File Risorse Qt (*.qrc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <location filename="../QScintilla/Lexers/__init__.py" line="380"/> <source>D Files (*.d *.di)</source> <translation>File D (*.d *.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="555"/> + <location filename="../QScintilla/Lexers/__init__.py" line="560"/> <source>Java Files (*.java)</source> <translation>File Java (*.java)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="558"/> + <location filename="../QScintilla/Lexers/__init__.py" line="563"/> <source>JavaScript Files (*.js)</source> <translation>File JavaScript (*.js)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="561"/> + <location filename="../QScintilla/Lexers/__init__.py" line="566"/> <source>SQL Files (*.sql)</source> <translation>File SQL (*.sql)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="564"/> + <location filename="../QScintilla/Lexers/__init__.py" line="569"/> <source>Docbook Files (*.docbook)</source> <translation>File Docbook (*.docbook)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="390"/> + <location filename="../QScintilla/Lexers/__init__.py" line="395"/> <source>Perl Files (*.pl *.pm *.ph)</source> <translation>File Perl (*.pl *.pm *.ph)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="573"/> + <location filename="../QScintilla/Lexers/__init__.py" line="578"/> <source>Lua Files (*.lua)</source> <translation>File Lua (*.lua)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <location filename="../QScintilla/Lexers/__init__.py" line="401"/> <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> <translation>File TeX (*.tex *.sty *.aux *.toc *.idx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="576"/> + <location filename="../QScintilla/Lexers/__init__.py" line="581"/> <source>Shell Files (*.sh)</source> <translation>File Shell (*.sh)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="402"/> + <location filename="../QScintilla/Lexers/__init__.py" line="407"/> <source>Batch Files (*.bat *.cmd)</source> <translation>File Batch (*.bat *.cmd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="405"/> + <location filename="../QScintilla/Lexers/__init__.py" line="410"/> <source>Diff Files (*.diff *.patch)</source> <translation>File Diff (*.diff *.patch)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="408"/> + <location filename="../QScintilla/Lexers/__init__.py" line="413"/> <source>Makefiles (*.mak)</source> <translation>Makefile (*,mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <location filename="../QScintilla/Lexers/__init__.py" line="416"/> <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> <translation>File proprietà (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="600"/> + <location filename="../QScintilla/Lexers/__init__.py" line="605"/> <source>Povray Files (*.pov)</source> <translation>File Povray (*.pov)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="418"/> + <location filename="../QScintilla/Lexers/__init__.py" line="423"/> <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> <translation>File CMake (CMakeLists.txt *.cmake *.ctest)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="421"/> + <location filename="../QScintilla/Lexers/__init__.py" line="426"/> <source>VHDL Files (*.vhd *.vhdl)</source> <translation>File VHDL (*.vhd *.vhdl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <location filename="../QScintilla/Lexers/__init__.py" line="660"/> <source>All Files (*)</source> <translation>Tutti i file (*)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>TCL</source> <translation>TCL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="424"/> + <location filename="../QScintilla/Lexers/__init__.py" line="429"/> <source>TCL/Tk Files (*.tcl *.tk)</source> <translation>File TCL/Tk (*.tcl *.tk)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="510"/> + <location filename="../QScintilla/Lexers/__init__.py" line="515"/> <source>C Files (*.c)</source> <translation>File C (*.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="513"/> + <location filename="../QScintilla/Lexers/__init__.py" line="518"/> <source>C++ Files (*.cpp)</source> <translation>File C++ (*.cpp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="516"/> + <location filename="../QScintilla/Lexers/__init__.py" line="521"/> <source>C++/C Header Files (*.h)</source> <translation>File Header C/C++ (*.h)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="522"/> + <location filename="../QScintilla/Lexers/__init__.py" line="527"/> <source>HTML Files (*.html)</source> <translation>File HTML (*.html)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="525"/> + <location filename="../QScintilla/Lexers/__init__.py" line="530"/> <source>PHP Files (*.php)</source> <translation>File PHP (*.php)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="528"/> + <location filename="../QScintilla/Lexers/__init__.py" line="533"/> <source>ASP Files (*.asp)</source> <translation>File ASP (*.asp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="537"/> + <location filename="../QScintilla/Lexers/__init__.py" line="542"/> <source>XML Files (*.xml)</source> <translation>File XML (*.xml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="540"/> + <location filename="../QScintilla/Lexers/__init__.py" line="545"/> <source>XSL Files (*.xsl)</source> <translation>File XSL (*.xsl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="543"/> + <location filename="../QScintilla/Lexers/__init__.py" line="548"/> <source>DTD Files (*.dtd)</source> <translation>File DTD (*.dtd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="549"/> + <location filename="../QScintilla/Lexers/__init__.py" line="554"/> <source>D Files (*.d)</source> <translation>File D (*.d)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="552"/> + <location filename="../QScintilla/Lexers/__init__.py" line="557"/> <source>D Interface Files (*.di)</source> <translation>File interfaccia D (*.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="567"/> + <location filename="../QScintilla/Lexers/__init__.py" line="572"/> <source>Perl Files (*.pl)</source> <translation>File Perl (*.pl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="570"/> + <location filename="../QScintilla/Lexers/__init__.py" line="575"/> <source>Perl Module Files (*.pm)</source> <translation>File moduli Perl (*.pm)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="579"/> + <location filename="../QScintilla/Lexers/__init__.py" line="584"/> <source>Batch Files (*.bat)</source> <translation>File Batch (*.bat)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="582"/> + <location filename="../QScintilla/Lexers/__init__.py" line="587"/> <source>TeX Files (*.tex)</source> <translation>File TeX (*.tex)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="585"/> + <location filename="../QScintilla/Lexers/__init__.py" line="590"/> <source>TeX Template Files (*.sty)</source> <translation>File Template TeX (*.sty)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="588"/> + <location filename="../QScintilla/Lexers/__init__.py" line="593"/> <source>Diff Files (*.diff)</source> <translation>File Diff (*.diff)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="591"/> + <location filename="../QScintilla/Lexers/__init__.py" line="596"/> <source>Make Files (*.mak)</source> <translation>File Make (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="594"/> + <location filename="../QScintilla/Lexers/__init__.py" line="599"/> <source>Properties Files (*.ini)</source> <translation>File proprietà (*.ini)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="597"/> + <location filename="../QScintilla/Lexers/__init__.py" line="602"/> <source>Configuration Files (*.cfg)</source> <translation>File configurazione (*.cfg)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="603"/> + <location filename="../QScintilla/Lexers/__init__.py" line="608"/> <source>CMake Files (CMakeLists.txt)</source> <translation>File CMake (CMakeList.txt)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="606"/> + <location filename="../QScintilla/Lexers/__init__.py" line="611"/> <source>CMake Macro Files (*.cmake)</source> <translation>File Macro CMake (*.cmake)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="609"/> + <location filename="../QScintilla/Lexers/__init__.py" line="614"/> <source>VHDL Files (*.vhd)</source> <translation>File VHDL (*.vhd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="612"/> + <location filename="../QScintilla/Lexers/__init__.py" line="617"/> <source>TCL Files (*.tcl)</source> <translation>File TCL (*.tcl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="615"/> + <location filename="../QScintilla/Lexers/__init__.py" line="620"/> <source>Tk Files (*.tk)</source> <translation>File Tk (*.tk)</translation> </message> @@ -32031,97 +32076,97 @@ <translation>PostScript</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="137"/> + <location filename="../QScintilla/Lexers/__init__.py" line="139"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="139"/> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>YAML</source> <translation>YAML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="369"/> + <location filename="../QScintilla/Lexers/__init__.py" line="374"/> <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> <translation>File XML (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="427"/> + <location filename="../QScintilla/Lexers/__init__.py" line="432"/> <source>Fortran Files (*.f90 *.f95 *.f2k)</source> <translation>File Fortran (*.f90 *.f95 *.f2k)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="430"/> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> <source>Fortran77 Files (*.f *.for)</source> <translation>File Fortran77 (*.f *.for)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="433"/> + <location filename="../QScintilla/Lexers/__init__.py" line="438"/> <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> <translation>File Pascal (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="627"/> + <location filename="../QScintilla/Lexers/__init__.py" line="632"/> <source>PostScript Files (*.ps)</source> <translation>File PostScript (*.ps)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="439"/> + <location filename="../QScintilla/Lexers/__init__.py" line="444"/> <source>YAML Files (*.yaml *.yml)</source> <translation>File YAML (*.yaml *.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="618"/> + <location filename="../QScintilla/Lexers/__init__.py" line="623"/> <source>Fortran Files (*.f95)</source> <translation>File Fortran (*.f95)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="621"/> + <location filename="../QScintilla/Lexers/__init__.py" line="626"/> <source>Fortran77 Files (*.f)</source> <translation>File Fortran77 (*.f)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="624"/> + <location filename="../QScintilla/Lexers/__init__.py" line="629"/> <source>Pascal Files (*.pas)</source> <translation>File Pascal (*.pas)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="630"/> + <location filename="../QScintilla/Lexers/__init__.py" line="635"/> <source>YAML Files (*.yml)</source> <translation>File YAML (*.yaml *.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="159"/> <source>Pygments</source> <translation>Pygments</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="330"/> + <location filename="../QScintilla/Lexers/__init__.py" line="335"/> <source>Python Files (*.py *.py2 *.py3)</source> <translation>Python Files (*.py *.py2 *.py3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="333"/> + <location filename="../QScintilla/Lexers/__init__.py" line="338"/> <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> <translation>Python GUI Files (*.pyw *.pyw2 *.pyw3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="489"/> + <location filename="../QScintilla/Lexers/__init__.py" line="494"/> <source>Python3 Files (*.py)</source> <translation>Python3 Files (*.py)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="495"/> + <location filename="../QScintilla/Lexers/__init__.py" line="500"/> <source>Python3 GUI Files (*.pyw)</source> <translation>Python3 GUI Files (*.pyw)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="486"/> + <location filename="../QScintilla/Lexers/__init__.py" line="491"/> <source>Python2 Files (*.py2)</source> <translation>Python Files (*.py2)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="492"/> + <location filename="../QScintilla/Lexers/__init__.py" line="497"/> <source>Python2 GUI Files (*.pyw2)</source> <translation>Python GUI Files (*.pyw2)</translation> </message> @@ -32136,35 +32181,40 @@ <translation>Python3</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Matlab</source> <translation>Matlab</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Octave</source> <translation>Octave</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Matlab Files (*.m *.m.matlab)</source> <translation>File Matlab (*.m *.m.matlab)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Octave Files (*.m *.m.octave)</source> <translation>File Octave (*.m *.m.octave)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Matlab Files (*.m)</source> <translation>File Matlab (*.m)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Octave Files (*.m.octave)</source> <translation>File Octave (*.m.octave)</translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <source>QSS</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -37009,6 +37059,44 @@ </message> </context> <context> + <name>PreviewerQSS</name> + <message> + <location filename="../UI/Previewers/PreviewerQSS.ui" line="27"/> + <source>Preview Style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="36"/> + <source>Action 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="38"/> + <source>Action 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="42"/> + <source>MDI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Python</source> + <translation type="unfinished">Python</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Ruby</source> + <translation type="unfinished">Ruby</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>JavaScript</source> + <translation type="unfinished">JavaScript</translation> + </message> +</context> +<context> <name>Printer</name> <message> <location filename="../QScintilla/Printer.py" line="63"/> @@ -51381,12 +51469,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> <source>Show difference</source> - <translation>Mostra differenza</translation> + <translation type="obsolete">Mostra differenza</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> <source>Show difference (extended)</source> - <translation>Mostra differenza (esteso)</translation> + <translation type="obsolete">Mostra differenza (esteso)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="705"/> @@ -51481,7 +51569,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> <source>Show difference (URLs)</source> - <translation>Mostra differenze (URL)</translation> + <translation type="obsolete">Mostra differenze (URL)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="568"/> @@ -51506,7 +51594,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> <source>Conflict resolved</source> - <translation type="unfinished">Conflitto risolto</translation> + <translation type="obsolete">Conflitto risolto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="549"/> @@ -51521,12 +51609,42 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="274"/> <source>Show difference side-by-side</source> - <translation type="unfinished">Mostra differenze fianco a fianco</translation> + <translation type="obsolete">Mostra differenze fianco a fianco</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="283"/> <source>Show difference side-by-side (extended)</source> - <translation type="unfinished">Mostra differenze fianco a fianco (esteso)</translation> + <translation type="obsolete">Mostra differenze fianco a fianco (esteso)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="274"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="283"/> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -51654,7 +51772,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> <source>Show difference</source> - <translation>Mostra differenze</translation> + <translation type="obsolete">Mostra differenze</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> @@ -51669,12 +51787,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation><b>Mostra differenze</b><p>Mostra le differenze tra il progetto locale e il repository.</p></translation> + <translation type="obsolete"><b>Mostra differenze</b><p>Mostra le differenze tra il progetto locale e il repository.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> <source>Show difference (extended)</source> - <translation>Mostra differenza (esteso)</translation> + <translation type="obsolete">Mostra differenza (esteso)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="149"/> @@ -51684,7 +51802,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation><b>Mostra differenze (esteso)</b><p>Mostra le differenze di una revisione selezionabile del progetto.</p></translation> + <translation type="obsolete"><b>Mostra differenze (esteso)</b><p>Mostra le differenze di una revisione selezionabile del progetto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/> @@ -52059,7 +52177,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> <source>Show difference (URLs)</source> - <translation>Mostra differenze (URLs)</translation> + <translation type="obsolete">Mostra differenze (URLs)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> @@ -52069,7 +52187,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> - <translation><b>Mostra le differenze (URLs)</b><p>Mostra le differenze del progetto tra due URLs di repostitory.</p></translation> + <translation type="obsolete"><b>Mostra le differenze (URLs)</b><p>Mostra le differenze del progetto tra due URLs di repostitory.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/> @@ -52181,6 +52299,36 @@ <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name>
--- a/i18n/eric5_ru.ts Thu Apr 03 18:58:08 2014 +0200 +++ b/i18n/eric5_ru.ts Thu Apr 03 19:02:33 2014 +0200 @@ -20450,12 +20450,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -23246,12 +23246,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> <source>Show difference</source> - <translation>Показать различие</translation> + <translation type="obsolete">Показать различие</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Show difference (extended)</source> - <translation>Показать различие (расширенно)</translation> + <translation type="obsolete">Показать различие (расширенно)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> @@ -23311,7 +23311,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Conflict resolved</source> - <translation>Конфликт решён</translation> + <translation type="obsolete">Конфликт решён</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="523"/> @@ -23324,19 +23324,34 @@ <translation>Сдвинуть</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="328"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> + <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="337"/> - <source>Show difference side-by-side (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> - <source>Extensions</source> - <translation type="unfinished"></translation> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <source>Conflicts resolved</source> + <translation type="unfinished">Конфликт решён</translation> </message> </context> <context> @@ -23574,7 +23589,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show difference</source> - <translation>Показать различие</translation> + <translation type="obsolete">Показать различие</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> @@ -23589,12 +23604,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation><b>Показать различие</b><p>Показать различие между локальным проектом и репозиторием.</p></translation> + <translation type="obsolete"><b>Показать различие</b><p>Показать различие между локальным проектом и репозиторием.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show difference (extended)</source> - <translation>Показать различие (расширенно)</translation> + <translation type="obsolete">Показать различие (расширенно)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> @@ -23604,7 +23619,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation><b>Показать разницу (насширенно)</b><p>Отображает различие выбираемых ревизий проекта.</p></translation> + <translation type="obsolete"><b>Показать разницу (насширенно)</b><p>Отображает различие выбираемых ревизий проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> @@ -24641,6 +24656,26 @@ <source>Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -31858,302 +31893,302 @@ <translation>Свойства</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <location filename="../QScintilla/Lexers/__init__.py" line="129"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> <source>SQL</source> <translation>SQL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>TeX</source> - <translation>TeX</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="135"/> + <source>TeX</source> + <translation>TeX</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="137"/> <source>VHDL</source> <translation>VHDL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="498"/> + <location filename="../QScintilla/Lexers/__init__.py" line="503"/> <source>Pyrex Files (*.pyx)</source> <translation>Файлы Pyrex (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="501"/> + <location filename="../QScintilla/Lexers/__init__.py" line="506"/> <source>Quixote Template Files (*.ptl)</source> <translation>Шаблоны Quixote (*.ptl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="504"/> + <location filename="../QScintilla/Lexers/__init__.py" line="509"/> <source>Ruby Files (*.rb)</source> <translation>Исходники на Ruby (*.rb)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="507"/> + <location filename="../QScintilla/Lexers/__init__.py" line="512"/> <source>IDL Files (*.idl)</source> <translation>Описания интерфейсов (*.idl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="348"/> + <location filename="../QScintilla/Lexers/__init__.py" line="353"/> <source>C Files (*.h *.c)</source> <translation>Исходники на C (*.h *.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="351"/> + <location filename="../QScintilla/Lexers/__init__.py" line="356"/> <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> <translation>Исходники на C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="519"/> + <location filename="../QScintilla/Lexers/__init__.py" line="524"/> <source>C# Files (*.cs)</source> <translation>Исходники на C# (*.cs)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="357"/> + <location filename="../QScintilla/Lexers/__init__.py" line="362"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation>Файлы разметки HTML (*.html *.htm *.asp *.shtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="531"/> + <location filename="../QScintilla/Lexers/__init__.py" line="536"/> <source>CSS Files (*.css)</source> <translation>Стили CSS (*.css)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="534"/> + <location filename="../QScintilla/Lexers/__init__.py" line="539"/> <source>QSS Files (*.qss)</source> <translation>Файлы QSS (*.qss)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="366"/> + <location filename="../QScintilla/Lexers/__init__.py" line="371"/> <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> <translation>Исходники на PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="546"/> + <location filename="../QScintilla/Lexers/__init__.py" line="551"/> <source>Qt Resource Files (*.qrc)</source> <translation>Файлы ресурсов Qt (*.qrc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <location filename="../QScintilla/Lexers/__init__.py" line="380"/> <source>D Files (*.d *.di)</source> <translation>Исходники на D (*.d *.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="555"/> + <location filename="../QScintilla/Lexers/__init__.py" line="560"/> <source>Java Files (*.java)</source> <translation>Исходники на Java (*.java)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="558"/> + <location filename="../QScintilla/Lexers/__init__.py" line="563"/> <source>JavaScript Files (*.js)</source> <translation>Исходники на JavaScript (*.js)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="561"/> + <location filename="../QScintilla/Lexers/__init__.py" line="566"/> <source>SQL Files (*.sql)</source> <translation>Запросы SQL (*.sql)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="564"/> + <location filename="../QScintilla/Lexers/__init__.py" line="569"/> <source>Docbook Files (*.docbook)</source> <translation>Файлы Docbook (*.docbook)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="390"/> + <location filename="../QScintilla/Lexers/__init__.py" line="395"/> <source>Perl Files (*.pl *.pm *.ph)</source> <translation>Файлы Perl (*.pl *.pm *.ph)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="573"/> + <location filename="../QScintilla/Lexers/__init__.py" line="578"/> <source>Lua Files (*.lua)</source> <translation>Исходники на Lua (*.lua)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <location filename="../QScintilla/Lexers/__init__.py" line="401"/> <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> <translation>Файлы TeX (*.tex *.sty *.aux *.toc *.idx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="576"/> + <location filename="../QScintilla/Lexers/__init__.py" line="581"/> <source>Shell Files (*.sh)</source> <translation>Сценарии Shell (*.sh)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="402"/> + <location filename="../QScintilla/Lexers/__init__.py" line="407"/> <source>Batch Files (*.bat *.cmd)</source> <translation>Пакетные файлы (*.bat *.cmd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="405"/> + <location filename="../QScintilla/Lexers/__init__.py" line="410"/> <source>Diff Files (*.diff *.patch)</source> <translation>Файлы различий (*.diff *.patch)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="408"/> + <location filename="../QScintilla/Lexers/__init__.py" line="413"/> <source>Makefiles (*.mak)</source> <translation>Правила сборки (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <location filename="../QScintilla/Lexers/__init__.py" line="416"/> <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> <translation>Файлы свойств (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="600"/> + <location filename="../QScintilla/Lexers/__init__.py" line="605"/> <source>Povray Files (*.pov)</source> <translation>Файлы Povray (*.pov)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="418"/> + <location filename="../QScintilla/Lexers/__init__.py" line="423"/> <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> <translation>Правила сборки для CMake (CMakeLists.txt *.cmake *.ctest)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="421"/> + <location filename="../QScintilla/Lexers/__init__.py" line="426"/> <source>VHDL Files (*.vhd *.vhdl)</source> <translation>Файлы VHDL (*.vhd *.vhdl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <location filename="../QScintilla/Lexers/__init__.py" line="660"/> <source>All Files (*)</source> <translation>Все файлы(*)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>TCL</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="424"/> + <location filename="../QScintilla/Lexers/__init__.py" line="429"/> <source>TCL/Tk Files (*.tcl *.tk)</source> <translation>TCL/Tk файлы (*.tcl *.tk)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="510"/> + <location filename="../QScintilla/Lexers/__init__.py" line="515"/> <source>C Files (*.c)</source> <translation>Исходники на C (*.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="513"/> + <location filename="../QScintilla/Lexers/__init__.py" line="518"/> <source>C++ Files (*.cpp)</source> <translation>Исходники на C++ (*.cpp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="516"/> + <location filename="../QScintilla/Lexers/__init__.py" line="521"/> <source>C++/C Header Files (*.h)</source> <translation>Заголовочные файлы C/C++ (*.h)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="522"/> + <location filename="../QScintilla/Lexers/__init__.py" line="527"/> <source>HTML Files (*.html)</source> <translation>HTML файлы (*.html)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="525"/> + <location filename="../QScintilla/Lexers/__init__.py" line="530"/> <source>PHP Files (*.php)</source> <translation>PHP файлы (*.php)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="528"/> + <location filename="../QScintilla/Lexers/__init__.py" line="533"/> <source>ASP Files (*.asp)</source> <translation>ASP файлы (*.asp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="537"/> + <location filename="../QScintilla/Lexers/__init__.py" line="542"/> <source>XML Files (*.xml)</source> <translation>XML файлы (*.sql)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="540"/> + <location filename="../QScintilla/Lexers/__init__.py" line="545"/> <source>XSL Files (*.xsl)</source> <translation>Файлы XSL (*.xsl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="543"/> + <location filename="../QScintilla/Lexers/__init__.py" line="548"/> <source>DTD Files (*.dtd)</source> <translation>Файлы DTD (*.dtd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="549"/> + <location filename="../QScintilla/Lexers/__init__.py" line="554"/> <source>D Files (*.d)</source> <translation>Исходники на D (*.d)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="552"/> + <location filename="../QScintilla/Lexers/__init__.py" line="557"/> <source>D Interface Files (*.di)</source> <translation>Описания интерфейсов на D (*.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="567"/> + <location filename="../QScintilla/Lexers/__init__.py" line="572"/> <source>Perl Files (*.pl)</source> <translation>Perl файлы (*.pl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="570"/> + <location filename="../QScintilla/Lexers/__init__.py" line="575"/> <source>Perl Module Files (*.pm)</source> <translation>Модули Perl (*.pm)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="579"/> + <location filename="../QScintilla/Lexers/__init__.py" line="584"/> <source>Batch Files (*.bat)</source> <translation>Пакетные файлы (*.bat)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="582"/> + <location filename="../QScintilla/Lexers/__init__.py" line="587"/> <source>TeX Files (*.tex)</source> <translation>Файлы TeX (*.tex)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="585"/> + <location filename="../QScintilla/Lexers/__init__.py" line="590"/> <source>TeX Template Files (*.sty)</source> <translation>Шаблоны TeX (*.sty)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="588"/> + <location filename="../QScintilla/Lexers/__init__.py" line="593"/> <source>Diff Files (*.diff)</source> <translation>Файлы различий (*.diff)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="591"/> + <location filename="../QScintilla/Lexers/__init__.py" line="596"/> <source>Make Files (*.mak)</source> <translation>Правила сборки (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="594"/> + <location filename="../QScintilla/Lexers/__init__.py" line="599"/> <source>Properties Files (*.ini)</source> <translation>Файлы свойств (*.ini)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="597"/> + <location filename="../QScintilla/Lexers/__init__.py" line="602"/> <source>Configuration Files (*.cfg)</source> <translation>Файлы конфигурации (*.cfg)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="603"/> + <location filename="../QScintilla/Lexers/__init__.py" line="608"/> <source>CMake Files (CMakeLists.txt)</source> <translation>Правила сборки для CMake (CMakeLists.txt)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="606"/> + <location filename="../QScintilla/Lexers/__init__.py" line="611"/> <source>CMake Macro Files (*.cmake)</source> <translation>Мафлы макросов CMake (*.cmake)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="609"/> + <location filename="../QScintilla/Lexers/__init__.py" line="614"/> <source>VHDL Files (*.vhd)</source> <translation>Файлы VHDL (*.vhd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="612"/> + <location filename="../QScintilla/Lexers/__init__.py" line="617"/> <source>TCL Files (*.tcl)</source> <translation>TCL файлы (*.tcl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="615"/> + <location filename="../QScintilla/Lexers/__init__.py" line="620"/> <source>Tk Files (*.tk)</source> <translation>Tk файлы (*.tk)</translation> </message> @@ -32173,32 +32208,32 @@ <translation>Pascal</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="427"/> + <location filename="../QScintilla/Lexers/__init__.py" line="432"/> <source>Fortran Files (*.f90 *.f95 *.f2k)</source> <translation>Fortran файлы (*.f90 *.f95 *.f2k)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="430"/> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> <source>Fortran77 Files (*.f *.for)</source> <translation>Fortran77 файлы (*.f *.for)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="433"/> + <location filename="../QScintilla/Lexers/__init__.py" line="438"/> <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> <translation>Pascal файлы (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="618"/> + <location filename="../QScintilla/Lexers/__init__.py" line="623"/> <source>Fortran Files (*.f95)</source> <translation>Fortran файлы (*.f95)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="621"/> + <location filename="../QScintilla/Lexers/__init__.py" line="626"/> <source>Fortran77 Files (*.f)</source> <translation>Fortran77 файлы (*.f)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="624"/> + <location filename="../QScintilla/Lexers/__init__.py" line="629"/> <source>Pascal Files (*.pas)</source> <translation>Pascal файлы (*.pas)</translation> </message> @@ -32208,67 +32243,67 @@ <translation>PostScript</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="137"/> + <location filename="../QScintilla/Lexers/__init__.py" line="139"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="139"/> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>YAML</source> <translation>YAML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="369"/> + <location filename="../QScintilla/Lexers/__init__.py" line="374"/> <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> <translation>XML файлы (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="627"/> + <location filename="../QScintilla/Lexers/__init__.py" line="632"/> <source>PostScript Files (*.ps)</source> <translation>PostScript файлы (*.ps)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="439"/> + <location filename="../QScintilla/Lexers/__init__.py" line="444"/> <source>YAML Files (*.yaml *.yml)</source> <translation>YAML файлы (*.yaml *.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="630"/> + <location filename="../QScintilla/Lexers/__init__.py" line="635"/> <source>YAML Files (*.yml)</source> <translation>YAML файлы (*.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="159"/> <source>Pygments</source> <translation>Pygments</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="330"/> + <location filename="../QScintilla/Lexers/__init__.py" line="335"/> <source>Python Files (*.py *.py2 *.py3)</source> <translation>Python файлы (*.py *.py2 *.py3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="333"/> + <location filename="../QScintilla/Lexers/__init__.py" line="338"/> <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> <translation>Python GUI файлы (*.pyw *.pyw2 *.pyw3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="489"/> + <location filename="../QScintilla/Lexers/__init__.py" line="494"/> <source>Python3 Files (*.py)</source> <translation>Python3 файлы (*.py)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="495"/> + <location filename="../QScintilla/Lexers/__init__.py" line="500"/> <source>Python3 GUI Files (*.pyw)</source> <translation>Python3 GUI файлы (*.pyw)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="486"/> + <location filename="../QScintilla/Lexers/__init__.py" line="491"/> <source>Python2 Files (*.py2)</source> <translation>Python2 файлы (*.py2)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="492"/> + <location filename="../QScintilla/Lexers/__init__.py" line="497"/> <source>Python2 GUI Files (*.pyw2)</source> <translation>Python2 GUI файлы (*.pyw2)</translation> </message> @@ -32283,35 +32318,40 @@ <translation>Python3</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Matlab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Octave</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Matlab Files (*.m *.m.matlab)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Matlab Files (*.m)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Octave Files (*.m.octave)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Octave Files (*.m *.m.octave)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <source>QSS</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -37166,6 +37206,44 @@ </message> </context> <context> + <name>PreviewerQSS</name> + <message> + <location filename="../UI/Previewers/PreviewerQSS.ui" line="27"/> + <source>Preview Style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="36"/> + <source>Action 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="38"/> + <source>Action 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="42"/> + <source>MDI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Python</source> + <translation type="unfinished">Python</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Ruby</source> + <translation type="unfinished">Ruby</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>JavaScript</source> + <translation type="unfinished">JavaScript</translation> + </message> +</context> +<context> <name>Printer</name> <message> <location filename="../QScintilla/Printer.py" line="63"/> @@ -51499,12 +51577,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> <source>Show difference</source> - <translation>Показать различие</translation> + <translation type="obsolete">Показать различие</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> <source>Show difference (extended)</source> - <translation>Показать различие (расширенно)</translation> + <translation type="obsolete">Показать различие (расширенно)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="705"/> @@ -51599,7 +51677,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> <source>Show difference (URLs)</source> - <translation>Показать разницу (URL)</translation> + <translation type="obsolete">Показать разницу (URL)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="568"/> @@ -51624,7 +51702,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> <source>Conflict resolved</source> - <translation>Конфликт решён</translation> + <translation type="obsolete">Конфликт решён</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="549"/> @@ -51637,14 +51715,34 @@ <translation>Переместить</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="274"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> + <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="283"/> - <source>Show difference side-by-side (extended)</source> - <translation type="unfinished"></translation> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> + <source>Conflicts resolved</source> + <translation type="unfinished">Конфликт решён</translation> </message> </context> <context> @@ -51772,7 +51870,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> <source>Show difference</source> - <translation>Показать различие</translation> + <translation type="obsolete">Показать различие</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> @@ -51787,13 +51885,13 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation><b>Показать различие</b> + <translation type="obsolete"><b>Показать различие</b> <p>Показать различие между локальным проектом и репозиторием.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> <source>Show difference (extended)</source> - <translation>Показать различие (расширенно)</translation> + <translation type="obsolete">Показать различие (расширенно)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="149"/> @@ -51803,7 +51901,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation><b>Показать разницу (насширенно)</b><p>Отображает различие выбираемых ревизий проекта.</p></translation> + <translation type="obsolete"><b>Показать разницу (насширенно)</b><p>Отображает различие выбираемых ревизий проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/> @@ -52180,7 +52278,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> <source>Show difference (URLs)</source> - <translation>Показать разницу (URL)</translation> + <translation type="obsolete">Показать разницу (URL)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> @@ -52190,7 +52288,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> - <translation><b>Показать разницу (URL)</b><p>Показывает разницу между репозиториями, заданными двумя URL.</p></translation> + <translation type="obsolete"><b>Показать разницу (URL)</b><p>Показывает разницу между репозиториями, заданными двумя URL.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="455"/> @@ -52302,6 +52400,36 @@ <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name>
--- a/i18n/eric5_tr.ts Thu Apr 03 18:58:08 2014 +0200 +++ b/i18n/eric5_tr.ts Thu Apr 03 19:02:33 2014 +0200 @@ -20369,12 +20369,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -23147,12 +23147,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> <source>Show difference</source> - <translation>Farkları göster</translation> + <translation type="obsolete">Farkları göster</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Show difference (extended)</source> - <translation>Farkları göster (gelişmiş)</translation> + <translation type="obsolete">Farkları göster (gelişmiş)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> @@ -23200,11 +23200,6 @@ <translation>Bu dosyaları gerçekten kaynak havuzundan kaldırmak istiyor musunuz?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> - <source>Conflict resolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="523"/> <source>Copy</source> <translation type="unfinished">Kopyala</translation> @@ -23215,18 +23210,33 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="328"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> + <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="337"/> - <source>Show difference side-by-side (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> - <source>Extensions</source> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> </context> @@ -23435,7 +23445,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show difference</source> - <translation>Farkları göster</translation> + <translation type="obsolete">Farkları göster</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> @@ -23448,14 +23458,9 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> - <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show difference (extended)</source> - <translation>Farkları göster (gelişmiş)</translation> + <translation type="obsolete">Farkları göster (gelişmiş)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> @@ -23463,11 +23468,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> - <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show status</source> <translation>Durumu Göster</translation> @@ -24407,6 +24407,26 @@ <source>Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -31612,232 +31632,232 @@ <translation type="obsolete">Python</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <location filename="../QScintilla/Lexers/__init__.py" line="129"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="129"/> - <source>SQL</source> - <translation>SQL</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="131"/> - <source>TCL</source> - <translation>TCL</translation> + <source>SQL</source> + <translation>SQL</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>TeX</source> - <translation>TeX</translation> + <source>TCL</source> + <translation>TCL</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="135"/> - <source>VHDL</source> - <translation>VHDL</translation> + <source>TeX</source> + <translation>TeX</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="137"/> - <source>XML</source> - <translation>XML</translation> + <source>VHDL</source> + <translation>VHDL</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="139"/> + <source>XML</source> + <translation>XML</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>YAML</source> <translation>YAML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="159"/> <source>Pygments</source> <translation>Pygments</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="330"/> + <location filename="../QScintilla/Lexers/__init__.py" line="335"/> <source>Python Files (*.py *.py2 *.py3)</source> <translation>Python Dosyaları (*.py *.py2 *.py3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="333"/> + <location filename="../QScintilla/Lexers/__init__.py" line="338"/> <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> <translation>Python GUI Dosyaları (*.pyw *.pyw2 *.pyw3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="498"/> + <location filename="../QScintilla/Lexers/__init__.py" line="503"/> <source>Pyrex Files (*.pyx)</source> <translation>Pyrex Dosyaları (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="501"/> + <location filename="../QScintilla/Lexers/__init__.py" line="506"/> <source>Quixote Template Files (*.ptl)</source> <translation>Quixote Template Dosyaları (*.ptl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="504"/> + <location filename="../QScintilla/Lexers/__init__.py" line="509"/> <source>Ruby Files (*.rb)</source> <translation>Ruby Dosyaları (*.rb)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="507"/> + <location filename="../QScintilla/Lexers/__init__.py" line="512"/> <source>IDL Files (*.idl)</source> <translation>IDL Dosyaları (*.idl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="348"/> + <location filename="../QScintilla/Lexers/__init__.py" line="353"/> <source>C Files (*.h *.c)</source> <translation>C Dosyalır (*.h *.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="351"/> + <location filename="../QScintilla/Lexers/__init__.py" line="356"/> <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> <translation>C++ Dosyaları (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="519"/> + <location filename="../QScintilla/Lexers/__init__.py" line="524"/> <source>C# Files (*.cs)</source> <translation>C# Dosyaları (*.cs)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="357"/> + <location filename="../QScintilla/Lexers/__init__.py" line="362"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation>HTML Dosyaları (*.html *.htm *.asp *.shtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="531"/> + <location filename="../QScintilla/Lexers/__init__.py" line="536"/> <source>CSS Files (*.css)</source> <translation>CSS Dosyaları (*.css)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="534"/> + <location filename="../QScintilla/Lexers/__init__.py" line="539"/> <source>QSS Files (*.qss)</source> <translation>QSS Dosyaları (*.qss)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="366"/> + <location filename="../QScintilla/Lexers/__init__.py" line="371"/> <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> <translation>PHP Dosyaları (*.php *.php3 *.php4 *.php5 *.phtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="369"/> + <location filename="../QScintilla/Lexers/__init__.py" line="374"/> <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> <translation>XML Dosyaları (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="546"/> + <location filename="../QScintilla/Lexers/__init__.py" line="551"/> <source>Qt Resource Files (*.qrc)</source> <translation>Qt Kaynak Dosyaları (*.qrc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <location filename="../QScintilla/Lexers/__init__.py" line="380"/> <source>D Files (*.d *.di)</source> <translation>D Dosyaları (*.d *.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="555"/> + <location filename="../QScintilla/Lexers/__init__.py" line="560"/> <source>Java Files (*.java)</source> <translation>Java Dosyaları (*.java)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="558"/> + <location filename="../QScintilla/Lexers/__init__.py" line="563"/> <source>JavaScript Files (*.js)</source> <translation>JavaScript Dosyaları (*.js)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="561"/> + <location filename="../QScintilla/Lexers/__init__.py" line="566"/> <source>SQL Files (*.sql)</source> <translation>SQL Dosyaları (*.sql)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="564"/> + <location filename="../QScintilla/Lexers/__init__.py" line="569"/> <source>Docbook Files (*.docbook)</source> <translation>Docbook Dosyaları (*.docbook)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="390"/> + <location filename="../QScintilla/Lexers/__init__.py" line="395"/> <source>Perl Files (*.pl *.pm *.ph)</source> <translation>Perl Dosyaları (*.pl *.pm *.ph)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="573"/> + <location filename="../QScintilla/Lexers/__init__.py" line="578"/> <source>Lua Files (*.lua)</source> <translation>Lua Dosyaları (*.lua)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <location filename="../QScintilla/Lexers/__init__.py" line="401"/> <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> <translation>Tex Dosyaları (*.tex *.sty *.aux *.toc *.idx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="576"/> + <location filename="../QScintilla/Lexers/__init__.py" line="581"/> <source>Shell Files (*.sh)</source> <translation>Kabuk Dosyaları (*.sh)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="402"/> + <location filename="../QScintilla/Lexers/__init__.py" line="407"/> <source>Batch Files (*.bat *.cmd)</source> <translation>Batch Dosyaları (*.bat *.cmd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="405"/> + <location filename="../QScintilla/Lexers/__init__.py" line="410"/> <source>Diff Files (*.diff *.patch)</source> <translation>Diff Dosyaları (*.diff *.patch)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="408"/> + <location filename="../QScintilla/Lexers/__init__.py" line="413"/> <source>Makefiles (*.mak)</source> <translation>Make Dosyaları (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <location filename="../QScintilla/Lexers/__init__.py" line="416"/> <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> <translation>Ayarlar Dosyaları (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="600"/> + <location filename="../QScintilla/Lexers/__init__.py" line="605"/> <source>Povray Files (*.pov)</source> <translation>Povray Dosyaları (*.pov)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="418"/> + <location filename="../QScintilla/Lexers/__init__.py" line="423"/> <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> <translation>CMake Dosyaları (CMakeLists.txt *.cmake *.ctest)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="421"/> + <location filename="../QScintilla/Lexers/__init__.py" line="426"/> <source>VHDL Files (*.vhd *.vhdl)</source> <translation>VHDL Dosyaları (*.vhd *.vhdl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="424"/> + <location filename="../QScintilla/Lexers/__init__.py" line="429"/> <source>TCL/Tk Files (*.tcl *.tk)</source> <translation>TCL/Tk Dosyaları (*.tcl *.tk)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="427"/> + <location filename="../QScintilla/Lexers/__init__.py" line="432"/> <source>Fortran Files (*.f90 *.f95 *.f2k)</source> <translation>Fortran Dosyaları (*.f90 *.f95 *.f2k)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="430"/> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> <source>Fortran77 Files (*.f *.for)</source> <translation>Fortran77 Dosyaları (*.f *.for)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="433"/> + <location filename="../QScintilla/Lexers/__init__.py" line="438"/> <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> <translation>Pascal Dosyaları (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="627"/> + <location filename="../QScintilla/Lexers/__init__.py" line="632"/> <source>PostScript Files (*.ps)</source> <translation>PostScript Dosyaları (*.ps)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="439"/> + <location filename="../QScintilla/Lexers/__init__.py" line="444"/> <source>YAML Files (*.yaml *.yml)</source> <translation>YAML Dosyaları (*.yaml *.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <location filename="../QScintilla/Lexers/__init__.py" line="660"/> <source>All Files (*)</source> <translation>Tüm Dosyalar (*)</translation> </message> @@ -31847,7 +31867,7 @@ <translation type="obsolete">Python Dosyaları (*.py2)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="489"/> + <location filename="../QScintilla/Lexers/__init__.py" line="494"/> <source>Python3 Files (*.py)</source> <translation>Python Dosyaları (*.py3)</translation> </message> @@ -31857,152 +31877,152 @@ <translation type="obsolete">Python GUI Dosyaları (*.pyw2)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="495"/> + <location filename="../QScintilla/Lexers/__init__.py" line="500"/> <source>Python3 GUI Files (*.pyw)</source> <translation>Python GUI Dosyaları (*.pyw3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="510"/> + <location filename="../QScintilla/Lexers/__init__.py" line="515"/> <source>C Files (*.c)</source> <translation>C Dosyaları (*.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="513"/> + <location filename="../QScintilla/Lexers/__init__.py" line="518"/> <source>C++ Files (*.cpp)</source> <translation>C++ Dosyaları (*.cpp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="516"/> + <location filename="../QScintilla/Lexers/__init__.py" line="521"/> <source>C++/C Header Files (*.h)</source> <translation>C++/C Yardımcı Dosyaları (*.h)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="522"/> + <location filename="../QScintilla/Lexers/__init__.py" line="527"/> <source>HTML Files (*.html)</source> <translation>HTML Dosyaları (*.html)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="525"/> + <location filename="../QScintilla/Lexers/__init__.py" line="530"/> <source>PHP Files (*.php)</source> <translation>PHP Dosyaları (*.php)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="528"/> + <location filename="../QScintilla/Lexers/__init__.py" line="533"/> <source>ASP Files (*.asp)</source> <translation>ASP Dosyaları (*.asp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="537"/> + <location filename="../QScintilla/Lexers/__init__.py" line="542"/> <source>XML Files (*.xml)</source> <translation>XML Dosyaları (*.xml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="540"/> + <location filename="../QScintilla/Lexers/__init__.py" line="545"/> <source>XSL Files (*.xsl)</source> <translation>XSL Dosyaları (*.xsl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="543"/> + <location filename="../QScintilla/Lexers/__init__.py" line="548"/> <source>DTD Files (*.dtd)</source> <translation>DTD Dosyaları (*.dtd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="549"/> + <location filename="../QScintilla/Lexers/__init__.py" line="554"/> <source>D Files (*.d)</source> <translation>D Dosyaları (*.d)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="552"/> + <location filename="../QScintilla/Lexers/__init__.py" line="557"/> <source>D Interface Files (*.di)</source> <translation>D Interface Dosyaları (*.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="567"/> + <location filename="../QScintilla/Lexers/__init__.py" line="572"/> <source>Perl Files (*.pl)</source> <translation>Perl Dosyaları (*.pl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="570"/> + <location filename="../QScintilla/Lexers/__init__.py" line="575"/> <source>Perl Module Files (*.pm)</source> <translation>Perl Module Dosyaları (*.pm)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="579"/> + <location filename="../QScintilla/Lexers/__init__.py" line="584"/> <source>Batch Files (*.bat)</source> <translation>Batch Dosyaları (*.bat)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="582"/> + <location filename="../QScintilla/Lexers/__init__.py" line="587"/> <source>TeX Files (*.tex)</source> <translation>TeX Dosyaları (*.tex)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="585"/> + <location filename="../QScintilla/Lexers/__init__.py" line="590"/> <source>TeX Template Files (*.sty)</source> <translation>TeXŞablon Dosyası (*.sty)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="588"/> + <location filename="../QScintilla/Lexers/__init__.py" line="593"/> <source>Diff Files (*.diff)</source> <translation>Diff Dosyaları (*.diff)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="591"/> + <location filename="../QScintilla/Lexers/__init__.py" line="596"/> <source>Make Files (*.mak)</source> <translation>Make Dosyaları (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="594"/> + <location filename="../QScintilla/Lexers/__init__.py" line="599"/> <source>Properties Files (*.ini)</source> <translation>Özellikler Dosyaları (*.ini)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="597"/> + <location filename="../QScintilla/Lexers/__init__.py" line="602"/> <source>Configuration Files (*.cfg)</source> <translation>Ayar Dosyaları (*.cfg)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="603"/> + <location filename="../QScintilla/Lexers/__init__.py" line="608"/> <source>CMake Files (CMakeLists.txt)</source> <translation>CMake Dosyaları (CMakeLists.txt)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="606"/> + <location filename="../QScintilla/Lexers/__init__.py" line="611"/> <source>CMake Macro Files (*.cmake)</source> <translation>CMake Makro Dosyaları (*.cmake)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="609"/> + <location filename="../QScintilla/Lexers/__init__.py" line="614"/> <source>VHDL Files (*.vhd)</source> <translation>VHDL Dosyaları (*.vhd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="612"/> + <location filename="../QScintilla/Lexers/__init__.py" line="617"/> <source>TCL Files (*.tcl)</source> <translation>TCL Dosyaları (*.tcl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="615"/> + <location filename="../QScintilla/Lexers/__init__.py" line="620"/> <source>Tk Files (*.tk)</source> <translation>Tk Dosyaları (*.tk)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="618"/> + <location filename="../QScintilla/Lexers/__init__.py" line="623"/> <source>Fortran Files (*.f95)</source> <translation>Fortran Dosyaları (*.f95)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="621"/> + <location filename="../QScintilla/Lexers/__init__.py" line="626"/> <source>Fortran77 Files (*.f)</source> <translation>Fortran77 Dosyaları (*.f)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="624"/> + <location filename="../QScintilla/Lexers/__init__.py" line="629"/> <source>Pascal Files (*.pas)</source> <translation>Pascal Dosyaları (*.pas)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="630"/> + <location filename="../QScintilla/Lexers/__init__.py" line="635"/> <source>YAML Files (*.yml)</source> <translation>YAML Dosyaları (*.yml)</translation> </message> @@ -32017,45 +32037,50 @@ <translation>Python3</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="486"/> + <location filename="../QScintilla/Lexers/__init__.py" line="491"/> <source>Python2 Files (*.py2)</source> <translation>Python2 Dosyaları (*.py2)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="492"/> + <location filename="../QScintilla/Lexers/__init__.py" line="497"/> <source>Python2 GUI Files (*.pyw2)</source> <translation>Python2 GUI Dosyaları (*.pyw2)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Matlab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Octave</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Matlab Files (*.m *.m.matlab)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Matlab Files (*.m)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Octave Files (*.m.octave)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Octave Files (*.m *.m.octave)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <source>QSS</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -36640,6 +36665,44 @@ </message> </context> <context> + <name>PreviewerQSS</name> + <message> + <location filename="../UI/Previewers/PreviewerQSS.ui" line="27"/> + <source>Preview Style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="36"/> + <source>Action 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="38"/> + <source>Action 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="42"/> + <source>MDI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Python</source> + <translation type="unfinished">Python</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Ruby</source> + <translation type="unfinished">Ruby</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>JavaScript</source> + <translation type="unfinished">JavaScript</translation> + </message> +</context> +<context> <name>Printer</name> <message> <location filename="../QScintilla/Printer.py" line="63"/> @@ -50426,17 +50489,17 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> <source>Show difference</source> - <translation>Farkları göster</translation> + <translation type="obsolete">Farkları göster</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> <source>Show difference (extended)</source> - <translation>Farkları göster (gelişmiş)</translation> + <translation type="obsolete">Farkları göster (gelişmiş)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> <source>Show difference (URLs)</source> - <translation>Farkları göster (URL'ler)</translation> + <translation type="obsolete">Farkları göster (URL'ler)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="293"/> @@ -50524,11 +50587,6 @@ <translation>Kaynak havuzu bilgisini göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> - <source>Conflict resolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="549"/> <source>Copy</source> <translation type="unfinished">Kopyala</translation> @@ -50539,13 +50597,33 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="274"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> + <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="283"/> - <source>Show difference side-by-side (extended)</source> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> </context> @@ -50684,7 +50762,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> <source>Show difference</source> - <translation>Farkları göster</translation> + <translation type="obsolete">Farkları göster</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> @@ -50697,14 +50775,9 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> - <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> <source>Show difference (extended)</source> - <translation>Farkları göster (gelişmiş)</translation> + <translation type="obsolete">Farkları göster (gelişmiş)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="149"/> @@ -50712,14 +50785,9 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> - <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> <source>Show difference (URLs)</source> - <translation>Farkları göster (URL'ler)</translation> + <translation type="obsolete">Farkları göster (URL'ler)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> @@ -50727,11 +50795,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> - <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/> <source>Show status</source> <translation>Durumu Göster</translation> @@ -51171,6 +51234,36 @@ <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name>
--- a/i18n/eric5_zh_CN.GB2312.ts Thu Apr 03 18:58:08 2014 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Thu Apr 03 19:02:33 2014 +0200 @@ -21305,12 +21305,12 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -24083,12 +24083,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> <source>Show difference</source> - <translation type="unfinished">显示差异</translation> + <translation type="obsolete">显示差异</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Show difference (extended)</source> - <translation type="unfinished">显示差异（扩展）</translation> + <translation type="obsolete">显示差异（扩展）</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> @@ -24136,11 +24136,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> - <source>Conflict resolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="523"/> <source>Copy</source> <translation type="unfinished">复制</translation> @@ -24151,18 +24146,33 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="328"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> + <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="337"/> - <source>Show difference side-by-side (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> - <source>Extensions</source> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> </context> @@ -24381,7 +24391,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show difference</source> - <translation type="unfinished">显示差异</translation> + <translation type="obsolete">显示差异</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> @@ -24396,12 +24406,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation type="unfinished"><b>显示差异</b><p>显示本地项目与储存库的差异。</p></translation> + <translation type="obsolete"><b>显示差异</b><p>显示本地项目与储存库的差异。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show difference (extended)</source> - <translation type="unfinished">显示差异（扩展）</translation> + <translation type="obsolete">显示差异（扩展）</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> @@ -24411,7 +24421,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation type="unfinished"><b>显示差异（扩展）</b><p>显示项目的修订本与储存库的差异。</p></translation> + <translation type="obsolete"><b>显示差异（扩展）</b><p>显示项目的修订本与储存库的差异。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> @@ -25363,6 +25373,26 @@ <source>Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -32654,27 +32684,27 @@ <translation type="obsolete">Python</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <location filename="../QScintilla/Lexers/__init__.py" line="129"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> <source>SQL</source> <translation>SQL</translation> </message> <message> + <location filename="../QScintilla/Lexers/__init__.py" line="135"/> + <source>TeX</source> + <translation>TeX</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="137"/> + <source>VHDL</source> + <translation>VHDL</translation> + </message> + <message> <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>TeX</source> - <translation>TeX</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="135"/> - <source>VHDL</source> - <translation>VHDL</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> <source>TCL</source> <translation>TCL</translation> </message> @@ -32699,17 +32729,17 @@ <translation>PostScript</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="137"/> + <location filename="../QScintilla/Lexers/__init__.py" line="139"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="139"/> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>YAML</source> <translation>YAML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="159"/> <source>Pygments</source> <translation>Pygments</translation> </message> @@ -32724,357 +32754,357 @@ <translation type="obsolete">Python 文件 win32 (*.pyw)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="498"/> + <location filename="../QScintilla/Lexers/__init__.py" line="503"/> <source>Pyrex Files (*.pyx)</source> <translation>Pyrex 文件 (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="501"/> + <location filename="../QScintilla/Lexers/__init__.py" line="506"/> <source>Quixote Template Files (*.ptl)</source> <translation>Quixote 模板文件 (*.ptl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="504"/> + <location filename="../QScintilla/Lexers/__init__.py" line="509"/> <source>Ruby Files (*.rb)</source> <translation>Ruby 文件 (*.rb)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="507"/> + <location filename="../QScintilla/Lexers/__init__.py" line="512"/> <source>IDL Files (*.idl)</source> <translation>IDL 文件 (*.idl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="348"/> + <location filename="../QScintilla/Lexers/__init__.py" line="353"/> <source>C Files (*.h *.c)</source> <translation>C 文件 (*.h *.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="351"/> + <location filename="../QScintilla/Lexers/__init__.py" line="356"/> <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> <translation>C++ 文件 (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="519"/> + <location filename="../QScintilla/Lexers/__init__.py" line="524"/> <source>C# Files (*.cs)</source> <translation>C# 文件 (*.cs)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="357"/> + <location filename="../QScintilla/Lexers/__init__.py" line="362"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation>HTML 文件 (*.html *.htm *.asp *.shtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="531"/> + <location filename="../QScintilla/Lexers/__init__.py" line="536"/> <source>CSS Files (*.css)</source> <translation>CSS 文件 (*.css)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="534"/> + <location filename="../QScintilla/Lexers/__init__.py" line="539"/> <source>QSS Files (*.qss)</source> <translation>QSS 文件 (*.qss)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="366"/> + <location filename="../QScintilla/Lexers/__init__.py" line="371"/> <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> <translation>PHP 文件 (*.php *.php3 *.php4 *.php5 *.phtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="369"/> + <location filename="../QScintilla/Lexers/__init__.py" line="374"/> <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> <translation>XML 文件 (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="546"/> + <location filename="../QScintilla/Lexers/__init__.py" line="551"/> <source>Qt Resource Files (*.qrc)</source> <translation>Qt 资源文件 (*.qrc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <location filename="../QScintilla/Lexers/__init__.py" line="380"/> <source>D Files (*.d *.di)</source> <translation>D 文件 (*.d *.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="555"/> + <location filename="../QScintilla/Lexers/__init__.py" line="560"/> <source>Java Files (*.java)</source> <translation>Java 文件 (*.java)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="558"/> + <location filename="../QScintilla/Lexers/__init__.py" line="563"/> <source>JavaScript Files (*.js)</source> <translation>JavaScript 文件 (*.js)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="561"/> + <location filename="../QScintilla/Lexers/__init__.py" line="566"/> <source>SQL Files (*.sql)</source> <translation>SQL 文件 (*.sql)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="564"/> + <location filename="../QScintilla/Lexers/__init__.py" line="569"/> <source>Docbook Files (*.docbook)</source> <translation>Docbook 文件 (*.docbook)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="390"/> + <location filename="../QScintilla/Lexers/__init__.py" line="395"/> <source>Perl Files (*.pl *.pm *.ph)</source> <translation>Perl 文件 (*.pl *.pm *.ph)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="573"/> + <location filename="../QScintilla/Lexers/__init__.py" line="578"/> <source>Lua Files (*.lua)</source> <translation>Lua 文件 (*.lua)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <location filename="../QScintilla/Lexers/__init__.py" line="401"/> <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> <translation>Tex 文件 (*.tex *.sty *.aux *.toc *.idx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="576"/> + <location filename="../QScintilla/Lexers/__init__.py" line="581"/> <source>Shell Files (*.sh)</source> <translation>命令行文件 (*.sh)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="402"/> + <location filename="../QScintilla/Lexers/__init__.py" line="407"/> <source>Batch Files (*.bat *.cmd)</source> <translation>批处理文件 (*.bat *.cmd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="405"/> + <location filename="../QScintilla/Lexers/__init__.py" line="410"/> <source>Diff Files (*.diff *.patch)</source> <translation>差异文件 (*.diff *.patch)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="408"/> + <location filename="../QScintilla/Lexers/__init__.py" line="413"/> <source>Makefiles (*.mak)</source> <translation>Makefiles (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <location filename="../QScintilla/Lexers/__init__.py" line="416"/> <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> <translation>属性文件 (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="600"/> + <location filename="../QScintilla/Lexers/__init__.py" line="605"/> <source>Povray Files (*.pov)</source> <translation>Povray 文件 (*.pov)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="418"/> + <location filename="../QScintilla/Lexers/__init__.py" line="423"/> <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> <translation>CMake 文件 (CMakeLists.txt *.cmake *.ctest)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="421"/> + <location filename="../QScintilla/Lexers/__init__.py" line="426"/> <source>VHDL Files (*.vhd *.vhdl)</source> <translation>VHDL 文件 (*.vhd *.vhdl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="424"/> + <location filename="../QScintilla/Lexers/__init__.py" line="429"/> <source>TCL/Tk Files (*.tcl *.tk)</source> <translation>TCL/Tk 文件 (*.vhd *.vhdl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="427"/> + <location filename="../QScintilla/Lexers/__init__.py" line="432"/> <source>Fortran Files (*.f90 *.f95 *.f2k)</source> <translation>Fortran 文件 (*.f90 *.f95 *.f2k)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="430"/> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> <source>Fortran77 Files (*.f *.for)</source> <translation>Fortran77 文件 (*.f *.for)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="433"/> + <location filename="../QScintilla/Lexers/__init__.py" line="438"/> <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> <translation>Pascal 文件 (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="627"/> + <location filename="../QScintilla/Lexers/__init__.py" line="632"/> <source>PostScript Files (*.ps)</source> <translation>PostScript 文件 (*.ps)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="439"/> + <location filename="../QScintilla/Lexers/__init__.py" line="444"/> <source>YAML Files (*.yaml *.yml)</source> <translation>YAML 文件 (*.yaml *.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <location filename="../QScintilla/Lexers/__init__.py" line="660"/> <source>All Files (*)</source> <translation>所有文件 (*)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="510"/> + <location filename="../QScintilla/Lexers/__init__.py" line="515"/> <source>C Files (*.c)</source> <translation>C 文件 (*.c)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="513"/> + <location filename="../QScintilla/Lexers/__init__.py" line="518"/> <source>C++ Files (*.cpp)</source> <translation>C++ 文件 (*.cpp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="516"/> + <location filename="../QScintilla/Lexers/__init__.py" line="521"/> <source>C++/C Header Files (*.h)</source> <translation>C++/C 头文件 (*.h)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="522"/> + <location filename="../QScintilla/Lexers/__init__.py" line="527"/> <source>HTML Files (*.html)</source> <translation>HTML 文件 (*.html)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="525"/> + <location filename="../QScintilla/Lexers/__init__.py" line="530"/> <source>PHP Files (*.php)</source> <translation>PHP 文件 (*.php)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="528"/> + <location filename="../QScintilla/Lexers/__init__.py" line="533"/> <source>ASP Files (*.asp)</source> <translation>ASP 文件 (*.asp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="537"/> + <location filename="../QScintilla/Lexers/__init__.py" line="542"/> <source>XML Files (*.xml)</source> <translation>XML 文件 (*.xml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="540"/> + <location filename="../QScintilla/Lexers/__init__.py" line="545"/> <source>XSL Files (*.xsl)</source> <translation>XSL 文件 (*.xsl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="543"/> + <location filename="../QScintilla/Lexers/__init__.py" line="548"/> <source>DTD Files (*.dtd)</source> <translation>DTD 文件 (*.dtd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="549"/> + <location filename="../QScintilla/Lexers/__init__.py" line="554"/> <source>D Files (*.d)</source> <translation>D 文件 (*.d)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="552"/> + <location filename="../QScintilla/Lexers/__init__.py" line="557"/> <source>D Interface Files (*.di)</source> <translation>D 界面文件 (*.di)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="567"/> + <location filename="../QScintilla/Lexers/__init__.py" line="572"/> <source>Perl Files (*.pl)</source> <translation>Perl 文件 (*.pl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="570"/> + <location filename="../QScintilla/Lexers/__init__.py" line="575"/> <source>Perl Module Files (*.pm)</source> <translation>Perl 模块文件 (*.pm)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="579"/> + <location filename="../QScintilla/Lexers/__init__.py" line="584"/> <source>Batch Files (*.bat)</source> <translation>批处理文件 (*.bat)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="582"/> + <location filename="../QScintilla/Lexers/__init__.py" line="587"/> <source>TeX Files (*.tex)</source> <translation>TeX 文件 (*.tex)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="585"/> + <location filename="../QScintilla/Lexers/__init__.py" line="590"/> <source>TeX Template Files (*.sty)</source> <translation>TeX 模板文件 (*.sty)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="588"/> + <location filename="../QScintilla/Lexers/__init__.py" line="593"/> <source>Diff Files (*.diff)</source> <translation>差异文件 (*.diff)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="591"/> + <location filename="../QScintilla/Lexers/__init__.py" line="596"/> <source>Make Files (*.mak)</source> <translation>Make 文件 (*.mak)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="594"/> + <location filename="../QScintilla/Lexers/__init__.py" line="599"/> <source>Properties Files (*.ini)</source> <translation>属性文件 (*.ini)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="597"/> + <location filename="../QScintilla/Lexers/__init__.py" line="602"/> <source>Configuration Files (*.cfg)</source> <translation>配置文件 (*.cfg)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="603"/> + <location filename="../QScintilla/Lexers/__init__.py" line="608"/> <source>CMake Files (CMakeLists.txt)</source> <translation>CMake 文件 (CMakeLists.txt)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="606"/> + <location filename="../QScintilla/Lexers/__init__.py" line="611"/> <source>CMake Macro Files (*.cmake)</source> <translation>CMake 宏文件 (*.cmake)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="609"/> + <location filename="../QScintilla/Lexers/__init__.py" line="614"/> <source>VHDL Files (*.vhd)</source> <translation>VHDL 文件 (*.vhd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="612"/> + <location filename="../QScintilla/Lexers/__init__.py" line="617"/> <source>TCL Files (*.tcl)</source> <translation>TCL 文件 (*.tcl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="615"/> + <location filename="../QScintilla/Lexers/__init__.py" line="620"/> <source>Tk Files (*.tk)</source> <translation>Tk 文件 (*.tk)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="618"/> + <location filename="../QScintilla/Lexers/__init__.py" line="623"/> <source>Fortran Files (*.f95)</source> <translation>Fortran 文件 (*.f95)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="621"/> + <location filename="../QScintilla/Lexers/__init__.py" line="626"/> <source>Fortran77 Files (*.f)</source> <translation>Fortran77 文件 (*.f)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="624"/> + <location filename="../QScintilla/Lexers/__init__.py" line="629"/> <source>Pascal Files (*.pas)</source> <translation>Pascal 文件 (*.pas)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="630"/> + <location filename="../QScintilla/Lexers/__init__.py" line="635"/> <source>YAML Files (*.yml)</source> <translation>YAML 文件 (*.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="330"/> + <location filename="../QScintilla/Lexers/__init__.py" line="335"/> <source>Python Files (*.py *.py2 *.py3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="333"/> + <location filename="../QScintilla/Lexers/__init__.py" line="338"/> <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="489"/> + <location filename="../QScintilla/Lexers/__init__.py" line="494"/> <source>Python3 Files (*.py)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="495"/> + <location filename="../QScintilla/Lexers/__init__.py" line="500"/> <source>Python3 GUI Files (*.pyw)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="486"/> + <location filename="../QScintilla/Lexers/__init__.py" line="491"/> <source>Python2 Files (*.py2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="492"/> + <location filename="../QScintilla/Lexers/__init__.py" line="497"/> <source>Python2 GUI Files (*.pyw2)</source> <translation type="unfinished"></translation> </message> @@ -33089,35 +33119,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Matlab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="144"/> + <location filename="../QScintilla/Lexers/__init__.py" line="146"/> <source>Octave</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Matlab Files (*.m *.m.matlab)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Matlab Files (*.m)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="636"/> + <location filename="../QScintilla/Lexers/__init__.py" line="641"/> <source>Octave Files (*.m.octave)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="445"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Octave Files (*.m *.m.octave)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> + <source>QSS</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -38026,6 +38061,44 @@ </message> </context> <context> + <name>PreviewerQSS</name> + <message> + <location filename="../UI/Previewers/PreviewerQSS.ui" line="27"/> + <source>Preview Style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="36"/> + <source>Action 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="38"/> + <source>Action 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="42"/> + <source>MDI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Python</source> + <translation type="unfinished">Python</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>Ruby</source> + <translation type="unfinished">Ruby</translation> + </message> + <message> + <location filename="../UI/Previewers/PreviewerQSS.py" line="59"/> + <source>JavaScript</source> + <translation type="unfinished">JavaScript</translation> + </message> +</context> +<context> <name>Printer</name> <message> <location filename="QScintilla/Printer.py" line="53"/> @@ -53626,17 +53699,17 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> <source>Show difference</source> - <translation>显示差异</translation> + <translation type="obsolete">显示差异</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> <source>Show difference (extended)</source> - <translation>显示差异（扩展）</translation> + <translation type="obsolete">显示差异（扩展）</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> <source>Show difference (URLs)</source> - <translation>显示差异（URL）</translation> + <translation type="obsolete">显示差异（URL）</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="293"/> @@ -53724,11 +53797,6 @@ <translation>显示储存库信息</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> - <source>Conflict resolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="549"/> <source>Copy</source> <translation type="unfinished">复制</translation> @@ -53739,13 +53807,33 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="274"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> + <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="283"/> - <source>Show difference side-by-side (extended)</source> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="713"/> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> </context> @@ -53904,7 +53992,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> <source>Show difference</source> - <translation>显示差异</translation> + <translation type="obsolete">显示差异</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> @@ -53919,12 +54007,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation><b>显示差异</b><p>显示本地项目与储存库的差异。</p></translation> + <translation type="obsolete"><b>显示差异</b><p>显示本地项目与储存库的差异。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> <source>Show difference (extended)</source> - <translation>显示差异（扩展）</translation> + <translation type="obsolete">显示差异（扩展）</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="149"/> @@ -53934,12 +54022,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> - <translation><b>显示差异（扩展）</b><p>显示项目的修订本与储存库的差异。</p></translation> + <translation type="obsolete"><b>显示差异（扩展）</b><p>显示项目的修订本与储存库的差异。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> <source>Show difference (URLs)</source> - <translation>显示差异（URL）</translation> + <translation type="obsolete">显示差异（URL）</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> @@ -53949,7 +54037,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> - <translation><b>显示差异（URL）</b><p>显示两个储存库 URL 中项目的差异。</p></translation> + <translation type="obsolete"><b>显示差异（URL）</b><p>显示两个储存库 URL 中项目的差异。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/> @@ -54401,6 +54489,36 @@ <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name>
