Mercurial Repositories > eric / changeset

--- a/eric6.appdata.xml	Sat Jan 17 14:34:26 2015 +0100
+++ b/eric6.appdata.xml	Sun Jan 18 12:05:53 2015 +0100
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2013 First Lastname <your@email.com> -->
 <application>
  <id type="desktop">eric6@MARKER@.desktop</id>
  <metadata_license>CC-BY-3.0</metadata_license>
@@ -13,8 +12,8 @@
     the highly flexible Scintilla editor control. It is designed to be
     usable as everdays' quick and dirty editor as well as being usable as a
     professional project management tool integrating many advanced features
-    Python offers the professional coder. eric4 includes a plugin system, which
-    allows easy extension of the IDE functionality with plugins downloadable
+    Python offers the professional coder. Eric includes a plug-in system, which
+    allows easy extension of the IDE functionality with plug-ins downloadable
     from the net.
   </p>
  </description>

--- a/eric6.desktop	Sat Jan 17 14:34:26 2015 +0100
+++ b/eric6.desktop	Sun Jan 18 12:05:53 2015 +0100
@@ -5,11 +5,11 @@
 MimeType=text/x-python;
 Icon=eric@MARKER@
 Terminal=false
-Name=eric6
-Name[de]=eric6
+Name=eric6@PY_MARKER@
+Name[de]=eric6@PY_MARKER@
 Comment=Integrated Development Environment for Python
 Comment[de]=Integrierte Entwicklungsumgebung für Python
-GenericName=Integrated Development Environment for Python
-GenericName[de]=Integrierte Entwicklungsumgebung für Python
+GenericName=IDE for Python
+GenericName[de]=IDE für Python
 Categories=Qt;Python;Development;IDE;
 StartupNotify=true

--- a/eric6_webbrowser.desktop	Sat Jan 17 14:34:26 2015 +0100
+++ b/eric6_webbrowser.desktop	Sun Jan 18 12:05:53 2015 +0100
@@ -5,8 +5,8 @@
 MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
 Icon=ericWeb@MARKER@
 Terminal=false
-Name=eric6 Web Browser
-Name[de]=eric6 Web Browser
+Name=eric6 Web Browser@PY_MARKER@
+Name[de]=eric6 Web Browser@PY_MARKER@
 Comment=Web Browser for PyQt5
 Comment[de]=Web Browser für PyQt5
 GenericName=Web Browser

--- a/install.py	Sat Jan 17 14:34:26 2015 +0100
+++ b/install.py	Sun Jan 18 12:05:53 2015 +0100
@@ -92,6 +92,11 @@
     2: "_py2",
     3: "_py3",
 }
+# Define a mapping of markers to full text
+PythonTextMarkers = {
+    "_py2": "Python 2",
+    "_py3": "Python 3",
+}
 
 
 def exit(rcode=0):
@@ -278,6 +283,11 @@
     f.close()
     
     text = text.replace("@MARKER@", marker)
+    if marker:
+        t_marker = " ({0})".format(PythonTextMarkers[marker])
+    else:
+        t_marker = ""
+    text = text.replace("@PY_MARKER@", t_marker)
     
     if sys.version_info[0] == 2:
         f = codecs.open(dst, "w", "utf-8")