# HG changeset patch # User Stephan Holl # Date 1311333876 -7200 # Node ID bdf58d5b7d9295200f8d3787c51886675a8bd390 # Parent 5add50465b3a81487539e61492bfaf78e1c11f02 Added an english translation of the website. * website/about.htm4, website/buildhtml.mk, website/contact-de.htm4, website/contact.htm4, website/development-de.htm4, website/development.htm4, website/donate-de.htm4, website/donate.htm4, website/download.htm4, website/img/funktionsweise-MXD2map-de.png, website/index.htm4, website/license-de.htm4, website/license.htm4, website/template_header.m4, website/img/funktionsweise-MXD2map.png, website/img/funktionsweise-MXD2map_small.png, doku/funktionsweise/funktionsweise-MXD-konverter.svg, website/img/funktionsweise-MXD-konverter.png, website/img/funktionsweise-MXD-konverter_small.png: English translation of the website. Added a new Makefile-Target 'images' to get the dokumentation-images into the site. diff -r 5add50465b3a -r bdf58d5b7d92 ChangeLog --- a/ChangeLog Fri Jul 22 12:43:23 2011 +0200 +++ b/ChangeLog Fri Jul 22 13:24:36 2011 +0200 @@ -1,3 +1,22 @@ +2011-07-22 Stephan Holl + +Added an english translation of the website. + + * website/about.htm4, website/buildhtml.mk, + website/contact-de.htm4, website/contact.htm4, + website/development-de.htm4, website/development.htm4, + website/donate-de.htm4, website/donate.htm4, + website/download.htm4, website/img/funktionsweise-MXD2map-de.png, + website/index.htm4, website/license-de.htm4, website/license.htm4, + website/template_header.m4, + website/img/funktionsweise-MXD2map.png, + website/img/funktionsweise-MXD2map_small.png, + doku/funktionsweise/funktionsweise-MXD-konverter.svg, + website/img/funktionsweise-MXD-konverter.png, + website/img/funktionsweise-MXD-konverter_small.png: English + translation of the website. Added a new Makefile-Target 'images' + to get the dokumentation-images into the site. + 2011-07-22 Stephan Holl Reorganized the functionality-image diff -r 5add50465b3a -r bdf58d5b7d92 doku/funktionsweise/funktionsweise-MXD-konverter.svg --- a/doku/funktionsweise/funktionsweise-MXD-konverter.svg Fri Jul 22 12:43:23 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,514 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Mai 2011 - - - - Funktionsweise MXD2map - - - MXD-Datei - - - - MapServer-Datei - - - - - MXD2map - - - - - Java MapScript - - - - - ArcGIS Desktop 10 - - - - - - - Map-Template - - - - - - - - - - - Konfigurierbar - - diff -r 5add50465b3a -r bdf58d5b7d92 website/about.htm4 --- a/website/about.htm4 Fri Jul 22 12:43:23 2011 +0200 +++ b/website/about.htm4 Fri Jul 22 13:24:36 2011 +0200 @@ -31,7 +31,7 @@

MXD2map is activly supported by Bundesamt für Seeschifffahrt und Hydrographie +href="http://www.bsh.de">Bundesamt fuer Seeschifffahrt und Hydrographie in Hamburg.

