--- 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>
