activityworkshop · activityworkshop · Feb 15, 2015 · Feb 15, 2015 · Feb 15, 2015
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,10 +1,12 @@
 MapSlicer ChangeLog
-==================
+===================
 
 1.0 Beta 3: 14 Feb 2015
 -----------------------
 
 - Forked project and renamed to MapSlicer
+- Replaced directory selection control for output
+- Removed menu bar, web links and requests for donations
 
 1.0 Beta 2: 26 Aug 2009
 -----------------------

diff --git a/README.txt b/README.txt
@@ -1,14 +1,14 @@
-====================
+=====================
 MapSlicer Application
-====================
+=====================
 https://wiki.osgeo.org/wiki/MapSlicer
 
-MapSlicer is graphical application for online map publishing. Your map can create overlay of standard maps like Google Maps, Yahoo Maps, Microsoft VirtualEarth or OpenStreetMap and can be also visualized in 3D by Google Earth. Only thing you have to do for publishing the map is to upload the automatically generated directory with tiles into your webserver.
+MapSlicer is a graphical application for online map publishing. Your map can create overlay of standard maps like OpenStreetMap, Google Maps, Yahoo Maps or Bing Maps and can be also visualized in 3D by Google Earth. The only thing you have to do for publishing the map is to upload the automatically generated directory with tiles into your webserver.
 
-MapSlicer is an open-source application, distributed under New BSD License.
-You can download the source code from repository at https://github.com/kalxas/mapslicer
+MapSlicer is an open-source application, distributed under the New BSD License.
+It can run on several platforms, including Linux, Microsoft Windows and Apple Mac OS X.
 
-It is running under Microsoft Windows, Apple Mac OS X as well as on UNIX systems like Linux Ubuntu.
+You can download the source code from the repository at https://github.com/kalxas/mapslicer
 
 Requirements
 ------------
@@ -17,10 +17,11 @@ In case you would like to run the application from the code you need:
 - wxPython 2.8+
 - GDAL 1.6+
 
-Start of the application is done by running:
+The application can be started by running:
 
 $ python mapslicer.py
 
+Or depending on the installation method there should be a program icon in the programs menu.
 
 Packaging
 ---------
@@ -29,8 +30,18 @@ The packaging scripts and instructions are in the directory /deploy/.
 
 Development
 -----------
-
 Development of the project happens on GitHub. Pull Requests are welcome :)
 
 We would like to thank Petr Pridal - Klokan for his contribution of the original MapTiler project.
 
+Sponsors of MapTiler/GDAL2Tiles:
+
+	* http://www.davidrumsey.com - supported improvement of Google Earth SuperOverlay rendering
+	* http://www.nic.cz/ and http://www.nic.cz/vip/ - Vyvíjej, Inovuj, Programuj
+	* http://www.brgm.fr/ - Bureau des Recherches Geologiques et Minières - French Geological Survey Office
+	* http://www.oldmapsonline.org/ - Moravian Library Brno, Czech Ministry of Culture
+	* http://code.google.com/soc/ - Google Summer of Code 2007, 2008 (GDAL2Tiles utility) - OSGeo and Google Inc.
+
+Huge thanks to the team of http://www.gdal.org/ and also people from http://www.osgeo.org/ .
+
+
diff --git a/deploy/linux/debian/copyright b/deploy/linux/debian/copyright
@@ -1,11 +1,12 @@
-MapSlcer (GUI for GDAL2Tiles)
-=============================
+MapSlicer (GUI for GDAL2Tiles)
+==============================
 New BSD License
 
 Derived from the open source MapTiler project
 
 Copyright (c) 2009, Petr Pridal - KLOKAN
 Copyright (c) 2015, Angelos Tzotsos
+Copyright (c) 2015, Activityworkshop
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -230,22 +231,6 @@ freely, subject to the following restrictions:
        "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
        own source and binary releases.
 