diff -r 5add50465b3a -r bdf58d5b7d92 website/buildhtml.mk --- a/website/buildhtml.mk Fri Jul 22 12:43:23 2011 +0200 +++ b/website/buildhtml.mk Fri Jul 22 13:24:36 2011 +0200 @@ -26,11 +26,14 @@ .htm4.html: $(PP) -DNO_LINK_FOR=$@ $(PPFLAGS) $< > $@ -all: $(TARGETS) subdirs +all: $(TARGETS) images subdirs $(TARGETS): template.m4 template_header.m4 \ header.m4 style.css +images: + $(MAKE) -C ../doku/funktionsweise/ all + subdirs: $(SUBDIRS) @for dir in $^ ; do \ $(MAKE) -C $$dir SUBDIRS="" ; \ @@ -53,6 +56,7 @@ ( cd $(INSTALL_DIR) ; tar -czv -f $(CURDIR)/www.mxd2map.org.tar.gz . ) clean: + $(MAKE) -C ../doku/funktionsweise/ clean rm -f *.html clean-en: diff -r 5add50465b3a -r bdf58d5b7d92 website/contact-de.htm4 --- a/website/contact-de.htm4 Fri Jul 22 12:43:23 2011 +0200 +++ b/website/contact-de.htm4 Fri Jul 22 13:24:36 2011 +0200 @@ -31,7 +31,7 @@ Sie haben Interesse an MXD2map für Ihr Unternehmen/Behörde? Die Intevation GmbH macht Ihnen gerne ein Angebot. Schreiben Sie an: -intevation@intevation.de +intevation@intevation.de

diff -r 5add50465b3a -r bdf58d5b7d92 website/contact.htm4 --- a/website/contact.htm4 Fri Jul 22 12:43:23 2011 +0200 +++ b/website/contact.htm4 Fri Jul 22 13:24:36 2011 +0200 @@ -4,24 +4,32 @@ m4_define(`EN') m4_define(`DE_FILE', `contact-de.html') -m4_define(`TITLE', `Kontakt') +m4_define(`TITLE', `Contact') m4_define(`MAIN', `contact') PAGE_START

Contact

-

+

Do not hesitate to contact us.

MXD2map Community

-

TODO: Mailinglisten

+

Subscribe and write to the development-mailinglist to get in contact +with the MXD2map developers. +(Archive) +

Professional Support and Press

-

TODO: Intevation, -mxd2map@intevation.de

+

Do you have interest in MXD2map for your company/administration? +Intevation GmbH is +pleased to make you an offer. Please get in contact with us by writing an +email to +intevation@intevation.de

diff -r 5add50465b3a -r bdf58d5b7d92 website/development-de.htm4 --- a/website/development-de.htm4 Fri Jul 22 12:43:23 2011 +0200 +++ b/website/development-de.htm4 Fri Jul 22 13:24:36 2011 +0200 @@ -18,19 +18,19 @@

Entwicklungsplattform

-

Sie interessieren sich für die Entwicklung von MXD2map? +

Sie interessieren sich für die Entwicklung von MXD2map? Quellcode und mehr finden Sie auf der MXD2map-Entwicklungsplattform.

Quellcode

-

Der MXD2map-Quellcode ist Freie Software und ist verfügbar in einem Der MXD2map-Quellcode ist Freie Software und ist verfügbar in einem mercurial(hg)-Repository:
-http://hg.intevation.org/mxd2map

+http://hg.intevation.org/geospatial/mxd2map

Quellcode auschecken:
-hg clone http://hg.intevation.org/mxd2map

+hg clone http://hg.intevation.org/geospatial/mxd2map

Mailinglisten

@@ -43,13 +43,13 @@
MXD2map-commits
-
HG-Commits für Entwickler (englisch)
+
HG-Commits für Entwickler (englisch)
Abonnieren | Archiv

-Hinweis: Wenn Sie an eine Mailingliste schreiben wollen, sollten Sie diese abonniert haben. Dadurch vermeiden Sie, dass Ihre E-Mail u.U. sehr lange auf die Bestätigung eines Moderators wartet. +Hinweis: Wenn Sie an eine Mailingliste schreiben wollen, sollten Sie diese abonniert haben. Dadurch vermeiden Sie, dass Ihre E-Mail u.U. sehr lange auf die Bestätigung eines Moderators wartet.

diff -r 5add50465b3a -r bdf58d5b7d92 website/development.htm4 --- a/website/development.htm4 Fri Jul 22 12:43:23 2011 +0200 +++ b/website/development.htm4 Fri Jul 22 13:24:36 2011 +0200 @@ -24,22 +24,14 @@

Sourcecode

- -

TODO

- +

