[GRASS-SVN] r68658 - in grass/trunk: general/g.version lib/init

[svn_grass at osgeo.org]

Author: neteler
Date: 2016-06-09 07:40:00 -0700 (Thu, 09 Jun 2016)
New Revision: 68658

Modified:
   grass/trunk/general/g.version/main.c
   grass/trunk/lib/init/grass.py
Log:
g.version + startup script: improved citation options msg

Modified: grass/trunk/general/g.version/main.c
===================================================================
--- grass/trunk/general/g.version/main.c	2016-06-09 12:46:06 UTC (rev 68657)
+++ grass/trunk/general/g.version/main.c	2016-06-09 14:40:00 UTC (rev 68658)
@@ -76,6 +76,11 @@
     copyright->description = _("Print also the copyright message");
     copyright->guisection = _("Additional info");
 
+    cite_flag = G_define_flag();
+    cite_flag->key = 'x';
+    cite_flag->description = _("Print also the citation options");
+    cite_flag->guisection = _("Additional info");
+
     build = G_define_flag();
     build->key = 'b';
     build->description = _("Print also the build information");
@@ -98,11 +103,6 @@
     shell->description = _("Print info in shell script style (including SVN revision number)");
     shell->guisection = _("Shell");
 
-    cite_flag = G_define_flag();
-    cite_flag->key = 'x';
-    cite_flag->description =
-        _("Display information on how to cite the GRASS GIS software and Addons");
-
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 

Modified: grass/trunk/lib/init/grass.py
===================================================================
--- grass/trunk/lib/init/grass.py	2016-06-09 12:46:06 UTC (rev 68657)
+++ grass/trunk/lib/init/grass.py	2016-06-09 14:40:00 UTC (rev 68658)
@@ -1429,12 +1429,14 @@
 %-41s%s (%s)
 %-41sg.manual -i
 %-41sg.version -c
+%-41sg.version -x
 """ % (_("GRASS GIS homepage:"),
         # GTC Running through: SHELL NAME
        _("This version running through:"),
        shellname, os.getenv('SHELL'),
        _("Help is available with the command:"),
-       _("See the licence terms with:")))
+       _("See the licence terms with:"),
+       _("See citation options with:")))
 
     if grass_gui == 'wxpython':
         message("%-41sg.gui wxpython" % _("If required, restart the GUI with:"))