Merge pull request #407 from cvvergara/fix-and-locale

Fix and locale

doc/CMakeLists.txt

@@ -5,20 +5,16 @@
 #---------------------
 set(OSGeoLiveDoc_FILES
     #"disclaimer.rst"
-    "translators.rst"
     "osgeo_contact.rst"
-    "contributors.rst"
     "index.rst"
     "contact.rst"
     "sponsors.rst"
     "welcome_message.txt"
     "copyright.rst"
     "download.rst"
-    "mac_installers.rst"
     "presentation.rst"
     "sponsors_osgeo.rst"
     "prior_applications.rst"
-    "win_installers.rst"
     )
 
 

doc/index.rst

@@ -73,11 +73,7 @@ OSGeoLive is an `OSGeo Foundation <http://osgeo.org/>`_ project. The OSGeo Found
      sponsors_osgeo
      presentation
      metrics
-     contributors
-     translators
      osgeo_contact
-     mac_installers
-     win_installers
 
 
 

doc/quickstart/pywps_quickstart.rst

@@ -69,7 +69,7 @@ Open your favourite web browser and point it to the address where the example
 service is listening: `http://127.0.0.1:5000/ <http://127.0.0.1:5000/>`_ You will
 be presented with the following page:
 
-.. image:: /images/screenshots/1024x768/pywps-4.0.0_example.png
+.. image:: /images/projects/pywps/pywps-4.0.0_example.png
   :scale: 100 %
 
 Use the green buttons to explore the service. Issue a `GetCapabilities` request
@@ -85,7 +85,7 @@ address:
 The process simply replies back with a "Hello OSGeo" message, encoded in a 
 standard WPS response document. Your browser should be showing something like:
 
-.. image:: /images/screenshots/1024x768/pywps-4.0.0_response.png
+.. image:: /images/projects/pywps/pywps-4.0.0_response.png
   :scale: 100 %
 
 Developing WPS processes

doc/sponsors.rst

@@ -57,10 +57,20 @@ and provide support and custom development for Open Source GIS software.
 Contributors
 ================================================================================
 
-.. include:: contributors.rst
+.. csv-table::
+    :header-rows: 1
+    :file: ../contributors.csv
+    :delim: ,
+    :encoding: UTF-8
+    :widths: 30, 40, 10, 20
 
 Translators
 ================================================================================
 
-.. include:: translators.rst
+.. csv-table::
+    :header-rows: 1
+    :file: ../translators.csv
+    :delim: ,
+    :encoding: UTF-8
+    :widths: 15, 5, 30, 20, 20, 10
 

locale/en/LC_MESSAGES/contact.po

@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OSGeoLive 12.0.0.-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-07 09:20-0500\n"
+"POT-Creation-Date: 2018-07-12 12:47-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.6.0\n"
+"Generated-By: Babel 2.5.3\n"
 
 #: ../../build/doc/contact.rst:2
 msgid "Contact Us"
@@ -90,21 +90,14 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: ../../build/doc/contact.rst:46
-msgid ""
-"Jirotech provide commercial support for the building of the Live DVD, as "
-"well as many of the applications packaged in it. Details at: "
-"http://jirotech.com"
-msgstr ""
-
-#: ../../build/doc/contact.rst:50
+#: ../../build/doc/contact.rst:41
 msgid ""
 "Most packaged applications have both community and commercial support "
 "offerings for them. Refer to specific application descriptions linked "
 "from the :doc:`Contents <./overview/overview>` for details."
 msgstr ""
 
-#: ../../build/doc/contact.rst:53
+#: ../../build/doc/contact.rst:44
 msgid ""
 "In addition, there are a large number of consultancy firms world wide who"
 " provide support for OSGeo member projects. See https://www.osgeo.org"
@@ -143,3 +136,11 @@ msgstr ""
 #~ "for one that meets your needs."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Jirotech provide commercial support for "
+#~ "the building of the Live DVD, as"
+#~ " well as many of the applications "
+#~ "packaged in it. Details at: "
+#~ "http://jirotech.com"
+#~ msgstr ""
+