Der MXD2map-Quellcode is Free Software and available in a mercurial(hg)-Repository: +
+http://hg.intevation.org/geospatial/mxd2map

Mailing lists

-

TODO

-
-
MXD2map-announce
-
Bekanntmachungsliste
- Subscribe -| Archive -
-
MXD2map-devel
Developer list (Englisch)
Archive
- +

+Note: Please note that you need to subscribe to the mailinglists first. +Otherwise your mail may arrive the list with a long delay after +confirmation by the list-administrator. +

diff -r 5add50465b3a -r bdf58d5b7d92 website/donate-de.htm4 --- a/website/donate-de.htm4 Fri Jul 22 12:43:23 2011 +0200 +++ b/website/donate-de.htm4 Fri Jul 22 13:24:36 2011 +0200 @@ -19,8 +19,8 @@

Spenden

-

Ihre Spende unterstützt die Pflege und Weiterentwicklung von MXD2map -sowie hilft uns die Freie Software Initiative MXD2map voranzutreiben. +

Ihre Spende unterstützt die Pflege und Weiterentwicklung von MXD2map. +Sie hilft uns, das Freie Software Projekt MXD2map voranzutreiben. Wir sind dankbar für jede finanzielle Unterstützung. Helfen auch Sie!

@@ -45,7 +45,8 @@ Fortführung des Projekts. Sie erhalten damit MXD2map dauerhaft für Ihre Organisation. Einher geht der -Kollateralnutzen, dass darüber hinaus die Sicherheit beim Datenverkehr im +Kollateralnutzen, dass darüber hinaus die Konvertierung von proprietären +Formaten hin zu freien, textbasierten Formaten im Allgemeinen verbessert wird.

@@ -58,7 +59,7 @@ - + diff -r 5add50465b3a -r bdf58d5b7d92 website/donate.htm4 --- a/website/donate.htm4 Fri Jul 22 12:43:23 2011 +0200 +++ b/website/donate.htm4 Fri Jul 22 13:24:36 2011 +0200 @@ -42,7 +42,8 @@

As a company or authority, contract for more extensive measures that will ensure continuation of the project. This way you will ensure sustainable availability of MXD2map for your organisation. -Such measures do provide the collateral benefit of generally improving +Such measures do provide the collateral benefit of generally improving the +possibility of converting proprietary formats to plain text formats. security for data exchange.

@@ -57,7 +58,7 @@ - + diff -r 5add50465b3a -r bdf58d5b7d92 website/download.htm4 --- a/website/download.htm4 Fri Jul 22 12:43:23 2011 +0200 +++ b/website/download.htm4 Fri Jul 22 13:24:36 2011 +0200 @@ -11,25 +11,19 @@

Download

-

Free software, free download

+

There is no official release yet for download. +The recent sourcecode is available at the public sourcecode-repository. +

-

MXD2map

- -

TODO

