[Thuban-commits] r2835 - in branches/WIP-pyshapelib-Unicode/thuban: . Doc/manual Doc/technotes Extensions/umn_mapserver Resources/XML Thuban/Model Thuban/UI po test
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Feb 4 19:07:02 CET 2008
Author: bramz
Date: 2008-02-04 19:06:58 +0100 (Mon, 04 Feb 2008)
New Revision: 2835
Added:
branches/WIP-pyshapelib-Unicode/thuban/Resources/XML/thuban-1.2.1.dtd
branches/WIP-pyshapelib-Unicode/thuban/po/cs.po
Modified:
branches/WIP-pyshapelib-Unicode/thuban/ChangeLog
branches/WIP-pyshapelib-Unicode/thuban/Doc/manual/README
branches/WIP-pyshapelib-Unicode/thuban/Doc/technotes/release_process.txt
branches/WIP-pyshapelib-Unicode/thuban/Extensions/umn_mapserver/mf_handle.py
branches/WIP-pyshapelib-Unicode/thuban/MANIFEST.in
branches/WIP-pyshapelib-Unicode/thuban/NEWS
branches/WIP-pyshapelib-Unicode/thuban/README
branches/WIP-pyshapelib-Unicode/thuban/Releasenotes.txt
branches/WIP-pyshapelib-Unicode/thuban/Thuban/Model/load.py
branches/WIP-pyshapelib-Unicode/thuban/Thuban/Model/save.py
branches/WIP-pyshapelib-Unicode/thuban/Thuban/UI/about.py
branches/WIP-pyshapelib-Unicode/thuban/po/de.po
branches/WIP-pyshapelib-Unicode/thuban/po/es.po
branches/WIP-pyshapelib-Unicode/thuban/po/fr.po
branches/WIP-pyshapelib-Unicode/thuban/po/hu.po
branches/WIP-pyshapelib-Unicode/thuban/po/it.po
branches/WIP-pyshapelib-Unicode/thuban/po/pt_BR.po
branches/WIP-pyshapelib-Unicode/thuban/po/ru.po
branches/WIP-pyshapelib-Unicode/thuban/setup.py
branches/WIP-pyshapelib-Unicode/thuban/test/test_load.py
branches/WIP-pyshapelib-Unicode/thuban/test/test_save.py
Log:
Forward porting trunk (2819:2834] to WIP-pyshapelib-Unicode branch.
Modified: branches/WIP-pyshapelib-Unicode/thuban/ChangeLog
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/ChangeLog 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/ChangeLog 2008-02-04 18:06:58 UTC (rev 2835)
@@ -1,3 +1,108 @@
+2008-02-04 Bram de Greve <bram.degreve at bramz.net>
+
+ * Forward porting trunk (2819:2834] to WIP-pyshapelib-Unicode branch.
+
+2008-02-03 Bernhard Reiter <bernhard at intevation.de>
+
+ * Thuban/version.py, setup.py: Changing version number back to svn
+ now that 1.2.1 is released.
+
+2008-02-03 Bernhard Reiter <bernhard at intevation.de>
+
+ * NEWS: Adding release date.
+
+ * Releasenotes.txt: Adding release date and hint about reported
+ gdal 1.5.0 problem.
+
+2008-02-02 Bernhard Reiter <bernhard at intevation.de>
+
+ * MANIFEST.in: Added "MANIFEST".
+
+ * Doc/technotes/release_process.txt: Added option --force-manifest
+ and explanation to the source archive creation step.
+
+ * po/de.po: Fixed translation for the contact section in the
+ About dialog.
+
+2008-02-02 Didrik Pinte <dpinte at dipole-consulting.com>
+
+ * po/fr.po : updated all the fuzzy translations.
+
+2008-02-01 Didrik Pinte <dpinte at dipole-consulting.com>
+
+ * Extensions/umn_mapserver/mf_handle.py : bugfix due to the wx 2.6
+ update.
+
+ * po/fr.po : translation improved.
+
+2008-01-31 Bernhard Reiter <bernhard at intevation.de>
+
+ File format dtd is now thuban-1.2.1.dtd. Fixed tests for this.
+
+ * Resources/XML: Renaming thuban-1.2.0.dtd to thuban-1.2.1.dtd
+ as Thuban 1.2.0 actually used 1.1-dev.dtd.
+
+ * Resources/XML/thuban-1.2.1.dtd: Enabled keyword expansion again
+ so that the header is clean now, bumped copyright to 2008.
+
+ * Thuban/Model/save.py: Using thuban-1.2.1.dtd now.
+
+ * Thuban/Model/load.py: Added thuban-1.2.1.dtd instead of
+ thuban-1.2.0.dtd as recognised file formats.
+
+ * test/test_save.py, test/test_load.py: Using thuban-1.2.1.dtd now.
+
+
+2008-01-31 Bernhard Reiter <bernhard at intevation.de>
+
+ Adding new Czech translation by new translator Jachym Cepicky.
+
+ * Thuban/UI/about.py: Adding entry for Czech translation. Adding
+ Didrik Pinte to the French translation. Adding Bernhard Reiter to
+ the German translation.
+
+ * po/*.po, po/de.po: Updated with string changes in the about dialog.
+
+ * po/cs.po: New Czech translation contributed by Jachym Cepicky.
+
+ * News: Mentioned new Czech translation.
+
+ * MANIFEST.in: Also distribute the file Releasenotes.txt
+
+ * Releasenotes.txt: Added a hint about that notes
+ might be added after a source release. Thus looking for updates
+ is sensible.
+
+2008-01-30 Bernhard Reiter <bernhard at intevation.de>
+
+ * Releasenotes.txt: Fixed a typo.
+
+2008-01-30 Bernhard Reiter <bernhard at intevation.de>
+
+ * Thuban/Model/save.py: Using the new thuban-1.2.0.dtd.
+
+ * Thuban/Model/load.py: Add the thuban-1.2.0.dtd to the list.
+
+ * Resources/XML/thuban-1.2.0.dtd: New. Without the masktype attribute.
+
+2008-01-30 Bernhard Reiter <bernhard at intevation.de>
+
+ Preparing for release.
+
+ * Thuban/version.py, setup.py: Moved version number to 1.2.1.
+
+ * Thuban/UI/about.py: Bumped copyright to 2008.
+
+ * README: Added hint that there are tests and a manual
+ to the installation section. Also a hint about the manual for the
+ packagers.
+
+ * Doc/manual/README: Mentioned the "Makefile" as prefered method.
+
+ * Releasenotes.txt: Drafted an announcement and notes for 1.2.1.
+
+ * po/*: Run the update (basically a date change)
+
2008-01-29 Bram de Greve <bram.degreve at bramz.net>
* Forward porting trunk (2807:2819] to WIP-pyshapelib-Unicode branch.
Modified: branches/WIP-pyshapelib-Unicode/thuban/Doc/manual/README
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/Doc/manual/README 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/Doc/manual/README 2008-02-04 18:06:58 UTC (rev 2835)
@@ -5,8 +5,10 @@
The manual is written using DocBook XML. To convert to other formats use
-the docbook tools. Examples:
+the docbook tools. The Makefile has targets defined.
+Examples for manual use:
+
Convert to PostScript (the output will be manual.ps)
$ db2ps manual.xml
Modified: branches/WIP-pyshapelib-Unicode/thuban/Doc/technotes/release_process.txt
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/Doc/technotes/release_process.txt 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/Doc/technotes/release_process.txt 2008-02-04 18:06:58 UTC (rev 2835)
@@ -8,8 +8,8 @@
- Test Thuban until you are sure it works under the following
reference platforms:
- Debian GNU/Linux 4.0 (aka Etch) (plus wxWindows/wxPython 2.6)
- (Windows XP)
+ Debian GNU/Linux 4.0 (aka Etch) (using wxWindows/wxPython 2.6)
+ optional: Debian GNU/Linux Sid, Windows XP
All test cases of stable code should pass on all platforms.
@@ -34,8 +34,14 @@
- Produce Source-Archives Thuban-N.N.N.tar.bz2 and Thuban-N.N.N.zip
- python setup.py sdist
+ python setup.py sdist --force-manifest
+ The option "--force-manifest" is necessary because there might
+ be changed filenames matching the patterns in MANIFEST.in
+ and python 2.4.4's distutils will _not_ recreate MANIFEST if it is
+ newer in this case by default. The option makes sure that MANIFEST
+ will be created of if MANIFEST.in each time.
+
- Sign Source-Archives
gpg2 --detach-sign Thuban-N.N.N.tar.bz2
Modified: branches/WIP-pyshapelib-Unicode/thuban/Extensions/umn_mapserver/mf_handle.py
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/Extensions/umn_mapserver/mf_handle.py 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/Extensions/umn_mapserver/mf_handle.py 2008-02-04 18:06:58 UTC (rev 2835)
@@ -115,7 +115,7 @@
box_imagetype = wx.StaticBoxSizer(box_imagetypeStatic, wx.VERTICAL)
self.choice_imgtype = wx.Choice(self, 8060, (80, 50),
choices = umn_outputformats)
- EVT_CHOICE(self, 8060, self.EvtChoiceBox)
+ wx.EVT_CHOICE(self, 8060, self.EvtChoiceBox)
self.choice_imgtype.SetStringSelection(umn_imagetype)
box_imagetype.Add(self.choice_imgtype,0, wx.EXPAND, wx.ALL, 5)
@@ -147,7 +147,7 @@
# color change button, opens a new color dialog
button = wx.Button(self, ID_COLOR_CHANGE, _("Change Color"))
button.SetFocus()
- EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
+ wx.EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
box_color.Add(button, 1, wx.EXPAND|wx.ALL, 5)
# status
@@ -164,8 +164,8 @@
button = wx.Button(self, wx.ID_CANCEL, _("Cancel"))
box_buttons.Add(button, 0, wx.ALL, 5)
#button functions
- EVT_BUTTON(self, wx.ID_OK, self.OnOK)
- EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
+ wx.EVT_BUTTON(self, wx.ID_OK, self.OnOK)
+ wx.EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
#add all boxes to the box top
top = wx.BoxSizer(wx.VERTICAL)
@@ -280,8 +280,8 @@
button = wx.Button(self, wx.ID_CANCEL, _("Cancel"))
box_buttons.Add(button, 0, wx.ALL, 5)
#set the button funcitons
- EVT_BUTTON(self, wx.ID_OK, self.OnOK)
- EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
+ wx.EVT_BUTTON(self, wx.ID_OK, self.OnOK)
+ wx.EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
# compose the final dialog
top = wx.BoxSizer(wx.VERTICAL)
@@ -347,7 +347,7 @@
# metadata button
metadata_button = wx.Button(self, ID_METADATA_CHANGE, _("Edit Metadata"))
- EVT_BUTTON(self, ID_METADATA_CHANGE, self.OnChangeMetadata)
+ wx.EVT_BUTTON(self, ID_METADATA_CHANGE, self.OnChangeMetadata)
# Group
box_group = wx.BoxSizer(wx.HORIZONTAL)
@@ -370,8 +370,8 @@
button = wx.Button(self, wx.ID_CANCEL, _("Cancel"))
box_buttons.Add(button, 0, wx.ALL, 5)
#set the button funcitons
- EVT_BUTTON(self, wx.ID_OK, self.OnOK)
- EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
+ wx.EVT_BUTTON(self, wx.ID_OK, self.OnOK)
+ wx.EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
# compose the final dialog
top = wx.BoxSizer(wx.VERTICAL)
@@ -491,7 +491,7 @@
# color change button, opens a new color dialog
button = wx.Button(self, ID_COLOR_CHANGE, _("Change Color"))
button.SetFocus()
- EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
+ wx.EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
box_color.Add(button, 1, wx.EXPAND|wx.ALL, 5)
# status
@@ -518,7 +518,7 @@
# button for label
labelbutton = wx.Button(self, ID_LABEL_CHANGE, _("Change Label"))
- EVT_BUTTON(self, ID_LABEL_CHANGE, self.OnChangeLabel)
+ wx.EVT_BUTTON(self, ID_LABEL_CHANGE, self.OnChangeLabel)
#buttons
box_buttons = wx.BoxSizer(wx.HORIZONTAL)
@@ -527,8 +527,8 @@
button = wx.Button(self, wx.ID_CANCEL, _("Cancel"))
box_buttons.Add(button, 0, wx.ALL, 5)
#set the button funcitons
- EVT_BUTTON(self, wx.ID_OK, self.OnOK)
- EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
+ wx.EVT_BUTTON(self, wx.ID_OK, self.OnOK)
+ wx.EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
# compose the final layout
top = wx.BoxSizer(wx.VERTICAL)
@@ -639,7 +639,7 @@
# color change button, opens a new color dialog
button = wx.Button(self, ID_COLOR_CHANGE, _("Change Color"))
button.SetFocus()
- EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
+ wx.EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
box_color.Add(button, 1, wx.EXPAND|wx.ALL, 5)
#get the set type
@@ -751,8 +751,8 @@
button = wx.Button(self, wx.ID_CANCEL, _("Cancel"))
box_buttons.Add(button, 0, wx.ALL, 5)
#set the button funcitons
- EVT_BUTTON(self, wx.ID_OK, self.OnOK)
- EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
+ wx.EVT_BUTTON(self, wx.ID_OK, self.OnOK)
+ wx.EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
# compose the Dialog
top = wx.BoxSizer(wx.VERTICAL)
@@ -865,7 +865,7 @@
# color change button, opens a new color dialog
button = wx.Button(self, ID_COLOR_CHANGE, _("Change Color"))
button.SetFocus()
- EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
+ wx.EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
box_color.Add(button, 1, wx.EXPAND|wx.ALL, 5)
# show the two color chooser horizontal
colorHor = wx.BoxSizer(wx.HORIZONTAL)
@@ -885,7 +885,7 @@
# color change button, opens a new color dialog
button = wx.Button(self, ID_IMGCOLOR_CHANGE, _("Change ImageColor"))
button.SetFocus()
- EVT_BUTTON(self, ID_IMGCOLOR_CHANGE, self.OnChangeImageColor)
+ wx.EVT_BUTTON(self, ID_IMGCOLOR_CHANGE, self.OnChangeImageColor)
box_imgcolor.Add(button, 1, wx.EXPAND|wx.ALL, 5)
colorHor.Add(box_imgcolor,0, wx.EXPAND |wx.ALL, 5)
@@ -970,7 +970,7 @@
# button for label
labelbutton = wx.Button(self, ID_LABEL_CHANGE, _("Change Label"))
- EVT_BUTTON(self, ID_LABEL_CHANGE, self.OnChangeLabel)
+ wx.EVT_BUTTON(self, ID_LABEL_CHANGE, self.OnChangeLabel)
#buttons
box_buttons = wx.BoxSizer(wx.HORIZONTAL)
@@ -980,8 +980,8 @@
button.SetFocus()
box_buttons.Add(button, 0, wx.ALL, 5)
#set the button funcitons
- EVT_BUTTON(self, wx.ID_OK, self.OnOK)
- EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
+ wx.EVT_BUTTON(self, wx.ID_OK, self.OnOK)
+ wx.EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
# compose the dialog
top = wx.BoxSizer(wx.VERTICAL)
@@ -1090,8 +1090,8 @@
grid.PyGridTableBase.__init__(self)
self.colLabels = ['ID', 'Description']
- self.dataTypes = [wx.GRID_VALUE_STRING,
- wx.GRID_VALUE_STRING
+ self.dataTypes = [grid.GRID_VALUE_STRING,
+ grid.GRID_VALUE_STRING
]
if data:
@@ -1110,7 +1110,7 @@
try:
return not self.data[row][col]
except IndexError:
- return true
+ return True
# Get/Set values in the table. The Python version of these
# methods can handle any data-type, (as long as the Editor and
@@ -1133,7 +1133,7 @@
# tell the grid we've added a row
msg = grid.GridTableMessage(self, # The table
- wx.GRIDTABLE_NOTIFY_ROWS_APPENDED, # what we did to it
+ grid.GRIDTABLE_NOTIFY_ROWS_APPENDED, # what we did to it
1) # how many
self.GetView().ProcessTableMessage(msg)
@@ -1157,7 +1157,7 @@
def CanGetValueAs(self, row, col, typeName):
colType = self.dataTypes[col].split(':')[0]
if typeName == colType:
- return true
+ return True
else:
return False
@@ -1174,7 +1174,7 @@
# The second parameter means that the grid is to take ownership of the
# table and will destroy it when done. Otherwise you would need to keep
# a reference to it and call it's Destroy method later.
- self.SetTable(self.table, true)
+ self.SetTable(self.table, True)
self.SetRowLabelSize(0)
self.SetColMinimalWidth(0,180)
@@ -1182,7 +1182,7 @@
self.SetColMinimalWidth(1,250)
self.SetColSize(1,250)
self.SetMargins(0,0)
- EVT_GRID_CELL_LEFT_DCLICK(self, self.OnLeftDClick)
+ grid.EVT_GRID_CELL_LEFT_DCLICK(self, self.OnLeftDClick)
def get_table(self):
return self.table
@@ -1222,8 +1222,8 @@
button.SetFocus()
box_buttons.Add(button, 0, wx.ALL, 5)
#set the button funcitons
- EVT_BUTTON(self, wx.ID_OK, self.OnOK)
- EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
+ wx.EVT_BUTTON(self, wx.ID_OK, self.OnOK)
+ wx.EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
# compose the dialog
top = wx.BoxSizer(wx.VERTICAL)
Modified: branches/WIP-pyshapelib-Unicode/thuban/MANIFEST.in
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/MANIFEST.in 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/MANIFEST.in 2008-02-04 18:06:58 UTC (rev 2835)
@@ -1,4 +1,4 @@
-include README MANIFEST.in COPYING NEWS ChangeLog
+include README MANIFEST.in MANIFEST COPYING NEWS ChangeLog Releasenotes.txt
recursive-include libraries README COPYING LICENSE ChangeLog NEWS MANIFEST.in
recursive-include libraries *.h *.c *.i *.py *.txt
recursive-include test README *.py
Modified: branches/WIP-pyshapelib-Unicode/thuban/NEWS
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/NEWS 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/NEWS 2008-02-04 18:06:58 UTC (rev 2835)
@@ -1,5 +1,5 @@
-Changes up to Thuban 1.2.1 (released 2008-)
+Changes up to Thuban 1.2.1 (released 2008-02-03)
===========================
- Rendering: Thuban's accelerated shapefile renderer is now
robust against shapefiles which contain empty shapes.
@@ -37,6 +37,7 @@
+ German (Bernhard Reiter)
+ French (Didrik Pinte, Daniel Calvelo)
+ Spanish (Daniel Calvelo)
+ + (New) Czech (Jachym Cepicky)
- Problem fixes:
Modified: branches/WIP-pyshapelib-Unicode/thuban/README
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/README 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/README 2008-02-04 18:06:58 UTC (rev 2835)
@@ -85,7 +85,13 @@
you have to build the message catalogs manually before you run setup.py.
See po/README for more information.
+There are a number of automated tests that will check a great
+deal of Thuban's funcationality. See test/README for details.
+You should consider running them.
+Thuban has a nice manual, go to the "Doc/manual" and try "make".
+
+
Build Troubleshooting
---------------------
@@ -123,6 +129,8 @@
all interesting extensions. Administrators should edit this files to their
need, e.g. when they want to not show some extensions by default.
+Choose a format of the manual you want to install with the package.
+
License
-------
Modified: branches/WIP-pyshapelib-Unicode/thuban/Releasenotes.txt
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/Releasenotes.txt 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/Releasenotes.txt 2008-02-04 18:06:58 UTC (rev 2835)
@@ -1,5 +1,48 @@
-$Rev$
+$Rev$ [ Notes for a speciffic release might be changed after the source]
+ [ has been published, so check online for updates. ]
+Release Notes for Thuban-1.2.1 (released 2008-02-03)
+````````````````````````````````````````````````````
+
+Announcement Thuban 1.2.1
+
+Bringing out to light what was hidden -
+is a fitting motto of this maintenance release. Thuban had a few interesting
+Extensions, but if users saw them depended on their customisation. Now
+all Extensions can be enabled per installation. Not all of these gems
+have been fully brought back to life. With ogr you can still open up
+all formats this powerful library can read. Wms currently needs a makeover
+which is on the list for the next release. Of course a number of defects
+have been fixed. The Thuban 1.2.x series seems a little less stable than
+usual because of the way we are half way there to fully support unicode
+internally. But thanks to our users, all reports help us to iron out
+the problems! Thanks to all that have send us feedback!
+
+Bernhard Reiter
+Didrik Pinte
+
+
+Notable issues:
+ - gdal version 1.5.0: The following issue was reported with this new version:
+ https://wald.intevation.org/tracker/index.php?func=detail&aid=587
+ gdal 1.5.0-3 (from Debian sid) leads to error messages and test failures
+
+ - Extension OGR:
+ - Two tests fail (probably because of an ogr/shapelib problem.)
+ https://wald.intevation.org/tracker/index.php?func=detail&aid=91
+ The failure looks harmless. As the ogr layer support is beta
+ it did not block the release.
+ - Is slower than native Shapefile support.
+ - Classification might not work.
+ - Extension WMS: probably does not work correctly, thus it is disabled
+ in Thuban/thuban_cfg.py.
+ - Extension profiling: makes use of a non-free "profile" module which
+ therefor will not be available on all python installations. Consequently
+ it is also not enabled by default.
+ - Because we enabled translations for the Extensions only recently,
+ some translations will be outdated more then usual.
+
+
Release Notes for Thuban-1.2.0 (released 2007-03-13)
````````````````````````````````````````````````````
Copied: branches/WIP-pyshapelib-Unicode/thuban/Resources/XML/thuban-1.2.1.dtd (from rev 2834, trunk/thuban/Resources/XML/thuban-1.2.1.dtd)
Modified: branches/WIP-pyshapelib-Unicode/thuban/Thuban/Model/load.py
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/Thuban/Model/load.py 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/Thuban/Model/load.py 2008-02-04 18:06:58 UTC (rev 2835)
@@ -150,7 +150,8 @@
"http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd",
"http://thuban.intevation.org/dtds/thuban-1.0rc1.dtd",
"http://thuban.intevation.org/dtds/thuban-1.0.0.dtd",
- "http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"):
+ "http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd",
+ "http://thuban.intevation.org/dtds/thuban-1.2.1.dtd"):
for key, value in dispatchers.items():
dispatchers[(xmlns, key)] = value
Modified: branches/WIP-pyshapelib-Unicode/thuban/Thuban/Model/save.py
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/Thuban/Model/save.py 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/Thuban/Model/save.py 2008-02-04 18:06:58 UTC (rev 2835)
@@ -139,7 +139,7 @@
def write(self, file_or_filename):
XMLWriter.write(self, file_or_filename)
- self.write_header("session", "thuban-1.1.dtd")
+ self.write_header("session", "thuban-1.2.1.dtd")
self.write_session(self.session)
self.close()
@@ -166,7 +166,7 @@
attrs["xmlns:" + name] = uri
# default name space
attrs["xmlns"] = \
- "http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
+ "http://thuban.intevation.org/dtds/thuban-1.2.1.dtd"
self.open_element("session", attrs)
self.write_db_connections(session)
self.write_data_containers(session)
Modified: branches/WIP-pyshapelib-Unicode/thuban/Thuban/UI/about.py
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/Thuban/UI/about.py 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/Thuban/UI/about.py 2008-02-04 18:06:58 UTC (rev 2835)
@@ -44,14 +44,16 @@
'Didrik Pinte (2006 - )',
'Bernhard Reiter (2004 - )',
'Jan-Oliver Wagner (2002 - 2005)' ]
- translators = [ ( _('French'), 'Daniel Calvelo Aros' ),
+ translators = [ ( _('French'), 'Daniel Calvelo Aros, Didrik Pinte' ),
( _('German'),
- internal_from_unicode(u'Bj\xf6rn Broscheit')),
+ internal_from_unicode(u'Bj\xf6rn Broscheit (2003)') +
+ ', Bernhard Reiter') ,
( _('Hungarian'), 'Norbert Solymosi'),
( _('Italian'), 'Maurizio Napolitano'),
( _('Portuguese (Brazilian)'), 'Eduardo Patto Kanegae'),
( _('Russian'), 'Alex Shevlakov'),
- ( _('Spanish'), 'Daniel Calvelo Aros') ]
+ ( _('Spanish'), 'Daniel Calvelo Aros'),
+ ( _('Czech'), 'Jachym Cepicky') ]
other_contributors = [ 'Jonathan Byron (2004)',
'Ole Rahn (2004)',
'Silke Reimer (2003, 2004)',
@@ -147,7 +149,7 @@
text_title = wx.StaticText(self, -1,
_("Thuban is a program for exploring geographic data.\n\n") +
- "Copyright 2001-2007 Intevation GmbH.\n" +
+ "Copyright 2001-2008 Intevation GmbH.\n" +
_("Thuban is licensed under the GNU GPL v>=2"),
style=wx.ST_NO_AUTORESIZE|wx.ALIGN_CENTRE)
Copied: branches/WIP-pyshapelib-Unicode/thuban/po/cs.po (from rev 2834, trunk/thuban/po/cs.po)
Modified: branches/WIP-pyshapelib-Unicode/thuban/po/de.po
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/po/de.po 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/po/de.po 2008-02-04 18:06:58 UTC (rev 2835)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Thuban 1.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-27 23:25+0000\n"
+"POT-Creation-Date: 2008-01-31 13:54+0000\n"
"PO-Revision-Date: 2008-01-28 00:35+0100\n"
"Last-Translator: Bernhard Reiter <bernhard at intevation.de>\n"
"Language-Team: Thuban Development List <thuban-devel at intevation.de>\n"
@@ -182,11 +182,11 @@
msgid "Invalid color specification %s"
msgstr "Ungültige Farbspezifikation %s"
-#: ../Thuban/Model/load.py:544
+#: ../Thuban/Model/load.py:545
msgid "xml field type differs from database!"
msgstr "XML-Feld-Typ unterscheidet sich von Datenbank!"
-#: ../Thuban/Model/load.py:609
+#: ../Thuban/Model/load.py:610
msgid "Classification range is not a number!"
msgstr "Klassifikationswertebereich ist keine Zahl!"
@@ -268,72 +268,76 @@
msgid "German"
msgstr "Deutsch"
-#: ../Thuban/UI/about.py:50
+#: ../Thuban/UI/about.py:51
msgid "Hungarian"
msgstr "Ungarisch"
-#: ../Thuban/UI/about.py:51
+#: ../Thuban/UI/about.py:52
msgid "Italian"
msgstr "Italienisch"
-#: ../Thuban/UI/about.py:52
+#: ../Thuban/UI/about.py:53
msgid "Portuguese (Brazilian)"
msgstr "Portugiesisch (Brasilianisch)"
-#: ../Thuban/UI/about.py:53
+#: ../Thuban/UI/about.py:54
msgid "Russian"
msgstr "Russisch"
-#: ../Thuban/UI/about.py:54
+#: ../Thuban/UI/about.py:55
msgid "Spanish"
msgstr "Spanish"
-#: ../Thuban/UI/about.py:63 ../Thuban/UI/about.py:65 ../Thuban/UI/about.py:67
+#: ../Thuban/UI/about.py:56
+msgid "Czech"
+msgstr "Tschechisch"
+
+#: ../Thuban/UI/about.py:65 ../Thuban/UI/about.py:67 ../Thuban/UI/about.py:69
msgid "- not available"
msgstr "- nicht verfügbar"
-#: ../Thuban/UI/about.py:72
+#: ../Thuban/UI/about.py:74
msgid "Currently using:\n"
msgstr "Aktuell verwendet:\n"
-#: ../Thuban/UI/about.py:78
+#: ../Thuban/UI/about.py:80
#, python-format
msgid "\tInternal encoding: %s\n"
msgstr "\tInterne Zeichencodierung: %s\n"
-#: ../Thuban/UI/about.py:84
+#: ../Thuban/UI/about.py:86
msgid "Compiled for:\n"
msgstr "Übersetzt für:\n"
-#: ../Thuban/UI/about.py:90
+#: ../Thuban/UI/about.py:92
msgid "Extensions:\n"
msgstr "Extensions:\n"
-#: ../Thuban/UI/about.py:95 ../Thuban/UI/about.py:144
+#: ../Thuban/UI/about.py:97 ../Thuban/UI/about.py:146
msgid "\tNone registered.\n"
msgstr "\tKeine registriert.\n"
-#: ../Thuban/UI/about.py:98
+#: ../Thuban/UI/about.py:100
msgid "Maintainers:\n"
msgstr "Verwalter:\n"
-#: ../Thuban/UI/about.py:103
+#: ../Thuban/UI/about.py:105
msgid "Lead Developer:\n"
msgstr "Hauptentwickler:\n"
-#: ../Thuban/UI/about.py:106
+#: ../Thuban/UI/about.py:108
msgid "Developers:\n"
msgstr "Entwickler:\n"
-#: ../Thuban/UI/about.py:111
+#: ../Thuban/UI/about.py:113
msgid "Translators:\n"
msgstr "Übersetzer:\n"
-#: ../Thuban/UI/about.py:116
+#: ../Thuban/UI/about.py:118
msgid "Other Contributors:\n"
msgstr "Weitere Mitwirkende:\n"
-#: ../Thuban/UI/about.py:122
+#: ../Thuban/UI/about.py:124
msgid ""
"Questions and comments can be sent to the following addresses:\n"
"\tGeneral list (public):\n"
@@ -344,14 +348,14 @@
"\t\t<thuban at intevation.de>\n"
msgstr ""
"Fragen und Kommentare können an die folgenden Adressen geschickt werden:\n"
-"\tThuban Entwickler:\n"
+"\tAllgemeiner Email-Verteiler (öffentlich):\n"
+"\t\t<thuban-list at intevation.de>\n"
+"\tEntwickler Email-Verteiler (öffentlich):\n"
+"\t\t<thuban-devel at intevation.de>\n"
+"\tThuban Gruppe bei Intevation:\n"
"\t\t<thuban at intevation.de>\n"
-"\tThuban Mailingliste:\n"
-"\t\t<thuban-list at intevation.de>\n"
-" Thuban team at Intevation:\n"
-" <thuban at intevation.de>\n"
-#: ../Thuban/UI/about.py:130
+#: ../Thuban/UI/about.py:132
msgid ""
"Details on the registered extensions:\n"
"\n"
@@ -359,16 +363,16 @@
"Details zu den registrierten Extensions:\n"
"\n"
-#: ../Thuban/UI/about.py:135
+#: ../Thuban/UI/about.py:137
#, python-format
msgid "Copyright %s\n"
msgstr "Copyright %s\n"
-#: ../Thuban/UI/about.py:136
+#: ../Thuban/UI/about.py:138
msgid "Authors:\n"
msgstr "Autoren:\n"
-#: ../Thuban/UI/about.py:149
+#: ../Thuban/UI/about.py:151
msgid ""
"Thuban is a program for exploring geographic data.\n"
"\n"
@@ -376,11 +380,11 @@
"Thuban ist ein Programm zur Erkundung von Geografischen Daten\n"
"\n"
-#: ../Thuban/UI/about.py:151
+#: ../Thuban/UI/about.py:153
msgid "Thuban is licensed under the GNU GPL v>=2"
msgstr "Thuban ist lizenziert unter der GNU GPL v>=2"
-#: ../Thuban/UI/about.py:160 ../Thuban/UI/classgen.py:92
+#: ../Thuban/UI/about.py:162 ../Thuban/UI/classgen.py:92
#: ../Thuban/UI/dbdialog.py:277 ../Thuban/UI/dock.py:371
#: ../Thuban/UI/join.py:66 ../Thuban/UI/layerproperties.py:82
#: ../Thuban/UI/projdialog.py:210 ../Thuban/UI/tableview.py:389
@@ -1905,8 +1909,8 @@
#: ../Extensions/bboxdump/bboxdump.py:196
msgid "Dump bounding boxes of selected shapes ..."
-msgstr "Schreibe Ausdehnungsbereiche ('bounding-boxes') "
-"von ausgewählen 'shapes' ..."
+msgstr ""
+"Schreibe Ausdehnungsbereiche ('bounding-boxes') von ausgewählen 'shapes' ..."
#: ../Extensions/bboxdump/bboxdump.py:238
msgid "BBox Dump"
Modified: branches/WIP-pyshapelib-Unicode/thuban/po/es.po
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/po/es.po 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/po/es.po 2008-02-04 18:06:58 UTC (rev 2835)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: Thuban 1.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-27 23:25+0000\n"
+"POT-Creation-Date: 2008-01-31 13:54+0000\n"
"PO-Revision-Date: 2007-11-29 22:57-0500\n"
"Last-Translator: Daniel Calvelo Aros <dcalvelo at gmail.com>\n"
"Language-Team: Thuban <thuban-devel at intevation.de>\n"
@@ -183,11 +183,11 @@
msgid "Invalid color specification %s"
msgstr "Especificación de color %s inválida"
-#: ../Thuban/Model/load.py:544
+#: ../Thuban/Model/load.py:545
msgid "xml field type differs from database!"
msgstr "¡El tipo de campo xml es diferente al de la base de datos!"
-#: ../Thuban/Model/load.py:609
+#: ../Thuban/Model/load.py:610
msgid "Classification range is not a number!"
msgstr "¡El rango de la clasificación no es un número!"
@@ -269,72 +269,76 @@
msgid "German"
msgstr "Alemán"
-#: ../Thuban/UI/about.py:50
+#: ../Thuban/UI/about.py:51
msgid "Hungarian"
msgstr "Húngaro"
-#: ../Thuban/UI/about.py:51
+#: ../Thuban/UI/about.py:52
msgid "Italian"
msgstr "Italiano"
-#: ../Thuban/UI/about.py:52
+#: ../Thuban/UI/about.py:53
msgid "Portuguese (Brazilian)"
msgstr "Portugués (Brasileño)"
-#: ../Thuban/UI/about.py:53
+#: ../Thuban/UI/about.py:54
msgid "Russian"
msgstr "Ruso"
-#: ../Thuban/UI/about.py:54
+#: ../Thuban/UI/about.py:55
msgid "Spanish"
msgstr "Castellano"
-#: ../Thuban/UI/about.py:63 ../Thuban/UI/about.py:65 ../Thuban/UI/about.py:67
+#: ../Thuban/UI/about.py:56
+msgid "Czech"
+msgstr ""
+
+#: ../Thuban/UI/about.py:65 ../Thuban/UI/about.py:67 ../Thuban/UI/about.py:69
msgid "- not available"
msgstr "- no disponible"
-#: ../Thuban/UI/about.py:72
+#: ../Thuban/UI/about.py:74
msgid "Currently using:\n"
msgstr "Usando actualmente:\n"
-#: ../Thuban/UI/about.py:78
+#: ../Thuban/UI/about.py:80
#, python-format
msgid "\tInternal encoding: %s\n"
msgstr "\tCodificación interna: %s\n"
-#: ../Thuban/UI/about.py:84
+#: ../Thuban/UI/about.py:86
msgid "Compiled for:\n"
msgstr "Compilado para:\n"
-#: ../Thuban/UI/about.py:90
+#: ../Thuban/UI/about.py:92
msgid "Extensions:\n"
msgstr "Extensiones:\n"
-#: ../Thuban/UI/about.py:95 ../Thuban/UI/about.py:144
+#: ../Thuban/UI/about.py:97 ../Thuban/UI/about.py:146
msgid "\tNone registered.\n"
msgstr "\tNinguna registrada.\n"
-#: ../Thuban/UI/about.py:98
+#: ../Thuban/UI/about.py:100
msgid "Maintainers:\n"
msgstr "Encargados del mantenimiento:\n"
-#: ../Thuban/UI/about.py:103
+#: ../Thuban/UI/about.py:105
msgid "Lead Developer:\n"
msgstr "Programador Principal:\n"
-#: ../Thuban/UI/about.py:106
+#: ../Thuban/UI/about.py:108
msgid "Developers:\n"
msgstr "Programadores:\n"
-#: ../Thuban/UI/about.py:111
+#: ../Thuban/UI/about.py:113
msgid "Translators:\n"
msgstr "Traductores:\n"
-#: ../Thuban/UI/about.py:116
+#: ../Thuban/UI/about.py:118
msgid "Other Contributors:\n"
msgstr "Otros Colaboradores:\n"
-#: ../Thuban/UI/about.py:122
+#: ../Thuban/UI/about.py:124
msgid ""
"Questions and comments can be sent to the following addresses:\n"
"\tGeneral list (public):\n"
@@ -351,7 +355,7 @@
"\tEquipo Thuban en Intevation:\n"
"\t\t<thuban at intevation.de>\n"
-#: ../Thuban/UI/about.py:130
+#: ../Thuban/UI/about.py:132
msgid ""
"Details on the registered extensions:\n"
"\n"
@@ -359,16 +363,16 @@
"Detalles de las extensiones registradas:\n"
"\n"
-#: ../Thuban/UI/about.py:135
+#: ../Thuban/UI/about.py:137
#, python-format
msgid "Copyright %s\n"
msgstr "Copyright %s\n"
-#: ../Thuban/UI/about.py:136
+#: ../Thuban/UI/about.py:138
msgid "Authors:\n"
msgstr "Autores:\n"
-#: ../Thuban/UI/about.py:149
+#: ../Thuban/UI/about.py:151
msgid ""
"Thuban is a program for exploring geographic data.\n"
"\n"
@@ -376,11 +380,11 @@
"Thuban es un programa para la exploración de datos geográficos.\n"
"\n"
-#: ../Thuban/UI/about.py:151
+#: ../Thuban/UI/about.py:153
msgid "Thuban is licensed under the GNU GPL v>=2"
msgstr "Thuban es distribuido bajo la licencia GPL de GNU, versión >= 2"
-#: ../Thuban/UI/about.py:160 ../Thuban/UI/classgen.py:92
+#: ../Thuban/UI/about.py:162 ../Thuban/UI/classgen.py:92
#: ../Thuban/UI/dbdialog.py:277 ../Thuban/UI/dock.py:371
#: ../Thuban/UI/join.py:66 ../Thuban/UI/layerproperties.py:82
#: ../Thuban/UI/projdialog.py:210 ../Thuban/UI/tableview.py:389
Modified: branches/WIP-pyshapelib-Unicode/thuban/po/fr.po
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/po/fr.po 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/po/fr.po 2008-02-04 18:06:58 UTC (rev 2835)
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: Thuban 1.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-27 23:25+0000\n"
-"PO-Revision-Date: 2008-01-21 11:11+0100\n"
+"POT-Creation-Date: 2008-01-31 13:54+0000\n"
+"PO-Revision-Date: 2008-02-02 12:12+0100\n"
"Last-Translator: Didrik Pinte <dpinte at itae.be>\n"
"Language-Team: Thuban developers <thuban-devel at intevation.de>\n"
"MIME-Version: 1.0\n"
@@ -25,9 +25,7 @@
#: ../Thuban/version.py:197
#, python-format
msgid "Thuban was compiled with wx %(wxproj-wx)s but wxPython is %(wxPython)s"
-msgstr ""
-"Thuban a été compilé avec wx en version %(wxproj-wx)s mais wxPython est en "
-"version %(wxPython)s"
+msgstr "Thuban a été compilé avec wx en version %(wxproj-wx)s mais wxPython est en version %(wxPython)s"
#: ../Thuban/Lib/connector.py:65
#, python-format
@@ -49,7 +47,8 @@
msgid "\tmethod %s of %s"
msgstr "\tméthode %s de %s"
-#: ../Thuban/Lib/fileutil.py:87 ../Thuban/Lib/fileutil.py:141
+#: ../Thuban/Lib/fileutil.py:87
+#: ../Thuban/Lib/fileutil.py:141
msgid "first argument must be an absolute filename"
msgstr "le premier argument doit être un chemin d'accès absolu à un fichier"
@@ -69,7 +68,8 @@
msgid "invalid index"
msgstr "indice non valable"
-#: ../Thuban/Model/classification.py:309 ../Thuban/UI/classifier.py:759
+#: ../Thuban/Model/classification.py:309
+#: ../Thuban/UI/classifier.py:759
msgid "None"
msgstr "Néant"
@@ -91,7 +91,8 @@
msgid "Fill"
msgstr "Remplir"
-#: ../Thuban/Model/classification.py:342 ../Thuban/UI/classifier.py:842
+#: ../Thuban/Model/classification.py:342
+#: ../Thuban/UI/classifier.py:842
msgid "Classification"
msgstr "Classification"
@@ -103,7 +104,8 @@
msgid "size < 1"
msgstr "taille < 1"
-#: ../Thuban/Model/classification.py:656 ../Thuban/UI/classifier.py:529
+#: ../Thuban/Model/classification.py:656
+#: ../Thuban/UI/classifier.py:529
msgid "DEFAULT"
msgstr "DÉFAUT"
@@ -111,7 +113,8 @@
msgid "Table not compatible with shapestore."
msgstr "La Table n'est pas compatible avec le dépôt de données"
-#: ../Thuban/Model/extension.py:90 ../Extensions/importAPR/importAPR.py:37
+#: ../Thuban/Model/extension.py:90
+#: ../Extensions/importAPR/importAPR.py:37
#: ../Extensions/wms/wms.py:42
#, python-format
msgid "Extension: %s"
@@ -127,17 +130,20 @@
msgid "Label Layer: %s"
msgstr "Couche étiquette: %s"
-#: ../Thuban/Model/layer.py:298 ../Thuban/Model/layer.py:566
+#: ../Thuban/Model/layer.py:298
+#: ../Thuban/Model/layer.py:566
#: ../Thuban/Model/session.py:432
#, python-format
msgid "Filename: %s"
msgstr "Nom de Fichier: %s"
-#: ../Thuban/Model/layer.py:301 ../Thuban/Model/layer.py:569
+#: ../Thuban/Model/layer.py:301
+#: ../Thuban/Model/layer.py:569
msgid "Shown"
msgstr "Affiché"
-#: ../Thuban/Model/layer.py:303 ../Thuban/Model/layer.py:571
+#: ../Thuban/Model/layer.py:303
+#: ../Thuban/Model/layer.py:571
msgid "Hidden"
msgstr "Occulte"
@@ -146,13 +152,16 @@
msgid "Shapes: %d"
msgstr "Éléments: %d"
-#: ../Thuban/Model/layer.py:308 ../Thuban/Model/layer.py:575
-#: ../Thuban/Model/map.py:287 ../Thuban/UI/rasterlayerproperties.py:52
+#: ../Thuban/Model/layer.py:308
+#: ../Thuban/Model/layer.py:575
+#: ../Thuban/Model/map.py:287
+#: ../Thuban/UI/rasterlayerproperties.py:52
#, python-format
msgid "Extent (lat-lon): (%g, %g, %g, %g)"
msgstr "Extension (lat-lon): (%g, %g, %g, %g)"
-#: ../Thuban/Model/layer.py:310 ../Thuban/Model/layer.py:577
+#: ../Thuban/Model/layer.py:310
+#: ../Thuban/Model/layer.py:577
msgid "Extent (lat-lon):"
msgstr "Extension (lat-lon):"
@@ -161,12 +170,14 @@
msgid "Shapetype: %s"
msgstr "Type: %s"
-#: ../Thuban/Model/layer.py:314 ../Thuban/Model/layer.py:580
+#: ../Thuban/Model/layer.py:314
+#: ../Thuban/Model/layer.py:580
#: ../Thuban/Model/map.py:292
msgid "Projection"
msgstr "Projection"
-#: ../Thuban/Model/layer.py:319 ../Thuban/Model/layer.py:583
+#: ../Thuban/Model/layer.py:319
+#: ../Thuban/Model/layer.py:583
#, python-format
msgid "Layer '%s'"
msgstr "Couche '%s'"
@@ -181,11 +192,11 @@
msgid "Invalid color specification %s"
msgstr "Spécification de couleur incorrecte %s"
-#: ../Thuban/Model/load.py:544
+#: ../Thuban/Model/load.py:545
msgid "xml field type differs from database!"
msgstr "Le type de champ xml est différent de celui de la base de données!"
-#: ../Thuban/Model/load.py:609
+#: ../Thuban/Model/load.py:610
msgid "Classification range is not a number!"
msgstr "Le rang de classification n'est pas un nombre!"
@@ -203,20 +214,18 @@
msgid "Map: %s"
msgstr "Carte: %s"
-#: ../Thuban/Model/proj.py:82 ../Thuban/Model/resource.py:179
+#: ../Thuban/Model/proj.py:82
+#: ../Thuban/Model/resource.py:179
msgid "Unknown"
msgstr "Inconnu"
#: ../Thuban/Model/resource.py:46
#, python-format
-msgid ""
-"No GDAL support because module '%s' cannot be imported. Python exception: '%"
-"s'"
-msgstr ""
-"GDAL n'est pas disponible parce que le module '%s' n'a pas pu être importé. "
-"L'exception déclenchée par Python est: '%s'"
+msgid "No GDAL support because module '%s' cannot be imported. Python exception: '%s'"
+msgstr "GDAL n'est pas disponible parce que le module '%s' n'a pas pu être importé. L'exception déclenchée par Python est: '%s'"
-#: ../Thuban/Model/resource.py:135 ../Thuban/Model/resource.py:155
+#: ../Thuban/Model/resource.py:135
+#: ../Thuban/Model/resource.py:155
#, python-format
msgid "Could not read \"%s\": %s"
msgstr "Impossible de lire \"%s\": %s"
@@ -267,72 +276,79 @@
msgid "German"
msgstr "Allemand"
-#: ../Thuban/UI/about.py:50
+#: ../Thuban/UI/about.py:51
msgid "Hungarian"
msgstr "Hongrois"
-#: ../Thuban/UI/about.py:51
+#: ../Thuban/UI/about.py:52
msgid "Italian"
msgstr "Italien"
-#: ../Thuban/UI/about.py:52
+#: ../Thuban/UI/about.py:53
msgid "Portuguese (Brazilian)"
msgstr "Portugais (Brésilien)"
-#: ../Thuban/UI/about.py:53
+#: ../Thuban/UI/about.py:54
msgid "Russian"
msgstr "Russe"
-#: ../Thuban/UI/about.py:54
+#: ../Thuban/UI/about.py:55
msgid "Spanish"
msgstr "Espagnol"
-#: ../Thuban/UI/about.py:63 ../Thuban/UI/about.py:65 ../Thuban/UI/about.py:67
+#: ../Thuban/UI/about.py:56
+msgid "Czech"
+msgstr "Tchèque"
+
+#: ../Thuban/UI/about.py:65
+#: ../Thuban/UI/about.py:67
+#: ../Thuban/UI/about.py:69
msgid "- not available"
msgstr "- non disponible"
-#: ../Thuban/UI/about.py:72
+#: ../Thuban/UI/about.py:74
msgid "Currently using:\n"
msgstr "Utilise actuellement:\n"
-#: ../Thuban/UI/about.py:78
+#: ../Thuban/UI/about.py:80
#, python-format
msgid "\tInternal encoding: %s\n"
msgstr "\tCodage interne: %s\n"
-#: ../Thuban/UI/about.py:84
+#: ../Thuban/UI/about.py:86
msgid "Compiled for:\n"
msgstr "Compilé pour:\n"
-#: ../Thuban/UI/about.py:90
+#: ../Thuban/UI/about.py:92
msgid "Extensions:\n"
msgstr "Extensions:\n"
-#: ../Thuban/UI/about.py:95 ../Thuban/UI/about.py:144
+#: ../Thuban/UI/about.py:97
+#: ../Thuban/UI/about.py:146
msgid "\tNone registered.\n"
msgstr "\tAucune enregistrée.\n"
-#: ../Thuban/UI/about.py:98
+#: ../Thuban/UI/about.py:100
msgid "Maintainers:\n"
msgstr "Responsables de maintenance:\n"
-#: ../Thuban/UI/about.py:103
+#: ../Thuban/UI/about.py:105
msgid "Lead Developer:\n"
msgstr "Développeur Principal:\n"
-#: ../Thuban/UI/about.py:106
+#: ../Thuban/UI/about.py:108
msgid "Developers:\n"
msgstr "Développeurs:\n"
-#: ../Thuban/UI/about.py:111
+#: ../Thuban/UI/about.py:113
msgid "Translators:\n"
msgstr "Traducteurs:\n"
-#: ../Thuban/UI/about.py:116
+#: ../Thuban/UI/about.py:118
msgid "Other Contributors:\n"
msgstr "Autres Collaborateurs:\n"
-#: ../Thuban/UI/about.py:122
+#: ../Thuban/UI/about.py:124
msgid ""
"Questions and comments can be sent to the following addresses:\n"
"\tGeneral list (public):\n"
@@ -349,7 +365,7 @@
"\t\t<thuban-devel at intevation.de>\t\tÉquipe Thuban à Intevation:\n"
"\t\t<thuban at intevation.de>\n"
-#: ../Thuban/UI/about.py:130
+#: ../Thuban/UI/about.py:132
msgid ""
"Details on the registered extensions:\n"
"\n"
@@ -357,16 +373,16 @@
"Détails des extensions enregistrées:\n"
"\n"
-#: ../Thuban/UI/about.py:135
+#: ../Thuban/UI/about.py:137
#, python-format
msgid "Copyright %s\n"
msgstr "Copyright %s\n"
-#: ../Thuban/UI/about.py:136
+#: ../Thuban/UI/about.py:138
msgid "Authors:\n"
msgstr "Auteurs:\n"
-#: ../Thuban/UI/about.py:149
+#: ../Thuban/UI/about.py:151
msgid ""
"Thuban is a program for exploring geographic data.\n"
"\n"
@@ -374,15 +390,20 @@
"Thuban est un logiciel pour l'exploration de données géographiques\n"
"\n"
-#: ../Thuban/UI/about.py:151
+#: ../Thuban/UI/about.py:153
msgid "Thuban is licensed under the GNU GPL v>=2"
msgstr "Thuban est distribué sous la licence GPL de GNU en version >= 2"
-#: ../Thuban/UI/about.py:160 ../Thuban/UI/classgen.py:92
-#: ../Thuban/UI/dbdialog.py:277 ../Thuban/UI/dock.py:371
-#: ../Thuban/UI/join.py:66 ../Thuban/UI/layerproperties.py:82
-#: ../Thuban/UI/projdialog.py:210 ../Thuban/UI/tableview.py:389
-#: ../Extensions/wms/infodialog.py:77 ../Extensions/wms/wms.py:87
+#: ../Thuban/UI/about.py:162
+#: ../Thuban/UI/classgen.py:92
+#: ../Thuban/UI/dbdialog.py:277
+#: ../Thuban/UI/dock.py:371
+#: ../Thuban/UI/join.py:66
+#: ../Thuban/UI/layerproperties.py:82
+#: ../Thuban/UI/projdialog.py:210
+#: ../Thuban/UI/tableview.py:389
+#: ../Extensions/wms/infodialog.py:77
+#: ../Extensions/wms/wms.py:87
msgid "Close"
msgstr "Fermer"
@@ -391,13 +412,16 @@
msgid "Select an alternative data file for %s"
msgstr "Choisissez un fichier de données alternatif pour %s"
-#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:566
+#: ../Thuban/UI/altpathdialog.py:32
+#: ../Thuban/UI/mainwindow.py:566
#: ../Extensions/ogr/ogrstart.py:38
msgid "Shapefiles (*.shp)"
msgstr "Shapefiles (*.shp)"
-#: ../Thuban/UI/altpathdialog.py:33 ../Thuban/UI/mainwindow.py:567
-#: ../Thuban/UI/mainwindow.py:856 ../Extensions/ogr/ogrstart.py:43
+#: ../Thuban/UI/altpathdialog.py:33
+#: ../Thuban/UI/mainwindow.py:567
+#: ../Thuban/UI/mainwindow.py:856
+#: ../Extensions/ogr/ogrstart.py:43
msgid "All Files (*.*)"
msgstr "Tous (*.*)"
@@ -419,15 +443,15 @@
msgstr "Route alternative"
#: ../Thuban/UI/application.py:105
-#, fuzzy
msgid "Cannot import the thuban_cfg module."
-msgstr "N'a pu importer le module initial thubanstart\n"
+msgstr "N'a pu importer le module thuban_cfg"
#: ../Thuban/UI/application.py:107
msgid "Trying to read ~/.thuban/thubanstart.py."
msgstr "Essai de lecture de ~/.thuban/thubanstart.py."
-#: ../Thuban/UI/application.py:119 ../Thuban/UI/application.py:131
+#: ../Thuban/UI/application.py:119
+#: ../Thuban/UI/application.py:131
msgid "Cannot import the thubanstart module\n"
msgstr "N'a pu importer le module initial thubanstart\n"
@@ -440,12 +464,8 @@
msgstr "Le répertoire ~/.thuban n'existe pas\n"
#: ../Thuban/UI/application.py:175
-msgid ""
-"This is the wxPython-based Graphical User Interface for exploring geographic "
-"data"
-msgstr ""
-"Voici l'interface graphique pour l'exploration de données géographiques "
-"basée sur wxPython"
+msgid "This is the wxPython-based Graphical User Interface for exploring geographic data"
+msgstr "Voici l'interface graphique pour l'exploration de données géographiques basée sur wxPython"
#: ../Thuban/UI/application.py:263
msgid ""
@@ -459,7 +479,8 @@
msgid "Library not available"
msgstr "Bibliothèque non disponible"
-#: ../Thuban/UI/application.py:277 ../Thuban/UI/mainwindow.py:479
+#: ../Thuban/UI/application.py:277
+#: ../Thuban/UI/mainwindow.py:479
msgid "DB Connection Parameters"
msgstr "Paramètres de Connexion à la Base de Données"
@@ -474,8 +495,7 @@
msgstr ""
"Une exception non gérée a été déclenchée:\n"
"%s\n"
-"(veuillez faire un rapport à l'adresse http://thuban.intevation.org/"
-"bugtracker.html)\n"
+"(veuillez faire un rapport à l'adresse http://thuban.intevation.org/bugtracker.html)\n"
"\n"
"%s"
@@ -532,7 +552,8 @@
msgid "Field: %s"
msgstr "Champ: %s"
-#: ../Thuban/UI/classgen.py:124 ../Thuban/UI/classifier.py:977
+#: ../Thuban/UI/classgen.py:124
+#: ../Thuban/UI/classifier.py:977
#, python-format
msgid "Data Type: %s"
msgstr "Type de Donnée: %s"
@@ -549,7 +570,8 @@
msgid "Fix Border Color"
msgstr "Couleur de Trait fixe"
-#: ../Thuban/UI/classgen.py:169 ../Thuban/UI/classgen.py:936
+#: ../Thuban/UI/classgen.py:169
+#: ../Thuban/UI/classgen.py:936
#: ../Thuban/UI/classgen.py:967
msgid "Change"
msgstr "Changer"
@@ -578,7 +600,8 @@
msgid "Max:"
msgstr "Max:"
-#: ../Thuban/UI/classgen.py:379 ../Thuban/UI/classgen.py:632
+#: ../Thuban/UI/classgen.py:379
+#: ../Thuban/UI/classgen.py:632
msgid "Retrieve From Table"
msgstr "Extraire de la Table"
@@ -594,11 +617,13 @@
msgid "Available"
msgstr "Disponible"
-#: ../Thuban/UI/classgen.py:651 ../Thuban/UI/classgen.py:691
+#: ../Thuban/UI/classgen.py:651
+#: ../Thuban/UI/classgen.py:691
msgid "Sort"
msgstr "Trier"
-#: ../Thuban/UI/classgen.py:654 ../Thuban/UI/classgen.py:694
+#: ../Thuban/UI/classgen.py:654
+#: ../Thuban/UI/classgen.py:694
msgid "Reverse"
msgstr "Inverser"
@@ -630,12 +655,14 @@
msgid "The Default group cannot be removed."
msgstr "Le groupe par défaut ne peut être éliminé."
-#: ../Thuban/UI/classifier.py:273 ../Thuban/UI/classifier.py:310
+#: ../Thuban/UI/classifier.py:273
+#: ../Thuban/UI/classifier.py:310
#: ../Thuban/UI/classifier.py:468
msgid "Pattern"
msgstr "Patron"
-#: ../Thuban/UI/classifier.py:273 ../Thuban/UI/classifier.py:307
+#: ../Thuban/UI/classifier.py:273
+#: ../Thuban/UI/classifier.py:307
#: ../Thuban/UI/classifier.py:467
msgid "Singleton"
msgstr "Valeur unique"
@@ -648,7 +675,8 @@
msgid "Symbol"
msgstr "Symbole"
-#: ../Thuban/UI/classifier.py:318 ../Thuban/UI/controls.py:33
+#: ../Thuban/UI/classifier.py:318
+#: ../Thuban/UI/controls.py:33
#: ../Thuban/UI/controls.py:177
msgid "Value"
msgstr "Valeur"
@@ -657,7 +685,8 @@
msgid "Label"
msgstr "Étiquette"
-#: ../Thuban/UI/classifier.py:463 ../Thuban/UI/classifier.py:466
+#: ../Thuban/UI/classifier.py:463
+#: ../Thuban/UI/classifier.py:466
msgid "Default"
msgstr "Défaut"
@@ -686,7 +715,8 @@
msgid "Generate Class"
msgstr "Génerer la Classe"
-#: ../Thuban/UI/classifier.py:823 ../Thuban/UI/dbdialog.py:275
+#: ../Thuban/UI/classifier.py:823
+#: ../Thuban/UI/dbdialog.py:275
msgid "Add"
msgstr "Ajouter"
@@ -702,7 +732,8 @@
msgid "Edit Symbol"
msgstr "Éditer le Symbole"
-#: ../Thuban/UI/classifier.py:831 ../Thuban/UI/dbdialog.py:276
+#: ../Thuban/UI/classifier.py:831
+#: ../Thuban/UI/dbdialog.py:276
#: ../Thuban/UI/projdialog.py:118
msgid "Remove"
msgstr "Éliminer"
@@ -711,7 +742,8 @@
msgid "Field: "
msgstr "Champ: "
-#: ../Thuban/UI/classifier.py:1001 ../Thuban/UI/layerproperties.py:160
+#: ../Thuban/UI/classifier.py:1001
+#: ../Thuban/UI/layerproperties.py:160
msgid "Layer Properties"
msgstr "Propriétés de la Couche"
@@ -727,7 +759,8 @@
msgid "Change Line Color"
msgstr "Changer la Couleur du Trait"
-#: ../Thuban/UI/classifier.py:1202 ../Thuban/UI/classifier.py:1217
+#: ../Thuban/UI/classifier.py:1202
+#: ../Thuban/UI/classifier.py:1217
msgid "Transparent"
msgstr "Transparent"
@@ -743,12 +776,18 @@
msgid "Size: "
msgstr "Taille:"
-#: ../Thuban/UI/classifier.py:1263 ../Thuban/UI/colordialog.py:52
-#: ../Thuban/UI/dbdialog.py:108 ../Thuban/UI/dbdialog.py:222
-#: ../Thuban/UI/labeldialog.py:41 ../Thuban/UI/layerproperties.py:81
-#: ../Thuban/UI/projdialog.py:206 ../Extensions/bboxdump/bboxdump.py:71
-#: ../Extensions/ogr/ogrdialog.py:68 ../Extensions/ogr/ogrdialog.py:150
-#: ../Extensions/ogr/ogrdialog.py:262 ../Extensions/ogr/ogrdialog.py:368
+#: ../Thuban/UI/classifier.py:1263
+#: ../Thuban/UI/colordialog.py:52
+#: ../Thuban/UI/dbdialog.py:108
+#: ../Thuban/UI/dbdialog.py:222
+#: ../Thuban/UI/labeldialog.py:41
+#: ../Thuban/UI/layerproperties.py:81
+#: ../Thuban/UI/projdialog.py:206
+#: ../Extensions/bboxdump/bboxdump.py:71
+#: ../Extensions/ogr/ogrdialog.py:68
+#: ../Extensions/ogr/ogrdialog.py:150
+#: ../Extensions/ogr/ogrdialog.py:262
+#: ../Extensions/ogr/ogrdialog.py:368
#: ../Extensions/umn_mapserver/mf_handle.py:162
#: ../Extensions/umn_mapserver/mf_handle.py:278
#: ../Extensions/umn_mapserver/mf_handle.py:368
@@ -756,15 +795,21 @@
#: ../Extensions/umn_mapserver/mf_handle.py:749
#: ../Extensions/umn_mapserver/mf_handle.py:977
#: ../Extensions/umn_mapserver/mf_handle.py:1219
-#: ../Extensions/wms/properties.py:152 ../Extensions/wms/wms.py:85
+#: ../Extensions/wms/properties.py:152
+#: ../Extensions/wms/wms.py:85
msgid "OK"
msgstr "OK"
-#: ../Thuban/UI/classifier.py:1265 ../Thuban/UI/colordialog.py:53
-#: ../Thuban/UI/dbdialog.py:111 ../Thuban/UI/dbdialog.py:224
-#: ../Thuban/UI/labeldialog.py:42 ../Thuban/UI/projdialog.py:1036
-#: ../Extensions/bboxdump/bboxdump.py:76 ../Extensions/ogr/ogrdialog.py:71
-#: ../Extensions/ogr/ogrdialog.py:153 ../Extensions/ogr/ogrdialog.py:265
+#: ../Thuban/UI/classifier.py:1265
+#: ../Thuban/UI/colordialog.py:53
+#: ../Thuban/UI/dbdialog.py:111
+#: ../Thuban/UI/dbdialog.py:224
+#: ../Thuban/UI/labeldialog.py:42
+#: ../Thuban/UI/projdialog.py:1036
+#: ../Extensions/bboxdump/bboxdump.py:76
+#: ../Extensions/ogr/ogrdialog.py:71
+#: ../Extensions/ogr/ogrdialog.py:153
+#: ../Extensions/ogr/ogrdialog.py:265
#: ../Extensions/ogr/ogrdialog.py:371
#: ../Extensions/umn_mapserver/mf_handle.py:164
#: ../Extensions/umn_mapserver/mf_handle.py:280
@@ -785,23 +830,28 @@
msgid "Field"
msgstr "Champ"
-#: ../Thuban/UI/dbdialog.py:42 ../Extensions/ogr/ogrdialog.py:202
+#: ../Thuban/UI/dbdialog.py:42
+#: ../Extensions/ogr/ogrdialog.py:202
msgid "Choose layer from database"
msgstr "Choisir une couche dans la base de données"
-#: ../Thuban/UI/dbdialog.py:60 ../Extensions/ogr/ogrdialog.py:220
+#: ../Thuban/UI/dbdialog.py:60
+#: ../Extensions/ogr/ogrdialog.py:220
msgid "Databases"
msgstr "Bases de Données"
-#: ../Thuban/UI/dbdialog.py:75 ../Extensions/ogr/ogrdialog.py:235
+#: ../Thuban/UI/dbdialog.py:75
+#: ../Extensions/ogr/ogrdialog.py:235
msgid "Retrieve"
msgstr "Retrouver"
-#: ../Thuban/UI/dbdialog.py:83 ../Extensions/ogr/ogrdialog.py:243
+#: ../Thuban/UI/dbdialog.py:83
+#: ../Extensions/ogr/ogrdialog.py:243
msgid "Tables"
msgstr "Tables"
-#: ../Thuban/UI/dbdialog.py:93 ../Extensions/ogr/ogrdialog.py:253
+#: ../Thuban/UI/dbdialog.py:93
+#: ../Extensions/ogr/ogrdialog.py:253
msgid "ID Column"
msgstr "Colonne ID"
@@ -833,7 +883,8 @@
msgid "Database Management"
msgstr "Gestion de Bases de Données"
-#: ../Thuban/UI/dbdialog.py:362 ../Thuban/UI/dbdialog.py:367
+#: ../Thuban/UI/dbdialog.py:362
+#: ../Thuban/UI/dbdialog.py:367
msgid "Add Database"
msgstr "Ajouter une Base de Données"
@@ -863,7 +914,8 @@
msgid "Dock"
msgstr "Attacher"
-#: ../Thuban/UI/exceptiondialog.py:23 ../Thuban/UI/exceptiondialog.py:61
+#: ../Thuban/UI/exceptiondialog.py:23
+#: ../Thuban/UI/exceptiondialog.py:61
msgid "Thuban: Internal Error"
msgstr "Thuban: Errur Interne"
@@ -899,16 +951,20 @@
msgid "Join"
msgstr "Joindre"
-#: ../Thuban/UI/join.py:71 ../Thuban/UI/join.py:72
-#: ../Extensions/bboxdump/bboxdump.py:60 ../Extensions/bboxdump/bboxdump.py:65
+#: ../Thuban/UI/join.py:71
+#: ../Thuban/UI/join.py:72
+#: ../Extensions/bboxdump/bboxdump.py:60
+#: ../Extensions/bboxdump/bboxdump.py:65
msgid "Select..."
msgstr "Choisissez..."
-#: ../Thuban/UI/join.py:100 ../Thuban/UI/join.py:108
+#: ../Thuban/UI/join.py:100
+#: ../Thuban/UI/join.py:108
msgid "Table:"
msgstr "Table: "
-#: ../Thuban/UI/join.py:111 ../Thuban/UI/join.py:114
+#: ../Thuban/UI/join.py:111
+#: ../Thuban/UI/join.py:114
msgid "Field:"
msgstr "Champ: "
@@ -931,18 +987,15 @@
#: ../Thuban/UI/join.py:195
#, python-format
-msgid ""
-"The joined table has %(joined)d rows but it must have %(needed)d rows to be "
-"used with the selected layer"
-msgstr ""
-"La table à joindre possède %(joined)d lignes mais elle doit avoir %(needed)d "
-"lignes pour pouvoir être utilisée avec la couche sélectionnée"
+msgid "The joined table has %(joined)d rows but it must have %(needed)d rows to be used with the selected layer"
+msgstr "La table à joindre possède %(joined)d lignes mais elle doit avoir %(needed)d lignes pour pouvoir être utilisée avec la couche sélectionnée"
#: ../Thuban/UI/join.py:200
msgid "Join Failed"
msgstr "Erreur de jointure"
-#: ../Thuban/UI/join.py:209 ../Thuban/UI/mainwindow.py:919
+#: ../Thuban/UI/join.py:209
+#: ../Thuban/UI/mainwindow.py:919
#, python-format
msgid "Table: %s"
msgstr "Table: %s"
@@ -969,13 +1022,15 @@
msgid "Projection: %s"
msgstr "Projection: %s"
-#: ../Thuban/UI/layerproperties.py:79 ../Thuban/UI/projdialog.py:200
+#: ../Thuban/UI/layerproperties.py:79
+#: ../Thuban/UI/projdialog.py:200
msgid "Try"
msgstr "Essayer"
-#: ../Thuban/UI/layerproperties.py:80 ../Thuban/UI/projdialog.py:203
+#: ../Thuban/UI/layerproperties.py:80
+#: ../Thuban/UI/projdialog.py:203
msgid "Revert"
-msgstr "Revertir"
+msgstr "Restaurer"
#: ../Thuban/UI/legend.py:75
msgid "Top Layer"
@@ -1005,7 +1060,8 @@
msgid "Edit Layer Properties"
msgstr "Editer les Propriétés de la Couche"
-#: ../Thuban/UI/mainwindow.py:267 ../Thuban/UI/mainwindow.py:289
+#: ../Thuban/UI/mainwindow.py:267
+#: ../Thuban/UI/mainwindow.py:289
#, python-format
msgid "Unknown command %s"
msgstr "Commande inconnue: %s"
@@ -1023,9 +1079,7 @@
#: ../Thuban/UI/mainwindow.py:399
#, python-format
msgid "Select layer '%s' and pick a projection using Layer/Projection..."
-msgstr ""
-"Sélectionnez la couche '%s' puis choisissez une projection avec Couche/"
-"Projection..."
+msgstr "Sélectionnez la couche '%s' puis choisissez une projection avec Couche/Projection..."
#: ../Thuban/UI/mainwindow.py:452
msgid "Exit"
@@ -1037,7 +1091,7 @@
#: ../Thuban/UI/mainwindow.py:468
msgid "Open Session"
-msgstr "Ouvrir Session"
+msgstr "Ouvrir une Session"
#: ../Thuban/UI/mainwindow.py:490
msgid "Save Session As"
@@ -1047,14 +1101,18 @@
msgid "Select one or more data files"
msgstr "Choisir un ou plusieurs fichiers de données"
-#: ../Thuban/UI/mainwindow.py:579 ../Extensions/importAPR/importAPR.py:230
+#: ../Thuban/UI/mainwindow.py:579
+#: ../Extensions/importAPR/importAPR.py:230
#: ../Extensions/ogr/ogrstart.py:63
msgid "Add Layer"
msgstr "Ajouter une Couche"
-#: ../Thuban/UI/mainwindow.py:580 ../Thuban/UI/mainwindow.py:606
-#: ../Thuban/UI/mainwindow.py:866 ../Extensions/gns2shp/gns2shp.py:156
-#: ../Extensions/importAPR/importAPR.py:231 ../Extensions/ogr/ogrstart.py:64
+#: ../Thuban/UI/mainwindow.py:580
+#: ../Thuban/UI/mainwindow.py:606
+#: ../Thuban/UI/mainwindow.py:866
+#: ../Extensions/gns2shp/gns2shp.py:156
+#: ../Extensions/importAPR/importAPR.py:231
+#: ../Extensions/ogr/ogrstart.py:64
#: ../Extensions/umn_mapserver/mf_import.py:274
#: ../Extensions/umn_mapserver/mf_import.py:353
#, python-format
@@ -1069,11 +1127,13 @@
msgid "Add Image Layer"
msgstr "Ajouter une Couche Image"
-#: ../Thuban/UI/mainwindow.py:634 ../Extensions/ogr/ogrstart.py:114
+#: ../Thuban/UI/mainwindow.py:634
+#: ../Extensions/ogr/ogrstart.py:114
msgid "Add Layer from database"
msgstr "Ajouter une Couche de la base de données"
-#: ../Thuban/UI/mainwindow.py:635 ../Extensions/ogr/ogrstart.py:115
+#: ../Thuban/UI/mainwindow.py:635
+#: ../Extensions/ogr/ogrstart.py:115
#, python-format
msgid "Can't open the database table '%s'"
msgstr "Impossible d'ouvrir la base de données '%s'"
@@ -1102,12 +1162,14 @@
msgid "Join Layer with Table"
msgstr "Joindre Couche avec Table"
-#: ../Thuban/UI/mainwindow.py:838 ../Thuban/UI/mainwindow.py:1169
+#: ../Thuban/UI/mainwindow.py:838
+#: ../Thuban/UI/mainwindow.py:1169
#: ../Extensions/umn_mapserver/mf_handle.py:1386
msgid "Legend"
msgstr "Légende"
-#: ../Thuban/UI/mainwindow.py:852 ../Thuban/UI/mainwindow.py:865
+#: ../Thuban/UI/mainwindow.py:852
+#: ../Thuban/UI/mainwindow.py:865
msgid "Open Table"
msgstr "Ouvrir Table"
@@ -1139,7 +1201,8 @@
msgid "Pick the table to rename:"
msgstr "Choisissez la table que vous voulez renommer:"
-#: ../Thuban/UI/mainwindow.py:934 ../Thuban/UI/mainwindow.py:946
+#: ../Thuban/UI/mainwindow.py:934
+#: ../Thuban/UI/mainwindow.py:946
msgid "Rename Table"
msgstr "&Renommer Table"
@@ -1194,8 +1257,7 @@
#: ../Thuban/UI/mainwindow.py:1163
msgid "Save this session to the file it was opened from"
-msgstr ""
-"Enregistrer cette session dans le fichier depuis lequel elle a été ouverte"
+msgstr "Enregistrer cette session dans le fichier depuis lequel elle a été ouverte"
#: ../Thuban/UI/mainwindow.py:1164
msgid "Save Session &As..."
@@ -1237,7 +1299,8 @@
msgid "Info about Thuban authors, version and modules"
msgstr "Information sur les auteurs, versions et modules de Thuban"
-#: ../Thuban/UI/mainwindow.py:1184 ../Thuban/UI/mainwindow.py:1232
+#: ../Thuban/UI/mainwindow.py:1184
+#: ../Thuban/UI/mainwindow.py:1232
msgid "Pro&jection..."
msgstr "Pro&jection..."
@@ -1325,7 +1388,8 @@
msgid "Print the map"
msgstr "Imprimer la carte"
-#: ../Thuban/UI/mainwindow.py:1217 ../Thuban/UI/mainwindow.py:1303
+#: ../Thuban/UI/mainwindow.py:1217
+#: ../Thuban/UI/mainwindow.py:1303
msgid "&Rename..."
msgstr "&Renommer..."
@@ -1355,12 +1419,11 @@
#: ../Thuban/UI/mainwindow.py:1225
msgid "Add a new database layer to active map"
-msgstr ""
-"Ajouter une nouvelle couche à la carte actuelle depuis une base de données"
+msgstr "Ajouter une nouvelle couche à la carte actuelle depuis une base de données"
#: ../Thuban/UI/mainwindow.py:1227
msgid "&Remove Layer"
-msgstr "&Eliminer une Couche"
+msgstr "&Eliminer la Couche"
#: ../Thuban/UI/mainwindow.py:1228
msgid "Remove selected layer"
@@ -1448,7 +1511,7 @@
#: ../Thuban/UI/mainwindow.py:1265
msgid "Put selected layer to the top"
-msgstr "Envoyer la couche selectionnée en haut"
+msgstr "Envoyer la couche sélectionnée en haut"
#: ../Thuban/UI/mainwindow.py:1267
msgid "&Bottom"
@@ -1535,19 +1598,23 @@
msgid "Submenu %s doesn't exist"
msgstr "Le sous-menu %s n'existe pas"
-#: ../Thuban/UI/projdialog.py:63 ../Thuban/UI/projdialog.py:779
+#: ../Thuban/UI/projdialog.py:63
+#: ../Thuban/UI/projdialog.py:779
msgid "Transverse Mercator"
msgstr "Marcator Transverse"
-#: ../Thuban/UI/projdialog.py:64 ../Thuban/UI/projdialog.py:845
+#: ../Thuban/UI/projdialog.py:64
+#: ../Thuban/UI/projdialog.py:845
msgid "Universal Transverse Mercator"
msgstr "Mercator Transverse Universelle (UTM)"
-#: ../Thuban/UI/projdialog.py:65 ../Thuban/UI/projdialog.py:921
+#: ../Thuban/UI/projdialog.py:65
+#: ../Thuban/UI/projdialog.py:921
msgid "Lambert Conic Conformal"
msgstr "Lambert Conique Conforme"
-#: ../Thuban/UI/projdialog.py:66 ../Thuban/UI/projdialog.py:67
+#: ../Thuban/UI/projdialog.py:66
+#: ../Thuban/UI/projdialog.py:67
#: ../Thuban/UI/projdialog.py:971
msgid "Geographic"
msgstr "Géographique"
@@ -1584,7 +1651,8 @@
msgid "Projection:"
msgstr "Projection:"
-#: ../Thuban/UI/projdialog.py:168 ../Thuban/UI/projdialog.py:651
+#: ../Thuban/UI/projdialog.py:168
+#: ../Thuban/UI/projdialog.py:651
msgid "<Unknown>"
msgstr "<Inconnu>"
@@ -1615,11 +1683,13 @@
msgid "Import"
msgstr "Importer"
-#: ../Thuban/UI/projdialog.py:320 ../Thuban/UI/projdialog.py:620
+#: ../Thuban/UI/projdialog.py:320
+#: ../Thuban/UI/projdialog.py:620
msgid "Warnings"
msgstr "Alertes"
-#: ../Thuban/UI/projdialog.py:338 ../Thuban/UI/tableview.py:387
+#: ../Thuban/UI/projdialog.py:338
+#: ../Thuban/UI/tableview.py:387
msgid "Export"
msgstr "Exporter"
@@ -1700,11 +1770,13 @@
msgid "Longitude:"
msgstr "Longitude:"
-#: ../Thuban/UI/projdialog.py:769 ../Thuban/UI/projdialog.py:913
+#: ../Thuban/UI/projdialog.py:769
+#: ../Thuban/UI/projdialog.py:913
msgid "False Easting:"
msgstr "Faux Est:"
-#: ../Thuban/UI/projdialog.py:771 ../Thuban/UI/projdialog.py:915
+#: ../Thuban/UI/projdialog.py:771
+#: ../Thuban/UI/projdialog.py:915
msgid "False Northing:"
msgstr "Faux Nord:"
@@ -1728,7 +1800,8 @@
msgid "Can not propose: No bounding box found."
msgstr "Impossible de proposer: pas de boîte enveloppante"
-#: ../Thuban/UI/projdialog.py:874 ../Thuban/UI/projdialog.py:1011
+#: ../Thuban/UI/projdialog.py:874
+#: ../Thuban/UI/projdialog.py:1011
msgid "Projection: Propose UTM Zone"
msgstr "Projection: Proposer Zone UTM"
@@ -1783,9 +1856,7 @@
#: ../Thuban/UI/rasterlayerproperties.py:42
msgid "GDAL image information unavailable. See About box for details."
-msgstr ""
-"Information sur l'image GDAL non disponile. Voir plus de détails dans 'À "
-"propos'."
+msgstr "Information sur l'image GDAL non disponile. Voir plus de détails dans 'À propos'."
#: ../Thuban/UI/rasterlayerproperties.py:50
msgid "Extent (lat-lon): None"
@@ -1856,11 +1927,13 @@
msgid "DBF Files (*.dbf)|*.dbf|"
msgstr "Fichiers DBF (*.dbf)|*.dbf|"
-#: ../Thuban/UI/tableview.py:538 ../Extensions/bboxdump/bboxdump.py:140
+#: ../Thuban/UI/tableview.py:538
+#: ../Extensions/bboxdump/bboxdump.py:140
msgid "CSV Files (*.csv)|*.csv|"
msgstr "Fichiers CSV (*.csv)|*.csv|"
-#: ../Thuban/UI/tableview.py:539 ../Extensions/bboxdump/bboxdump.py:141
+#: ../Thuban/UI/tableview.py:539
+#: ../Extensions/bboxdump/bboxdump.py:141
#: ../Extensions/gns2shp/gns2shp.py:130
#: ../Extensions/importAPR/importAPR.py:172
#: ../Extensions/umn_mapserver/mf_import.py:535
@@ -1878,9 +1951,8 @@
msgstr "Exporter la carte"
#: ../Extensions/bboxdump/bboxdump.py:84
-#, fuzzy
msgid "File:"
-msgstr "&Fichier"
+msgstr "Fichier:"
#: ../Extensions/bboxdump/bboxdump.py:91
msgid "Group by:"
@@ -1922,35 +1994,33 @@
#: ../Extensions/gns2shp/gns2shp.py:183
#: ../Extensions/importAPR/importAPR.py:336
#: ../Extensions/mouseposition/mouseposition.py:116
-#: ../Extensions/ogr/ogrstart.py:203 ../Extensions/svgexport/maplegend.py:178
+#: ../Extensions/ogr/ogrstart.py:203
+#: ../Extensions/svgexport/maplegend.py:178
#: ../Extensions/svgexport/svgsaver.py:104
-#, fuzzy
msgid "E&xtensions"
-msgstr "Extensions:\n"
+msgstr "E&xtensions"
#: ../Extensions/bboxdump/__init__.py:21
-#, fuzzy
msgid ""
"Dumps the bounding boxes of all\n"
"shapes of the selected layer."
-msgstr "Change les propriétés de la couche sélectionnée"
+msgstr ""
+"Exporte l'extension de tous\n"
+"les objets de la couche sélectionnées."
#: ../Extensions/export_shapefile/export_shapefile.py:39
#: ../Extensions/export_shapefile/export_shapefile.py:45
#: ../Extensions/export_shapefile/export_shapefile.py:68
-#, fuzzy
msgid "Export Shapefile"
-msgstr "Exporter la carte dans un fichier"
+msgstr "Exporter le Shapefile"
#: ../Extensions/export_shapefile/export_shapefile.py:40
-#, fuzzy
msgid "No layer selected"
-msgstr "Projections non spécifiées"
+msgstr "Pas de couche sélectionnées"
#: ../Extensions/export_shapefile/export_shapefile.py:46
-#, fuzzy
msgid "Shapefile Files (*.shp)|*.shp|"
-msgstr "Shapefiles (*.shp)"
+msgstr "Shapefiles (*.shp)|*.shp|"
#: ../Extensions/export_shapefile/export_shapefile.py:69
msgid "Storing shapes ..."
@@ -1966,19 +2036,16 @@
msgstr "Exportation d'une couche en shapefile"
#: ../Extensions/export_shapefile/export_shapefile.py:93
-#, fuzzy
msgid "Export the active layer as a Shapefile"
-msgstr "Exporter la carte dans un fichier"
+msgstr "Exporter la couche active dans un Shapefile"
#: ../Extensions/export_shapefile/__init__.py:22
-#, fuzzy
msgid "Exports the selected layer as a Shapefile."
-msgstr "Affiche la table de la couche sélectionnée"
+msgstr "Exporte la couche sélectionnée dans un Shapefile."
#: ../Extensions/gns2shp/gns2shp.py:128
-#, fuzzy
msgid "Select GNS file"
-msgstr "Choisir un fichier de données image"
+msgstr "Choisir un fichier GNS"
#: ../Extensions/gns2shp/gns2shp.py:129
msgid "Generate Files (*.txt)|*.txt|"
@@ -1989,9 +2056,8 @@
msgstr "gns2shp"
#: ../Extensions/gns2shp/gns2shp.py:140
-#, fuzzy
msgid "Conversion failed"
-msgstr "Erreur de jointure"
+msgstr "Erreur de conversion"
#: ../Extensions/gns2shp/gns2shp.py:143
#, python-format
@@ -2004,9 +2070,8 @@
msgstr "%d emplacements convertis"
#: ../Extensions/gns2shp/gns2shp.py:155
-#, fuzzy
msgid "Add GNS Layer"
-msgstr "Ajouter une Couche"
+msgstr "Ajouter une Couche GNS"
#: ../Extensions/gns2shp/gns2shp.py:179
msgid "gns2shp..."
@@ -2027,14 +2092,14 @@
"affiche les données"
#: ../Extensions/importAPR/importAPR.py:108
-#, fuzzy, python-format
+#, python-format
msgid "Format version: %s"
-msgstr "Extension: %s"
+msgstr "Format version: %s"
#: ../Extensions/importAPR/importAPR.py:110
-#, fuzzy, python-format
+#, python-format
msgid "Project Name: %s"
-msgstr "Projection: %s"
+msgstr "Nom du projet: %s"
#: ../Extensions/importAPR/importAPR.py:113
#, python-format
@@ -2042,9 +2107,8 @@
msgstr "Fichier ODB '%s'"
#: ../Extensions/importAPR/importAPR.py:170
-#, fuzzy
msgid "Select APR file"
-msgstr "Choisir un fichier de données image"
+msgstr "Choisir un fichier APR"
#: ../Extensions/importAPR/importAPR.py:171
msgid "ArcView Project Files (*.apr)|*.apr|"
@@ -2055,14 +2119,12 @@
#: ../Extensions/importAPR/importAPR.py:199
#: ../Extensions/importAPR/importAPR.py:208
#: ../Extensions/importAPR/importAPR.py:295
-#, fuzzy
msgid "Import APR"
-msgstr "Importer"
+msgstr "Importer un fichier APR"
#: ../Extensions/importAPR/importAPR.py:182
-#, fuzzy
msgid "Loading failed"
-msgstr "Erreur de jointure"
+msgstr "Erreur de chargement"
#: ../Extensions/importAPR/importAPR.py:186
#, python-format
@@ -2083,9 +2145,8 @@
msgstr "Importation de %d thèmes sur %d à partir de la vue \"%s\" ..."
#: ../Extensions/importAPR/importAPR.py:331
-#, fuzzy
msgid "Import apr-file..."
-msgstr "Importer..."
+msgstr "Importer un fichier APR ..."
#: ../Extensions/importAPR/importAPR.py:332
msgid "Import a ArcView project file"
@@ -2108,17 +2169,15 @@
msgstr "Valeur inconnue : '%s' with value '%s'"
#: ../Extensions/importAPR/odb.py:129
-#, fuzzy, python-format
+#, python-format
msgid "Unknown Object named: %s"
-msgstr "Commande inconnue: %s"
+msgstr "Objet inconnu nommé: %s"
#: ../Extensions/mouseposition/__init__.py:20
msgid ""
"On mouse click display the current coordinates\n"
"in a dialog for easy further processing."
-msgstr ""
-"A chaque click de la souris, affiche les coordonnées dans une fenêtre pour "
-"un traitement potentiel."
+msgstr "A chaque click de la souris, affiche les coordonnées dans une fenêtre pour un traitement potentiel."
#: ../Extensions/mouseposition/mouseposition.py:89
msgid "Mouse Position Tool"
@@ -2129,57 +2188,52 @@
msgstr "Ouvrir un fichier supporté par ogr."
#: ../Extensions/ogr/ogrdialog.py:38
-#, fuzzy
msgid "Choose file format"
-msgstr "Choisir une couche dans la base de données"
+msgstr "Choisir un format de fichier"
#: ../Extensions/ogr/ogrdialog.py:118
-#, fuzzy
msgid "Choose layer"
-msgstr "Montrer la Couche"
+msgstr "Afficher la couche"
-#: ../Extensions/ogr/ogrdialog.py:134 ../Extensions/wms/properties.py:113
-#, fuzzy
+#: ../Extensions/ogr/ogrdialog.py:134
+#: ../Extensions/wms/properties.py:113
msgid "Layers"
-msgstr "Couc&he"
+msgstr "Couc&hes"
#: ../Extensions/ogr/ogrdialog.py:360
msgid "URL:"
msgstr "URL:"
#: ../Extensions/ogr/ogrstart.py:39
-#, fuzzy
msgid "GML files (*.gml)"
-msgstr "Tous (*.*)"
+msgstr "Fichiers GML (*.gml)"
#: ../Extensions/ogr/ogrstart.py:40
-#, fuzzy
msgid "MapInfo files (*.tab)"
-msgstr "Shapefiles (*.shp)"
+msgstr "Fichier MapInfo (*.tab)"
#: ../Extensions/ogr/ogrstart.py:41
-#, fuzzy
msgid "DGN files (*.dgn)"
-msgstr "Fichiers DBF (*.dbf)"
+msgstr "Fichiers DGN (*.dgn)"
#: ../Extensions/ogr/ogrstart.py:42
-#, fuzzy
msgid "CSV files (*.csv)"
-msgstr "Fichiers CSV (*.csv)|*.csv|"
+msgstr "Fichiers CSV (*.csv)"
#: ../Extensions/ogr/ogrstart.py:44
-#, fuzzy
msgid "Select a data file"
-msgstr "Choisir un fichier de données image"
+msgstr "Choisir un fichier de données"
-#: ../Extensions/ogr/ogrstart.py:158 ../Extensions/ogr/ogrstart.py:186
+#: ../Extensions/ogr/ogrstart.py:158
+#: ../Extensions/ogr/ogrstart.py:186
msgid "Open datasource"
msgstr "Ouvrir une source de donnée"
-#: ../Extensions/ogr/ogrstart.py:159 ../Extensions/ogr/ogrstart.py:187
-#, fuzzy, python-format
+#: ../Extensions/ogr/ogrstart.py:159
+#: ../Extensions/ogr/ogrstart.py:187
+#, python-format
msgid "Can't open the datasource '%s'"
-msgstr "Impossible d'ouvrir la base de données '%s'"
+msgstr "Impossible d'ouvrir la source de données '%s'"
#: ../Extensions/ogr/ogrstart.py:204
msgid "(testing) "
@@ -2193,9 +2247,7 @@
msgid ""
"Provide a profiler and a timer\n"
"for screen rendering."
-msgstr ""
-"Permet de faire du profilage et de la mesure de performance concernant la "
-"vitesse de rendu écran."
+msgstr "Permet de faire du profilage et de la mesure de performance concernant la vitesse de rendu écran."
#: ../Extensions/svgexport/__init__.py:33
msgid "Export the current map and legend in Thuban-map-SVG format."
@@ -2235,40 +2287,35 @@
msgstr "Erreur, fichier SVG non sauvé !"
#: ../Extensions/svgexport/svgsaver.py:84
-#, fuzzy
msgid "Could not write SVG because: "
-msgstr "Impossible de lire \"%s\": %s"
+msgstr "Impossible d'écrire le fichier SVG car:"
#: ../Extensions/svgexport/svgsaver.py:100
msgid "Write SVG Map"
msgstr "Sauve la carte SVG"
#: ../Extensions/svgexport/svgsaver.py:101
-#, fuzzy
msgid "Export the map into an SVG file"
-msgstr "Exporter la carte dans un fichier"
+msgstr "Exporter la carte dans un fichier SVG"
#: ../Extensions/umn_mapserver/__init__.py:32
msgid ""
"Provide management methods for UMN MapServer\n"
".map-files. These can be created/imported/modified."
-msgstr ""
-"Gestion des fichiers map pour UMN MapServer. Ceux-ci peuvent être créer, "
-"importés, modifiés"
+msgstr "Gestion des fichiers map pour UMN MapServer. Ceux-ci peuvent être créer, importés, modifiés"
#: ../Extensions/umn_mapserver/mf_export.py:187
-#, fuzzy
msgid "Export mapfile"
-msgstr "Exporter la carte dans un fichier"
+msgstr "Exporter la carte dans un fichier mapfile"
#: ../Extensions/umn_mapserver/mf_export.py:188
-#, fuzzy
msgid "Create a new mapfile"
-msgstr "Choisir un fichier de données image"
+msgstr "Créer un nouveau fichier mapfile"
#: ../Extensions/umn_mapserver/mf_export.py:193
#: ../Extensions/umn_mapserver/mf_handle.py:1351
-#: ../Extensions/umn_mapserver/mf_import.py:741 ../Extensions/wms/wms.py:153
+#: ../Extensions/umn_mapserver/mf_import.py:741
+#: ../Extensions/wms/wms.py:153
msgid "Experimenta&l"
msgstr "Expérimenta&l"
@@ -2279,24 +2326,21 @@
msgstr "&MapServer"
#: ../Extensions/umn_mapserver/mf_handle.py:79
-#, fuzzy
msgid "Map-Name:"
-msgstr "Nom:"
+msgstr "Nom de la carte:"
#: ../Extensions/umn_mapserver/mf_handle.py:86
#: ../Extensions/umn_mapserver/mf_handle.py:617
#: ../Extensions/umn_mapserver/mf_handle.py:921
-#, fuzzy
msgid "Size"
-msgstr "Taille:"
+msgstr "Taille"
#: ../Extensions/umn_mapserver/mf_handle.py:91
#: ../Extensions/umn_mapserver/mf_handle.py:446
#: ../Extensions/umn_mapserver/mf_handle.py:466
#: ../Extensions/umn_mapserver/mf_handle.py:926
-#, fuzzy
msgid "Width: "
-msgstr "Largeur de Trait: "
+msgstr "Largeur: "
#: ../Extensions/umn_mapserver/mf_handle.py:96
#: ../Extensions/umn_mapserver/mf_handle.py:453
@@ -2306,9 +2350,8 @@
msgstr "Hauteur:"
#: ../Extensions/umn_mapserver/mf_handle.py:113
-#, fuzzy
msgid "Image Type"
-msgstr "Ajouter une Couche Image"
+msgstr "Type d'image"
#: ../Extensions/umn_mapserver/mf_handle.py:125
#: ../Extensions/umn_mapserver/mf_handle.py:961
@@ -2317,17 +2360,15 @@
#: ../Extensions/umn_mapserver/mf_handle.py:136
#: ../Extensions/umn_mapserver/mf_handle.py:481
-#, fuzzy
msgid "ImageColor"
-msgstr "Couleur de Trait"
+msgstr "ImageColor"
#: ../Extensions/umn_mapserver/mf_handle.py:148
#: ../Extensions/umn_mapserver/mf_handle.py:492
#: ../Extensions/umn_mapserver/mf_handle.py:640
#: ../Extensions/umn_mapserver/mf_handle.py:866
-#, fuzzy
msgid "Change Color"
-msgstr "Changer la Couleur du Trait"
+msgstr "Changer la couleur"
#: ../Extensions/umn_mapserver/mf_handle.py:250
msgid "Template:"
@@ -2342,9 +2383,8 @@
msgstr "Adresse de l'image:"
#: ../Extensions/umn_mapserver/mf_handle.py:343
-#, fuzzy
msgid "Layer-Name:"
-msgstr "Nom:"
+msgstr "Nom de la couche:"
#: ../Extensions/umn_mapserver/mf_handle.py:349
msgid "Edit Metadata"
@@ -2355,9 +2395,8 @@
msgstr "Group:"
#: ../Extensions/umn_mapserver/mf_handle.py:441
-#, fuzzy
msgid "KeySize"
-msgstr "Taille:"
+msgstr "KeySize"
#: ../Extensions/umn_mapserver/mf_handle.py:461
msgid "KeySpacing"
@@ -2365,20 +2404,17 @@
#: ../Extensions/umn_mapserver/mf_handle.py:520
#: ../Extensions/umn_mapserver/mf_handle.py:972
-#, fuzzy
msgid "Change Label"
-msgstr "Changer la Couleur du Trait"
+msgstr "Changer le label"
#: ../Extensions/umn_mapserver/mf_handle.py:629
#: ../Extensions/umn_mapserver/mf_handle.py:855
-#, fuzzy
msgid "Color"
-msgstr "Couleur de Trait"
+msgstr "Couleur"
#: ../Extensions/umn_mapserver/mf_handle.py:649
-#, fuzzy
msgid "Type"
-msgstr "Type: %s"
+msgstr "Type"
#: ../Extensions/umn_mapserver/mf_handle.py:662
msgid "Offset"
@@ -2405,19 +2441,16 @@
msgstr "Mindistance"
#: ../Extensions/umn_mapserver/mf_handle.py:875
-#, fuzzy
msgid "Image Color"
-msgstr "Couleur de Trait"
+msgstr "Couleur de l'image"
#: ../Extensions/umn_mapserver/mf_handle.py:886
-#, fuzzy
msgid "Change ImageColor"
-msgstr "Changer la Couleur du Trait"
+msgstr "Changer l'ImageColor"
#: ../Extensions/umn_mapserver/mf_handle.py:893
-#, fuzzy
msgid "Intervals"
-msgstr "Entier"
+msgstr "Intervales"
#: ../Extensions/umn_mapserver/mf_handle.py:1358
msgid "&Edit mapfile"
@@ -2436,23 +2469,20 @@
msgstr "Édition des propriétés web"
#: ../Extensions/umn_mapserver/mf_handle.py:1378
-#, fuzzy
msgid "Layer"
-msgstr "Couc&he"
+msgstr "Couche"
#: ../Extensions/umn_mapserver/mf_handle.py:1380
-#, fuzzy
msgid "Edit the Layer Setting of the active Layer"
-msgstr "Change les propriétés de la couche sélectionnée"
+msgstr "Change les propriétés de la couche active"
#: ../Extensions/umn_mapserver/mf_handle.py:1388
msgid "Edit the Legend Setting"
msgstr "Édition des propriétés de la légende"
#: ../Extensions/umn_mapserver/mf_handle.py:1394
-#, fuzzy
msgid "Scalebar"
-msgstr "Facteur d'Echelle"
+msgstr "Echelle"
#: ../Extensions/umn_mapserver/mf_handle.py:1396
msgid "Edit the Scalebar Setting"
@@ -2475,9 +2505,7 @@
#: ../Extensions/umn_mapserver/mf_import.py:346
#, python-format
msgid "no shp file definied, maybe used a feature obj '%s'."
-msgstr ""
-"Pas de shapefile défini, la couche utilise probablement des \"feature obj\" "
-"'%s'."
+msgstr "Pas de shapefile défini, la couche utilise probablement des \"feature obj\" '%s'."
#: ../Extensions/umn_mapserver/mf_import.py:273
#: ../Extensions/umn_mapserver/mf_import.py:352
@@ -2489,9 +2517,9 @@
msgstr "Erreur lors du chargement de la couche matricielle"
#: ../Extensions/umn_mapserver/mf_import.py:302
-#, fuzzy, python-format
+#, python-format
msgid "Can't open the rasterlayer '%s'."
-msgstr "Impossible d'ouvrir le fichier '%s'"
+msgstr "Impossible d'ouvrir le fichier image '%s'."
#: ../Extensions/umn_mapserver/mf_import.py:451
msgid "Error Loading Expression"
@@ -2506,9 +2534,8 @@
#: ../Extensions/umn_mapserver/mf_import.py:505
#: ../Extensions/umn_mapserver/mf_import.py:549
#: ../Extensions/umn_mapserver/mf_import.py:552
-#, fuzzy
msgid "Loading Layer"
-msgstr "Élever la Couche"
+msgstr "Chargement de la couche"
#: ../Extensions/umn_mapserver/mf_import.py:503
#: ../Extensions/umn_mapserver/mf_import.py:550
@@ -2524,9 +2551,8 @@
#: ../Extensions/umn_mapserver/mf_import.py:533
#: ../Extensions/umn_mapserver/mf_import.py:567
#: ../Extensions/umn_mapserver/mf_import.py:633
-#, fuzzy
msgid "Select MapFile file"
-msgstr "Choisir un fichier de données image"
+msgstr "Choisir un fichier Map"
#: ../Extensions/umn_mapserver/mf_import.py:534
#: ../Extensions/umn_mapserver/mf_import.py:568
@@ -2536,9 +2562,8 @@
#: ../Extensions/umn_mapserver/mf_import.py:613
#: ../Extensions/umn_mapserver/mf_import.py:705
-#, fuzzy
msgid "Layer loaded"
-msgstr "Titre de la Couche: %s"
+msgstr "Couche chargée"
#: ../Extensions/umn_mapserver/mf_import.py:614
#: ../Extensions/umn_mapserver/mf_import.py:706
@@ -2547,32 +2572,28 @@
msgstr "La couche %s a été chargée dans Thuban"
#: ../Extensions/umn_mapserver/mf_import.py:746
-#, fuzzy
msgid "Create new mapfile"
-msgstr "Exporter la carte dans un fichier"
+msgstr "Création d'un nouveau fichier map"
#: ../Extensions/umn_mapserver/mf_import.py:748
msgid "Create a new empty mapscript MapObj"
msgstr "Création d'un nouvel objet vide mapscript MapObj"
#: ../Extensions/umn_mapserver/mf_import.py:753
-#, fuzzy
msgid "Import mapfile"
-msgstr "Exporter la carte dans un fichier"
+msgstr "Importation"
#: ../Extensions/umn_mapserver/mf_import.py:754
-#, fuzzy
msgid "Import a mapfile"
-msgstr "Exporter la carte dans un fichier"
+msgstr "Importation d'un fichier map"
#: ../Extensions/umn_mapserver/mf_import.py:759
msgid "Import layer from mapfile"
msgstr "Importation d'une couche depuis une mapfile"
#: ../Extensions/umn_mapserver/mf_import.py:761
-#, fuzzy
msgid "Import a layer from a mapfile"
-msgstr "Ouvre une table depuis un fichier DBF"
+msgstr "Ouvre une couche depuis le fichier"
#: ../Extensions/wms/capabilities.py:117
#, python-format
@@ -2582,23 +2603,21 @@
#: ../Extensions/wms/capabilities.py:143
#, python-format
msgid "Resource '%s' does support neither WMS version 1.1 nor 1.0"
-msgstr ""
-"La ressource '%s' ne supporte ni le protocole WMS version 1.1 ni le 1.0"
+msgstr "La ressource '%s' ne supporte ni le protocole WMS version 1.1 ni le 1.0"
#: ../Extensions/wms/capabilities.py:156
-#, fuzzy
msgid "No capabilities available"
-msgstr "- non disponible"
+msgstr "Pas d'information disponible"
#: ../Extensions/wms/capabilities.py:163
-#, fuzzy, python-format
+#, python-format
msgid "Can't open file '%s' for writing"
-msgstr "Impossible d'ouvrir le fichier '%s'"
+msgstr "Impossible d'ouvrir le fichier '%s' en écriture"
#: ../Extensions/wms/capabilities.py:175
-#, fuzzy, python-format
+#, python-format
msgid "Can't open file '%s' for reading"
-msgstr "Impossible d'ouvrir le fichier '%s'"
+msgstr "Impossible d'ouvrir le fichier '%s' en lecture"
#: ../Extensions/wms/infodialog.py:55
msgid "WMS Information"
@@ -2609,9 +2628,8 @@
msgstr "Coûts:"
#: ../Extensions/wms/infodialog.py:113
-#, fuzzy
msgid "Access Constraints:"
-msgstr "Contraintes d'accès:"
+msgstr "Contraintes d'accès :"
#: ../Extensions/wms/__init__.py:28
msgid "Provide layers via OGC WMS."
@@ -2628,19 +2646,16 @@
msgstr "Le SRS '%s' n'est pas numérique et non AUTO/NONE dans la couche '%s'"
#: ../Extensions/wms/properties.py:79
-#, fuzzy
msgid "Edit WMS Properties"
-msgstr "Editer les Propriétés de la Couche"
+msgstr "Editer les Propriétés de la Couche WMS"
#: ../Extensions/wms/properties.py:108
-#, fuzzy
msgid "Title:"
-msgstr "Titre: "
+msgstr "Titre : "
#: ../Extensions/wms/properties.py:131
-#, fuzzy
msgid "Format:"
-msgstr "Port:"
+msgstr "Format:"
#: ../Extensions/wms/wms.py:74
msgid "Select WMS Server"
@@ -2651,20 +2666,17 @@
msgstr "WMS"
#: ../Extensions/wms/wms.py:148
-#, fuzzy
msgid "Add WMS layer ..."
-msgstr "&Ajouter une Couche..."
+msgstr "Ajouter une Couche WMS ..."
#: ../Extensions/wms/wms.py:149
-#, fuzzy
msgid "Add a WMS Layer"
-msgstr "Ajouter une Couche"
+msgstr "Ajouter une Couche WMS"
#~ msgid "Projection: UTM Parameters"
#~ msgstr "Projection: Paramètres UTM"
-
#~ msgid "UTM Zone"
#~ msgstr "Zone UTM"
-
#~ msgid "Ellipsoid"
#~ msgstr "Ellipsoïde"
+
Modified: branches/WIP-pyshapelib-Unicode/thuban/po/hu.po
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/po/hu.po 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/po/hu.po 2008-02-04 18:06:58 UTC (rev 2835)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Thuban 1.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-27 23:25+0000\n"
+"POT-Creation-Date: 2008-01-31 13:54+0000\n"
"PO-Revision-Date: 2004-11-09 11:31+0100\n"
"Last-Translator: Solymosi Norbert <Solymosi.Norbert at aotk.szie.hu>\n"
"Language-Team: hungarian <Solymosi.Norbert at aotk.szie.hu>\n"
@@ -178,11 +178,11 @@
msgid "Invalid color specification %s"
msgstr "Hibás színmeghatározás: '%s'."
-#: ../Thuban/Model/load.py:544
+#: ../Thuban/Model/load.py:545
msgid "xml field type differs from database!"
msgstr "xml mezõ típusa különbözik az adatbázistól!"
-#: ../Thuban/Model/load.py:609
+#: ../Thuban/Model/load.py:610
msgid "Classification range is not a number!"
msgstr "Az osztályozási tartomány nem szám!"
@@ -264,72 +264,76 @@
msgid "German"
msgstr "Német"
-#: ../Thuban/UI/about.py:50
+#: ../Thuban/UI/about.py:51
msgid "Hungarian"
msgstr ""
-#: ../Thuban/UI/about.py:51
+#: ../Thuban/UI/about.py:52
msgid "Italian"
msgstr "Olasz"
-#: ../Thuban/UI/about.py:52
+#: ../Thuban/UI/about.py:53
msgid "Portuguese (Brazilian)"
msgstr "Portugál (Brazil)"
-#: ../Thuban/UI/about.py:53
+#: ../Thuban/UI/about.py:54
msgid "Russian"
msgstr "Orosz"
-#: ../Thuban/UI/about.py:54
+#: ../Thuban/UI/about.py:55
msgid "Spanish"
msgstr "Spanyol"
-#: ../Thuban/UI/about.py:63 ../Thuban/UI/about.py:65 ../Thuban/UI/about.py:67
+#: ../Thuban/UI/about.py:56
+msgid "Czech"
+msgstr ""
+
+#: ../Thuban/UI/about.py:65 ../Thuban/UI/about.py:67 ../Thuban/UI/about.py:69
msgid "- not available"
msgstr "- nem elérhetõ"
-#: ../Thuban/UI/about.py:72
+#: ../Thuban/UI/about.py:74
msgid "Currently using:\n"
msgstr "Jelenleg használt:\n"
-#: ../Thuban/UI/about.py:78
+#: ../Thuban/UI/about.py:80
#, python-format
msgid "\tInternal encoding: %s\n"
msgstr ""
-#: ../Thuban/UI/about.py:84
+#: ../Thuban/UI/about.py:86
msgid "Compiled for:\n"
msgstr "A fordításhoz alapul szolgált:\n"
-#: ../Thuban/UI/about.py:90
+#: ../Thuban/UI/about.py:92
msgid "Extensions:\n"
msgstr "Kiterjesztések:\n"
-#: ../Thuban/UI/about.py:95 ../Thuban/UI/about.py:144
+#: ../Thuban/UI/about.py:97 ../Thuban/UI/about.py:146
msgid "\tNone registered.\n"
msgstr "\tNincs regisztrálva.\n"
-#: ../Thuban/UI/about.py:98
+#: ../Thuban/UI/about.py:100
msgid "Maintainers:\n"
msgstr ""
-#: ../Thuban/UI/about.py:103
+#: ../Thuban/UI/about.py:105
msgid "Lead Developer:\n"
msgstr "Vezetõ fejlesztõ:\n"
-#: ../Thuban/UI/about.py:106
+#: ../Thuban/UI/about.py:108
msgid "Developers:\n"
msgstr "Fejlesztõk:\n"
-#: ../Thuban/UI/about.py:111
+#: ../Thuban/UI/about.py:113
msgid "Translators:\n"
msgstr "Fordítók:\n"
-#: ../Thuban/UI/about.py:116
+#: ../Thuban/UI/about.py:118
msgid "Other Contributors:\n"
msgstr "Egyéb közremûködõk:\n"
-#: ../Thuban/UI/about.py:122
+#: ../Thuban/UI/about.py:124
msgid ""
"Questions and comments can be sent to the following addresses:\n"
"\tGeneral list (public):\n"
@@ -347,7 +351,7 @@
"\tIntevation Thuban csoportja:\n"
"\t\t<thuban at intevation.de>\n"
-#: ../Thuban/UI/about.py:130
+#: ../Thuban/UI/about.py:132
msgid ""
"Details on the registered extensions:\n"
"\n"
@@ -355,16 +359,16 @@
"A regisztrált kiterjesztések részletei:\n"
"\n"
-#: ../Thuban/UI/about.py:135
+#: ../Thuban/UI/about.py:137
#, python-format
msgid "Copyright %s\n"
msgstr "Copyright: %s\n"
-#: ../Thuban/UI/about.py:136
+#: ../Thuban/UI/about.py:138
msgid "Authors:\n"
msgstr "Szerzõk:\n"
-#: ../Thuban/UI/about.py:149
+#: ../Thuban/UI/about.py:151
msgid ""
"Thuban is a program for exploring geographic data.\n"
"\n"
@@ -372,12 +376,12 @@
"A Thuban földrajzi adatok elemzését szolgáló szoftver.\n"
"\n"
-#: ../Thuban/UI/about.py:151
+#: ../Thuban/UI/about.py:153
#, fuzzy
msgid "Thuban is licensed under the GNU GPL v>=2"
msgstr "A Thuban-ra a GNU GPL liszensz feltételei vonatkoznak"
-#: ../Thuban/UI/about.py:160 ../Thuban/UI/classgen.py:92
+#: ../Thuban/UI/about.py:162 ../Thuban/UI/classgen.py:92
#: ../Thuban/UI/dbdialog.py:277 ../Thuban/UI/dock.py:371
#: ../Thuban/UI/join.py:66 ../Thuban/UI/layerproperties.py:82
#: ../Thuban/UI/projdialog.py:210 ../Thuban/UI/tableview.py:389
Modified: branches/WIP-pyshapelib-Unicode/thuban/po/it.po
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/po/it.po 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/po/it.po 2008-02-04 18:06:58 UTC (rev 2835)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: Thuban 1.2t\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-27 23:25+0000\n"
+"POT-Creation-Date: 2008-01-31 13:54+0000\n"
"PO-Revision-Date: 2003-12-22 23:09+0100\n"
"Last-Translator: Maurizio Napolitano <napo at itc.it>\n"
"Language-Team: Thuban Developers Mailinglist <thuban-devel at intevation.de>\n"
@@ -181,11 +181,11 @@
msgid "Invalid color specification %s"
msgstr "Errato valore di colore %s"
-#: ../Thuban/Model/load.py:544
+#: ../Thuban/Model/load.py:545
msgid "xml field type differs from database!"
msgstr "il campo XML differisce da quello del database"
-#: ../Thuban/Model/load.py:609
+#: ../Thuban/Model/load.py:610
msgid "Classification range is not a number!"
msgstr "La gamma di classificazione non è un numero!"
@@ -267,73 +267,77 @@
msgid "German"
msgstr "Tedesco"
-#: ../Thuban/UI/about.py:50
+#: ../Thuban/UI/about.py:51
msgid "Hungarian"
msgstr ""
-#: ../Thuban/UI/about.py:51
+#: ../Thuban/UI/about.py:52
msgid "Italian"
msgstr "Italiano"
-#: ../Thuban/UI/about.py:52
+#: ../Thuban/UI/about.py:53
msgid "Portuguese (Brazilian)"
msgstr ""
-#: ../Thuban/UI/about.py:53
+#: ../Thuban/UI/about.py:54
msgid "Russian"
msgstr "Russo"
-#: ../Thuban/UI/about.py:54
+#: ../Thuban/UI/about.py:55
msgid "Spanish"
msgstr "Spagnolo"
-#: ../Thuban/UI/about.py:63 ../Thuban/UI/about.py:65 ../Thuban/UI/about.py:67
+#: ../Thuban/UI/about.py:56
+msgid "Czech"
+msgstr ""
+
+#: ../Thuban/UI/about.py:65 ../Thuban/UI/about.py:67 ../Thuban/UI/about.py:69
msgid "- not available"
msgstr "- non disponibile"
-#: ../Thuban/UI/about.py:72
+#: ../Thuban/UI/about.py:74
msgid "Currently using:\n"
msgstr "Attualmente in uso:\n"
-#: ../Thuban/UI/about.py:78
+#: ../Thuban/UI/about.py:80
#, python-format
msgid "\tInternal encoding: %s\n"
msgstr ""
-#: ../Thuban/UI/about.py:84
+#: ../Thuban/UI/about.py:86
msgid "Compiled for:\n"
msgstr "Compilato per:\n"
-#: ../Thuban/UI/about.py:90
+#: ../Thuban/UI/about.py:92
#, fuzzy
msgid "Extensions:\n"
msgstr "Estensione: %s"
-#: ../Thuban/UI/about.py:95 ../Thuban/UI/about.py:144
+#: ../Thuban/UI/about.py:97 ../Thuban/UI/about.py:146
msgid "\tNone registered.\n"
msgstr ""
-#: ../Thuban/UI/about.py:98
+#: ../Thuban/UI/about.py:100
msgid "Maintainers:\n"
msgstr ""
-#: ../Thuban/UI/about.py:103
+#: ../Thuban/UI/about.py:105
msgid "Lead Developer:\n"
msgstr "Sviluppatore capo: \n"
-#: ../Thuban/UI/about.py:106
+#: ../Thuban/UI/about.py:108
msgid "Developers:\n"
msgstr "Sviluppatori:\n"
-#: ../Thuban/UI/about.py:111
+#: ../Thuban/UI/about.py:113
msgid "Translators:\n"
msgstr "Traduttori:\n"
-#: ../Thuban/UI/about.py:116
+#: ../Thuban/UI/about.py:118
msgid "Other Contributors:\n"
msgstr "Altri collaboratori:\n"
-#: ../Thuban/UI/about.py:122
+#: ../Thuban/UI/about.py:124
#, fuzzy
msgid ""
"Questions and comments can be sent to the following addresses:\n"
@@ -350,22 +354,22 @@
"\tThuban mailing list:\n"
"\t\t<thuban-list at intevation.de>"
-#: ../Thuban/UI/about.py:130
+#: ../Thuban/UI/about.py:132
msgid ""
"Details on the registered extensions:\n"
"\n"
msgstr ""
-#: ../Thuban/UI/about.py:135
+#: ../Thuban/UI/about.py:137
#, python-format
msgid "Copyright %s\n"
msgstr ""
-#: ../Thuban/UI/about.py:136
+#: ../Thuban/UI/about.py:138
msgid "Authors:\n"
msgstr ""
-#: ../Thuban/UI/about.py:149
+#: ../Thuban/UI/about.py:151
msgid ""
"Thuban is a program for exploring geographic data.\n"
"\n"
@@ -373,12 +377,12 @@
"Thuban è un programma per esplorare dati geografici.\n"
"\n"
-#: ../Thuban/UI/about.py:151
+#: ../Thuban/UI/about.py:153
#, fuzzy
msgid "Thuban is licensed under the GNU GPL v>=2"
msgstr "Thuban è distribuito sotto licenza GNU GPL"
-#: ../Thuban/UI/about.py:160 ../Thuban/UI/classgen.py:92
+#: ../Thuban/UI/about.py:162 ../Thuban/UI/classgen.py:92
#: ../Thuban/UI/dbdialog.py:277 ../Thuban/UI/dock.py:371
#: ../Thuban/UI/join.py:66 ../Thuban/UI/layerproperties.py:82
#: ../Thuban/UI/projdialog.py:210 ../Thuban/UI/tableview.py:389
Modified: branches/WIP-pyshapelib-Unicode/thuban/po/pt_BR.po
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/po/pt_BR.po 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/po/pt_BR.po 2008-02-04 18:06:58 UTC (rev 2835)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: Thuban 1.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-27 23:25+0000\n"
+"POT-Creation-Date: 2008-01-31 13:54+0000\n"
"PO-Revision-Date: 2004-01-15 16:07+0300\n"
"Last-Translator: Eduardo Patto Kanegae <eduardo at consultoria.eti.br>\n"
"Language-Team: Thuban Developers Mailinglist <thuban-devel at intevation.de>\n"
@@ -181,11 +181,11 @@
msgid "Invalid color specification %s"
msgstr "Especificação de cor inválida %s"
-#: ../Thuban/Model/load.py:544
+#: ../Thuban/Model/load.py:545
msgid "xml field type differs from database!"
msgstr "tipo do campo xml difere do banco de dados"
-#: ../Thuban/Model/load.py:609
+#: ../Thuban/Model/load.py:610
msgid "Classification range is not a number!"
msgstr "Faixa de classificação não é um número"
@@ -267,73 +267,77 @@
msgid "German"
msgstr "Alemão"
-#: ../Thuban/UI/about.py:50
+#: ../Thuban/UI/about.py:51
msgid "Hungarian"
msgstr ""
-#: ../Thuban/UI/about.py:51
+#: ../Thuban/UI/about.py:52
msgid "Italian"
msgstr "Italiano"
-#: ../Thuban/UI/about.py:52
+#: ../Thuban/UI/about.py:53
msgid "Portuguese (Brazilian)"
msgstr ""
-#: ../Thuban/UI/about.py:53
+#: ../Thuban/UI/about.py:54
msgid "Russian"
msgstr "Russo"
-#: ../Thuban/UI/about.py:54
+#: ../Thuban/UI/about.py:55
msgid "Spanish"
msgstr "Espanhol"
-#: ../Thuban/UI/about.py:63 ../Thuban/UI/about.py:65 ../Thuban/UI/about.py:67
+#: ../Thuban/UI/about.py:56
+msgid "Czech"
+msgstr ""
+
+#: ../Thuban/UI/about.py:65 ../Thuban/UI/about.py:67 ../Thuban/UI/about.py:69
msgid "- not available"
msgstr "- não disponível"
-#: ../Thuban/UI/about.py:72
+#: ../Thuban/UI/about.py:74
msgid "Currently using:\n"
msgstr "Atualmente usando:\n"
-#: ../Thuban/UI/about.py:78
+#: ../Thuban/UI/about.py:80
#, python-format
msgid "\tInternal encoding: %s\n"
msgstr ""
-#: ../Thuban/UI/about.py:84
+#: ../Thuban/UI/about.py:86
msgid "Compiled for:\n"
msgstr "Compilador por:\n"
-#: ../Thuban/UI/about.py:90
+#: ../Thuban/UI/about.py:92
#, fuzzy
msgid "Extensions:\n"
msgstr "Extensão: %s"
-#: ../Thuban/UI/about.py:95 ../Thuban/UI/about.py:144
+#: ../Thuban/UI/about.py:97 ../Thuban/UI/about.py:146
msgid "\tNone registered.\n"
msgstr ""
-#: ../Thuban/UI/about.py:98
+#: ../Thuban/UI/about.py:100
msgid "Maintainers:\n"
msgstr ""
-#: ../Thuban/UI/about.py:103
+#: ../Thuban/UI/about.py:105
msgid "Lead Developer:\n"
msgstr "Programador líder:\n"
-#: ../Thuban/UI/about.py:106
+#: ../Thuban/UI/about.py:108
msgid "Developers:\n"
msgstr "Programadores:\n"
-#: ../Thuban/UI/about.py:111
+#: ../Thuban/UI/about.py:113
msgid "Translators:\n"
msgstr "Tradutores:\n"
-#: ../Thuban/UI/about.py:116
+#: ../Thuban/UI/about.py:118
msgid "Other Contributors:\n"
msgstr "Outros contribuintes:\n"
-#: ../Thuban/UI/about.py:122
+#: ../Thuban/UI/about.py:124
#, fuzzy
msgid ""
"Questions and comments can be sent to the following addresses:\n"
@@ -350,22 +354,22 @@
"\tLista de discussão Thuban:\n"
"\t\t<thuban-list at intevation.de>"
-#: ../Thuban/UI/about.py:130
+#: ../Thuban/UI/about.py:132
msgid ""
"Details on the registered extensions:\n"
"\n"
msgstr ""
-#: ../Thuban/UI/about.py:135
+#: ../Thuban/UI/about.py:137
#, python-format
msgid "Copyright %s\n"
msgstr ""
-#: ../Thuban/UI/about.py:136
+#: ../Thuban/UI/about.py:138
msgid "Authors:\n"
msgstr ""
-#: ../Thuban/UI/about.py:149
+#: ../Thuban/UI/about.py:151
msgid ""
"Thuban is a program for exploring geographic data.\n"
"\n"
@@ -373,12 +377,12 @@
"O Thuban é um programa para exploração de dados geográficos.\n"
"\n"
-#: ../Thuban/UI/about.py:151
+#: ../Thuban/UI/about.py:153
#, fuzzy
msgid "Thuban is licensed under the GNU GPL v>=2"
msgstr "O Thuban é licensiado sobre os termos da GNU GPL"
-#: ../Thuban/UI/about.py:160 ../Thuban/UI/classgen.py:92
+#: ../Thuban/UI/about.py:162 ../Thuban/UI/classgen.py:92
#: ../Thuban/UI/dbdialog.py:277 ../Thuban/UI/dock.py:371
#: ../Thuban/UI/join.py:66 ../Thuban/UI/layerproperties.py:82
#: ../Thuban/UI/projdialog.py:210 ../Thuban/UI/tableview.py:389
Modified: branches/WIP-pyshapelib-Unicode/thuban/po/ru.po
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/po/ru.po 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/po/ru.po 2008-02-04 18:06:58 UTC (rev 2835)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: Thuban 1.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-27 23:25+0000\n"
+"POT-Creation-Date: 2008-01-31 13:54+0000\n"
"PO-Revision-Date: 2003-12-26 12:00+0400\n"
"Last-Translator: Alex Shevlakov <alex at motivation.ru>\n"
"Language-Team: RU\n"
@@ -176,11 +176,11 @@
msgid "Invalid color specification %s"
msgstr "îÅ×ÅÒÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ Ã×ÅÔÁ %s"
-#: ../Thuban/Model/load.py:544
+#: ../Thuban/Model/load.py:545
msgid "xml field type differs from database!"
msgstr "ÔÉÐ ÐÏÌÑ xml ÏÔÌÉÞÁÅÔÓÑ ÏÔ âä! "
-#: ../Thuban/Model/load.py:609
+#: ../Thuban/Model/load.py:610
msgid "Classification range is not a number!"
msgstr "äÉÁÐÁÚÏÎ ËÌÁÓÓÉÆÉËÁÃÉÉ ÎÅ Ñ×ÌÑÅÔÓÑ ÞÉÓÌÏÍ!"
@@ -262,73 +262,77 @@
msgid "German"
msgstr "îÅÍÅÃËÉÊ"
-#: ../Thuban/UI/about.py:50
+#: ../Thuban/UI/about.py:51
msgid "Hungarian"
msgstr ""
-#: ../Thuban/UI/about.py:51
+#: ../Thuban/UI/about.py:52
msgid "Italian"
msgstr "éÔÁÌØÑÎÓËÉÊ"
-#: ../Thuban/UI/about.py:52
+#: ../Thuban/UI/about.py:53
msgid "Portuguese (Brazilian)"
msgstr ""
-#: ../Thuban/UI/about.py:53
+#: ../Thuban/UI/about.py:54
msgid "Russian"
msgstr "òÕÓÓËÉÊ"
-#: ../Thuban/UI/about.py:54
+#: ../Thuban/UI/about.py:55
msgid "Spanish"
msgstr "éÓÐÁÎÓËÉÊ"
-#: ../Thuban/UI/about.py:63 ../Thuban/UI/about.py:65 ../Thuban/UI/about.py:67
+#: ../Thuban/UI/about.py:56
+msgid "Czech"
+msgstr ""
+
+#: ../Thuban/UI/about.py:65 ../Thuban/UI/about.py:67 ../Thuban/UI/about.py:69
msgid "- not available"
msgstr "- ÎÅÔ"
-#: ../Thuban/UI/about.py:72
+#: ../Thuban/UI/about.py:74
msgid "Currently using:\n"
msgstr "éÓÐÏÌØÚÕÅÔÓÑ:\n"
-#: ../Thuban/UI/about.py:78
+#: ../Thuban/UI/about.py:80
#, python-format
msgid "\tInternal encoding: %s\n"
msgstr ""
-#: ../Thuban/UI/about.py:84
+#: ../Thuban/UI/about.py:86
msgid "Compiled for:\n"
msgstr "óËÏÍÐÉÌÉÒÏ×ÁÎ ÎÁ:\n"
-#: ../Thuban/UI/about.py:90
+#: ../Thuban/UI/about.py:92
#, fuzzy
msgid "Extensions:\n"
msgstr "äÏÐÏÌÎÅÎÉÅ: %s"
-#: ../Thuban/UI/about.py:95 ../Thuban/UI/about.py:144
+#: ../Thuban/UI/about.py:97 ../Thuban/UI/about.py:146
msgid "\tNone registered.\n"
msgstr ""
-#: ../Thuban/UI/about.py:98
+#: ../Thuban/UI/about.py:100
msgid "Maintainers:\n"
msgstr ""
-#: ../Thuban/UI/about.py:103
+#: ../Thuban/UI/about.py:105
msgid "Lead Developer:\n"
msgstr "çÌÁ×ÎÙÊ ÒÁÚÒÁÂÏÔÞÉË:\n"
-#: ../Thuban/UI/about.py:106
+#: ../Thuban/UI/about.py:108
msgid "Developers:\n"
msgstr "òÁÚÒÁÂÏÔÞÉËÉ:\n"
-#: ../Thuban/UI/about.py:111
+#: ../Thuban/UI/about.py:113
msgid "Translators:\n"
msgstr "ðÅÒÅ×ÏÄ:\n"
-#: ../Thuban/UI/about.py:116
+#: ../Thuban/UI/about.py:118
msgid "Other Contributors:\n"
msgstr "äÏÐÏÌÎÅÎÉÑ:\n"
-#: ../Thuban/UI/about.py:122
+#: ../Thuban/UI/about.py:124
#, fuzzy
msgid ""
"Questions and comments can be sent to the following addresses:\n"
@@ -345,22 +349,22 @@
"\tMail List Thuban:\n"
"\t\t<thuban-list at intevation.de>"
-#: ../Thuban/UI/about.py:130
+#: ../Thuban/UI/about.py:132
msgid ""
"Details on the registered extensions:\n"
"\n"
msgstr ""
-#: ../Thuban/UI/about.py:135
+#: ../Thuban/UI/about.py:137
#, python-format
msgid "Copyright %s\n"
msgstr ""
-#: ../Thuban/UI/about.py:136
+#: ../Thuban/UI/about.py:138
msgid "Authors:\n"
msgstr ""
-#: ../Thuban/UI/about.py:149
+#: ../Thuban/UI/about.py:151
msgid ""
"Thuban is a program for exploring geographic data.\n"
"\n"
@@ -368,12 +372,12 @@
"Thuban: ðÒÏÇÒÁÍÍÁ ÄÌÑ ÒÁÂÏÔÙ Ó ÇÅÏÇÒÁÆÉÞÅÓËÉÍÉ ÄÁÎÎÙÍÉ. \n"
"\n"
-#: ../Thuban/UI/about.py:151
+#: ../Thuban/UI/about.py:153
#, fuzzy
msgid "Thuban is licensed under the GNU GPL v>=2"
msgstr "Thuban ÉÍÅÅÔ ÌÉÃÅÎÚÉÀ GNU GPL"
-#: ../Thuban/UI/about.py:160 ../Thuban/UI/classgen.py:92
+#: ../Thuban/UI/about.py:162 ../Thuban/UI/classgen.py:92
#: ../Thuban/UI/dbdialog.py:277 ../Thuban/UI/dock.py:371
#: ../Thuban/UI/join.py:66 ../Thuban/UI/layerproperties.py:82
#: ../Thuban/UI/projdialog.py:210 ../Thuban/UI/tableview.py:389
Modified: branches/WIP-pyshapelib-Unicode/thuban/setup.py
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/setup.py 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/setup.py 2008-02-04 18:06:58 UTC (rev 2835)
@@ -1193,7 +1193,7 @@
"""
setup(name = "Thuban",
- version = "1.2.0+svn",
+ version = "1.2.1+svn",
description = "Geographic data viewer",
long_description = long_description,
license = "GPL",
Modified: branches/WIP-pyshapelib-Unicode/thuban/test/test_load.py
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/test/test_load.py 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/test/test_load.py 2008-02-04 18:06:58 UTC (rev 2835)
@@ -89,7 +89,7 @@
self.session = None
- dtd = "http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
+ dtd = "http://thuban.intevation.org/dtds/thuban-1.2.1.dtd"
thubanids = [((dtd, n), (None, "id")) for n in
["fileshapesource", "filetable", "jointable",
"derivedshapesource"]]
@@ -191,8 +191,8 @@
# want to test whether the loading code handles that correctly.
file_contents = '''\
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE session SYSTEM "thuban-1.1.dtd">
-<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
+<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
+<session xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd"
title="Stra\xc3\x9fen & Landmarken">
<fileshapesource filetype="shapefile" id="D1"
filename="../../Data/iceland/political.shp"/>
@@ -287,8 +287,8 @@
file_contents = '''\
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE session SYSTEM "thuban-1.1.dtd">
-<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
+<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
+<session xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd"
title="Non ASCII column name test">
<fileshapesource filetype="shapefile" id="D1"
filename="TestNonAsciiColumnName.shp"/>
@@ -362,8 +362,8 @@
file_contents = '''\
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE session SYSTEM "thuban-1.1.dtd">
-<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
+<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
+<session xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd"
title="single map&layer">
<fileshapesource filetype="shapefile" id="D1"
filename="../../Data/iceland/political.shp"/>
@@ -405,8 +405,8 @@
file_contents = '''\
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE session SYSTEM "thuban-1.1.dtd">
-<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd" title="Thuban sample session">
+<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
+<session xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd" title="Thuban sample session">
<fileshapesource filetype="shapefile" id="D813968480" filename="../../Data/iceland/cultural_landmark-point.shp"/>
<map title="Iceland map">
<layer title="cultural_landmark-point" shapestore="D813968480" visible="true">
@@ -452,8 +452,8 @@
file_contents = '''\
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE session SYSTEM "thuban-1.1.dtd">
-<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
+<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
+<session xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd"
title="single map&layer">
<fileshapesource filetype="shapefile" id="D138389860"
filename="../../Data/iceland/political.shp"/>
@@ -566,8 +566,8 @@
file_contents = '''\
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE session SYSTEM "thuban-1.1.dtd">
-<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
+<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
+<session xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd"
title="single map&layer">
<fileshapesource filetype="shapefile" id="D1"
filename="../../Data/iceland/political.shp"/>
@@ -613,8 +613,8 @@
file_contents = '''\
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE session SYSTEM "thuban-1.1.dtd">
-<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
+<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
+<session xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd"
title="single map&layer">
<fileshapesource filetype="shapefile" id="D2"
filename="../../Data/iceland/roads-line.shp"/>
@@ -694,8 +694,8 @@
file_contents = '''\
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE session SYSTEM "thuban-1.1.dtd">
-<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
+<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
+<session xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd"
title="single map&layer">
<map title="Test Map">
<rasterlayer visible="false" filename="../../Data/iceland/island.tif"
@@ -730,8 +730,8 @@
class TestJoinedTable(LoadSessionTest):
file_contents = '''<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE session SYSTEM "thuban-1.1.dtd">
-<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd" title="A Joined Table session">
+<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
+<session xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd" title="A Joined Table session">
<fileshapesource filetype="shapefile" id="D137227612"
filename="../../Data/iceland/roads-line.shp"/>
<filetable filetype="DBF" filename="load_joinedtable.dbf" id="D136171140"
@@ -786,8 +786,8 @@
# test whether they're supported correctly.
file_contents = '''<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE session SYSTEM "thuban-1.1.dtd">
-<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd" title="Thuban sample session">
+<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
+<session xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd" title="Thuban sample session">
<fileshapesource filetype="shapefile" id="D145265052"
filename="../../Data/iceland/political.shp"/>
<fileshapesource filetype="shapefile" id="D145412868"
@@ -852,8 +852,8 @@
class TestPostGISLayer(LoadSessionTest):
file_contents = '''<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE session SYSTEM "thuban-1.1.dtd">
-<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
+<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
+<session xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd"
title="unnamed session">
<dbconnection port="%(port)s" host="%(host)s" user="%(user)s"
dbtype="postgis" id="D142684948" dbname="%(dbname)s"/>
@@ -903,8 +903,8 @@
class TestPostGISLayerPassword(LoadSessionTest):
file_contents = '''<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE session SYSTEM "thuban-1.1.dtd">
-<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
+<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
+<session xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd"
title="unnamed session">
<dbconnection port="%(port)s" host="%(host)s" user="%(user)s"
dbtype="postgis" id="D142684948" dbname="%(dbname)s"/>
@@ -998,8 +998,8 @@
file_contents = '''\
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE session SYSTEM "thuban-1.1.dtd">
-<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
+<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
+<session xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd"
title="single map&layer">
<fileshapesource id="D1" filename="../../Data/iceland/political.shp"/>
<map title="Test Map">
@@ -1026,7 +1026,7 @@
# LoadError really was about the missing attribute
self.assertEquals(str(value),
"Element "
- "(u'http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd',"
+ "(u'http://thuban.intevation.org/dtds/thuban-1.2.1.dtd',"
" u'fileshapesource') requires an attribute 'filetype'")
else:
self.fail("Missing filetype attribute doesn't raise LoadError")
@@ -1066,8 +1066,8 @@
file_contents = '''\
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE session SYSTEM "thuban-1.1.dtd">
-<session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd" title="AltPath Test session">
+<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
+<session xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd" title="AltPath Test session">
<fileshapesource filetype="shapefile" id="D1108450956" filename="../../Data/iceland/political.shp"/>
<fileshapesource filetype="shapefile" id="D1108900076" filename="../Data/iceland/roads-line.shp"/>
<fileshapesource filetype="shapefile" id="D1108947244" filename="../../Data/iceland/cultural_landmark-point.shp"/>
Modified: branches/WIP-pyshapelib-Unicode/thuban/test/test_save.py
===================================================================
--- branches/WIP-pyshapelib-Unicode/thuban/test/test_save.py 2008-02-03 01:08:35 UTC (rev 2834)
+++ branches/WIP-pyshapelib-Unicode/thuban/test/test_save.py 2008-02-04 18:06:58 UTC (rev 2835)
@@ -66,7 +66,7 @@
class SaveSessionTest(unittest.TestCase, support.FileTestMixin,
xmlsupport.ValidationTest):
- dtd = "http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
+ dtd = "http://thuban.intevation.org/dtds/thuban-1.2.1.dtd"
thubanids = [((dtd, n), (None, "id")) for n in
["fileshapesource", "filetable", "jointable",
"derivedshapesource", "dbshapesource", "dbconnection"]]
@@ -112,9 +112,9 @@
file.close()
self.compare_xml(written_contents,
'<?xml version="1.0" encoding="UTF-8"?>\n'
- '<!DOCTYPE session SYSTEM "thuban-1.1.dtd">\n'
+ '<!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">\n'
'<session title="empty session" '
- 'xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd">'
+ 'xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd">'
'\n</session>\n')
self.validate_data(written_contents)
@@ -142,9 +142,9 @@
written_contents = file.read()
file.close()
expected_template = '''<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
<session title="single map&layer"
- xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd">
+ xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd">
<fileshapesource id="D1"
filename="../../Data/iceland/political.shp"
filetype="shapefile"/>
@@ -210,9 +210,9 @@
written_contents = file.read()
file.close()
expected_contents = '''<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
<session title="single map&layer"
- xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd">
+ xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd">
<fileshapesource id="D1"
filename="../../Data/iceland/political.shp"
filetype="shapefile"/>
@@ -282,9 +282,9 @@
written_contents = file.read()
file.close()
expected_contents = '''<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
<session title="single map&layer"
- xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd">
+ xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd">
<map title="Test Map">
<rasterlayer title="My RasterLayer"
filename="../../Data/iceland/island.tif"
@@ -353,9 +353,9 @@
written_contents = file.read()
file.close()
expected_contents = '''<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
<session title="Map with Classifications"
- xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd">
+ xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd">
<fileshapesource id="D1"
filename="../../Data/iceland/political.shp"
filetype="shapefile"/>
@@ -425,9 +425,9 @@
written_contents = file.read()
file.close()
expected_contents = '''<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
<session title="a DBF Table session"
- xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd">
+ xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd">
<filetable id="D1" filename="../../Data/iceland/political.dbf"
filetype="DBF" title="political"/>
</session>'''
@@ -483,9 +483,9 @@
written_contents = file.read()
file.close()
expected_contents = '''<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
<session title="A Joined Table session"
- xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd">
+ xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd">
<fileshapesource filename="../../Data/iceland/roads-line.shp"
filetype="shapefile" id="D142197204"/>
<filetable filename="save_joinedtable.dbf"
@@ -561,9 +561,9 @@
written = file.read()
file.close()
expected = '''<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.2.1.dtd">
<session title="A PostGIS Session"
- xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd">
+ xmlns="http://thuban.intevation.org/dtds/thuban-1.2.1.dtd">
<dbconnection id="DB"
dbtype="postgis" dbname="plugh"
host="xyzzy" port="42"
More information about the Thuban-commits
mailing list