-MrSID GDAL Plugin
------------------
-
-Portions of this computer program are copyright (c) 1995-2005 LizardTech, Inc. All rights reserved. MrSID is protected by U.S. Patent No. 5,710,835. Foreign Patents Pending.
-
-* You have acquired a product ("PRODUCT") that includes software licensed by [LICENSEE] from LIZARDTECH, INC.  Those installed software products of LIZARDTECH origin, as well as any associated media, printed materials, and "online" or electronic documentation ("SOFTWARE") are protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The SOFTWARE is licensed, not sold. 
-
-* MrSID software is protected by United States Copyright Law and International Treaty provisions and by U.S. Patent No. 5,710,835. Foreign patents are pending. Some of the MrSID technology was developed through a project at the Los Alamos National Laboratory (LANL) funded by the U.S. Government, managed under contract by the Regents of the University of California (University). The U.S. Government and the University have reserved rights in the Technology, including the following: (a) the U.S. Government has a non-exclusive, nontransferable, irrevocable, paid-up license to practice or have practiced throughout the world, for or on behalf of the United States, inventions covered by the University's Patent Rights, and has other rights under 35 U.S.C. √ü 200-212 and applicable implementing regulations and under the U.S. Department of Energy (DOE) Assignment and Confirmatory License through which the DOE's rights in the Technology were assigned to the University; (b) Under 35 U.S.C. √ü 203, the DOE has the right to require LizardTech to grant a non-exclusive, partially exclusive or exclusive license under U.S. Patent No. 5,710,835 in any field of use to a responsible applicant(s) upon terms reasonable under the circumstances, if LizardTech does not adequately attempt to commercialize the MrSID Technology. See, 37 CFR 401.6; (c) The University makes no warranty or representation as to the validity or scope of Patent No. 5,710,835, and neither the Government nor the University have any obligation to furnish any know-how, technical assistance, or technical data in connection with MrSID software. For further information about these provisions, contact LizardTech, 1008 Western Ave., Suite 200, Seattle, WA 98104.
-* If you do not agree to this End User License Agreement ("EULA"), do not use the PRODUCT. Promptly contact LICENSEE] for instructions on return of the unused PRODUCT(S) for a refund. Any use of the SOFTWARE, including but not limited to use of the PRODUCT, will constitute your agreement to this EULA (or ratification of any previous consent). 
-* Grant of License. You are granted a personal, nonsublicensable, nontransferable, nonexclusive license to use the SOFTWARE as integrated in the PRODUCT (as well as any associated documentation).  You will not rent, sell, lease or otherwise distribute the SOFTWARE or any part of it.
-
-* NO WARRANTIES FOR THE SOFTWARE.  The SOFTWARE is provided "AS IS" and with all faults. THE ENTIRE RISK AS TO SATISFACTORY QUALITY, PERFORMANCE, ACCURACY, AND EFFORT (INCLUDING LACK OF NEGLIGENCE) IS WITH YOU. ALSO, THERE IS NO WARRANTY AGAINST INTERFERENCE WITH YOUR ENJOYMENT OF THE SOFTWARE OR AGAINST INFRINGEMENT. IF YOU HAVE RECEIVED ANY WARRANTIES REGARDING THE PRODUCT OR THE SOFTWARE, THOSE WARRANTIES DO NOT ORIGINATE FROM, AND ARE NOT BINDING ON, LIZARDTECH. 
-* NO LIABILITY FOR CERTAIN DAMAGES. EXCEPT AS PROHIBITED BY LAW, LIZARDTECH SHALL HAVE NO LIABILITY FOR ANY INDIRECT, SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES ARISING FROM OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE SOFTWARE. THIS LIMITATION SHALL APPLY EVEN IF ANY REMEDY FAILS OF ITS ESSENTIAL PURPOSE.
-* Limitations on Reverse Engineering, Decompilation, and Disassembly. You may not reverse engineer, decompile, or disassemble the SOFTWARE, except and only to the extent that such activity is expressly permitted by applicable law notwithstanding this limitation. 
-* Export Restrictions.  You acknowledge that the SOFTWARE, or any part thereof, or any process or service that is the direct product of the SOFTWARE (the foregoing collectively referred to as the "Restricted Components") are of U.S. origin.  You agree to comply with all applicable international and national laws that apply to these products, including the U.S. Export Administration Regulations, as well as end-user, end-use and destination restrictions issued by U.S. and other governments.
-
 ECW GDAL Plugin
 ---------------
 
@@ -470,7 +455,5 @@ Revised  8th June 2005 - Removed server restriction from GPL License
 Other packages
 --------------
 
-For other open-source software libraries used is this package like GIF, PNG, TIFF, JPEG, Jasper, PROJ.4, GEOS and SQLite please have a look into the original documentation of those projects.
-
-
+For other open-source software libraries used in this package like GIF, PNG, TIFF, JPEG, Jasper, PROJ.4, GEOS and SQLite please have a look into the original documentation of those projects.
 
diff --git a/mapslicer.py b/mapslicer.py
@@ -2,6 +2,12 @@
 # -*- coding: utf-8 -*-
 
 import os, sys
+import gettext
+
+gettext.install("mapslicer", "./resources/")
+csText = gettext.translation("mapslicer", "./resources/", languages=['cs'])
+deText = gettext.translation("mapslicer", "./resources/", languages=['de'])
+#deText.install()
 
 # Where is the executable file on the disk?
 exepath = os.getcwd()
@@ -72,9 +78,8 @@ def ExceptHook(self, type, value, tb):
 
 
 if __name__ == "__main__":
-
-	# TODO: GetText
-	_ = lambda s: s
+
+	_ = gettext.gettext
 
 	# TODO: Parse command line arguments:
 	# for both batch processing and initialization of the GUI

diff --git a/mapslicer/config.py b/mapslicer/config.py
@@ -1,3 +1,5 @@
+import gettext
+
 version = "1.0 rc1"
 
 profile = 'mercator'
@@ -24,8 +26,8 @@
 
 bboxgeoref = False
 
-# TODO: GetText
-_ = lambda s: s
+# GetText
+_ = gettext.gettext
 
 # WellKnownGeogCS
 wellknowngeogcs = ['WGS84','WGS72','NAD27','NAD83']
@@ -116,3 +118,4 @@
     UNIT["degree",0.01745329251994328,
         AUTHORITY["EPSG","9122"]],
     AUTHORITY["EPSG","4326"]]"""
+
diff --git a/mapslicer/gdalpreprocess.py b/mapslicer/gdalpreprocess.py
@@ -6,8 +6,6 @@
 import os
 import preprocess
 
-#TODO: GetText
-from config import _
 
 gdal.AllRegister()
 vrt_drv = gdal.GetDriverByName( 'VRT' )
@@ -33,7 +31,7 @@ def singlefile(filename, bbox = None):
 	in_ds = gdal.Open( filename, gdal.GA_ReadOnly)
 	if not in_ds:
 		# Note: GDAL prints the ERROR message too
-		raise PreprocessError(_("It is not possible to open the input file '%s'.") % filename)
+		raise PreprocessError("It is not possible to open the input file '%s'." % filename)
 
 	xsize = in_ds.RasterXSize
 	ysize = in_ds.RasterYSize
@@ -98,10 +96,11 @@ def SRSInput(srs):
 	osr.UseExceptions()
 	reference.SetFromUserInput(srs)
 	return reference.ExportToPrettyWkt()
-	
+
 if __name__=='__main__':
 	import sys
 	if len(sys.argv) > 1:
 		print singlefile(sys.argv[1])
 	else:
 		print "Specify a single file to preprocess"
+