- -
+
diff -r 5add50465b3a -r bdf58d5b7d92 website/img/funktionsweise-MXD-konverter.png --- a/website/img/funktionsweise-MXD-konverter.png Fri Jul 22 12:43:23 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../../doku/funktionsweise/funktionsweise-MXD-konverter.png \ No newline at end of file diff -r 5add50465b3a -r bdf58d5b7d92 website/img/funktionsweise-MXD-konverter_small.png Binary file website/img/funktionsweise-MXD-konverter_small.png has changed diff -r 5add50465b3a -r bdf58d5b7d92 website/img/funktionsweise-MXD2map-de.png --- a/website/img/funktionsweise-MXD2map-de.png Fri Jul 22 12:43:23 2011 +0200 +++ b/website/img/funktionsweise-MXD2map-de.png Fri Jul 22 13:24:36 2011 +0200 @@ -1,1 +1,1 @@ -../../doku/funktionsweise/funktionsweise-MXD-konverter.png \ No newline at end of file +../../doku/funktionsweise/funktionsweise-MXD2map-de.png \ No newline at end of file diff -r 5add50465b3a -r bdf58d5b7d92 website/img/funktionsweise-MXD2map.png --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/img/funktionsweise-MXD2map.png Fri Jul 22 13:24:36 2011 +0200 @@ -0,0 +1,1 @@ +../../doku/funktionsweise/funktionsweise-MXD2map.png \ No newline at end of file diff -r 5add50465b3a -r bdf58d5b7d92 website/img/funktionsweise-MXD2map_small.png Binary file website/img/funktionsweise-MXD2map_small.png has changed diff -r 5add50465b3a -r bdf58d5b7d92 website/index.htm4 --- a/website/index.htm4 Fri Jul 22 12:43:23 2011 +0200 +++ b/website/index.htm4 Fri Jul 22 13:24:36 2011 +0200 @@ -4,7 +4,7 @@ m4_define(`EN') m4_define(`DE_FILE', `index-de.html') -m4_define(`TITLE', `MXD2map - Konvertieren von Webseiten') +m4_define(`TITLE', ` - a converter for UMN MapServer Mapfiles') m4_define(`FANCY_HEADER') @@ -12,35 +12,34 @@
-

MXD2map...

-

...massive automated passive Web Observation Center is a Free - tool to check website integrity. - ... TODO. +

MXD2map - a converter for MXD-files!

+

Create your UMN MapServer mapfiles based on your ERSI ArcGIS + MXD-files.
+ Make the first step into a free future!

-

MXD2map kennen lernen

-

Entdecken Sie, was in MXD2map steckt! Lernen Sie, was - MXD2map ist und lassen Sie sich die Funktionen zeigen. +

Get to know MXD2map

+

Find out what MXD2map is and learn about its features.

-

Über MXD2map >>

+

About MXD2map >>

-

Für Entwickler

-

Testen Sie MXD2map und geben Sie Feedback!

-

Entwicklung >>

+

For Developers

+

Test MXD2map, look at the sourcecode and give us feedback!

+

Development >>

-

In Kontakt treten

-

MXD2map ist Freie Software. Helfen Sie mit beim Aufbau der -Gemeinschaft und nehmen Sie Kontakt mit uns auf! +

Join the community

+

MXD2map is Free Software. Help us to build the community and get in +contact with us!

-

Kontakt >>

+

Contact >>

diff -r 5add50465b3a -r bdf58d5b7d92 website/license-de.htm4 --- a/website/license-de.htm4 Fri Jul 22 12:43:23 2011 +0200 +++ b/website/license-de.htm4 Fri Jul 22 13:24:36 2011 +0200 @@ -33,9 +33,9 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License +You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. diff -r 5add50465b3a -r bdf58d5b7d92 website/license.htm4 --- a/website/license.htm4 Fri Jul 22 12:43:23 2011 +0200 +++ b/website/license.htm4 Fri Jul 22 13:24:36 2011 +0200 @@ -11,8 +11,8 @@

License

-

MXD2map is Free Software and is available under the GNU General -Public License (GNU GPL). +

MXD2map is Free Software and is available under the GNU Lesser General +Public License (GNU LGPL). The software is free to use without restrictions, may be modified and that modifications may be distributed.

@@ -22,19 +22,19 @@

Copyright Statements


-Copyright (C) 2011 German Federal Office for Information Security (BSI)
+Copyright (C) 2011 Federal Maritime and Hydrographic Agency (BSH)
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2,
+it under the terms of the GNU Lesser General Public License version 2,
 or, at your option, any later version as published by the Free
 Software Foundation
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License
+You should have received a copy of the GNU Lesser General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  
diff -r 5add50465b3a -r bdf58d5b7d92 website/template_header.m4
--- a/website/template_header.m4	Fri Jul 22 12:43:23 2011 +0200
+++ b/website/template_header.m4	Fri Jul 22 13:24:36 2011 +0200
@@ -27,7 +27,7 @@
  
- + LANG_LINK(`EN',`English', EN_FILE) | LANG_LINK(`DE',`Deutsch', DE_FILE)