diff -r 0fbe63ca87e8 -r 7f7453c8e5fc i18n/eric6_empty.ts --- a/i18n/eric6_empty.ts Sun Feb 17 16:57:17 2019 +0100 +++ b/i18n/eric6_empty.ts Sun Feb 17 17:13:51 2019 +0100 @@ -15433,7 +15433,7 @@ </message> <message> <location filename="../UI/EmailDialog.py" line="173"/> - <source><p>The Google Mail Client API is not installed. Use <code>pip install --upgrade google-api-python-client</code> to install it.</p></source> + <source><p>The Google Mail Client API is not installed. Use <code>pip install --upgrade google-api-python-client oauth2client</code> to install it.</p></source> <translation type="unfinished"></translation> </message> <message> @@ -15629,6 +15629,11 @@ <source>Gmail API Help</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="60"/> + <source><p>The Google Mail Client API is not installed. Use <code>pip install --upgrade google-api-python-client oauth2client</code> to install it.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EricAccessHandler</name> @@ -82082,7 +82087,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="665"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="670"/> <source>Options</source> <translation type="unfinished"></translation> </message> @@ -82097,7 +82102,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="671"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="676"/> <source>Python Version:</source> <translation type="unfinished"></translation> </message> @@ -82107,87 +82112,87 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="343"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="348"/> <source>System-wide Python Packages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="350"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="355"/> <source>Select to unzip setuptools when installing it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="353"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="358"/> <source>Unzip Setuptool to virtualenv</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="363"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="368"/> <source>Select to not install setuptools (or pip) in the new virtualenv</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="366"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="371"/> <source>Don't install 'setuptool' (or pip) in the virtualenv</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="373"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="378"/> <source>Select to not install pip in the new virtualenv</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="376"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="381"/> <source>Don't install 'pip' in the virtualenv</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="383"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="388"/> <source>Select to clear the target first</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="386"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="391"/> <source>Clear out the target directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="393"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="398"/> <source>Select to always copy files rather than symlinking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="396"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="401"/> <source>Always copy files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="423"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="428"/> <source>Select to generate a log file in the target directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="426"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="431"/> <source>Save a log file in the target directory after creation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="436"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="441"/> <source>Select to write a shell script/batch file to regenerate the virtualenv</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="439"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="444"/> <source>Save virtualenv generation script</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="449"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="454"/> <source>Open the newly created virtualenv in a file manager window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="452"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="457"/> <source>Open target directory after creation</source> <translation type="unfinished"></translation> </message> @@ -82207,7 +82212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="340"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="345"/> <source>Select to give the virtualenv access to the global site-packages</source> <translation type="unfinished"></translation> </message> @@ -82227,17 +82232,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="403"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="408"/> <source>Select to use symlinks instead of copies</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="413"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="418"/> <source>Select to upgrade a virtual environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="416"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="421"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> @@ -82272,7 +82277,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="406"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="411"/> <source>Use Symbolic Links</source> <translation type="unfinished"></translation> </message> @@ -82297,97 +82302,97 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="466"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="471"/> <source>Target Environment Specification</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="563"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="568"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="479"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="484"/> <source>Enter the name for the environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="577"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="582"/> <source>Path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="502"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="507"/> <source>Enter the target directory for the conda environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="509"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="514"/> <source><b>Note:</b> Only one of the above entries is mandatory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="519"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="524"/> <source>Special Operations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="531"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="536"/> <source>Select to clone an environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="534"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="539"/> <source>Clone Environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="544"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="549"/> <source>Select to create the environment from a requirements file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="547"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="552"/> <source>from Requirements</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="570"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="575"/> <source>Enter the name of the environment to be cloned</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="593"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="598"/> <source>Enter the directory of the environment to be cloned</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="649"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="654"/> <source>Package Specs:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="656"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="661"/> <source>Enter the package specifications for the environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="678"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="683"/> <source>Enter the Python version for the environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="685"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="690"/> <source>Allow insecure SSL connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="692"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="697"/> <source>Select to perform just a dry-run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="695"/> + <location filename="../VirtualEnv/VirtualenvConfigurationDialog.ui" line="700"/> <source>Perform dry-run</source> <translation type="unfinished"></translation> </message> @@ -87322,12 +87327,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="394"/> + <location filename="../eric6.py" line="397"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="399"/> + <location filename="../eric6.py" line="402"/> <source>Generating Main Window...</source> <translation type="unfinished"></translation> </message>