[josm] 01/05: New upstream version 0.0.svn12450+dfsg

Bas Couwenberg sebastic at debian.org
Mon Jul 3 06:02:51 UTC 2017


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit 82c07963e6d6128618cbe721100d8ede1b1f4a12
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jul 3 07:42:13 2017 +0200

    New upstream version 0.0.svn12450+dfsg
---
 README                                             |   2 +-
 REVISION                                           |  10 +-
 build.xml                                          |   2 +-
 data/defaultpresets.xml                            |   8 +
 i18n/po/af.po                                      |   7 +-
 i18n/po/am.po                                      |   7 +-
 i18n/po/ar.po                                      |   7 +-
 i18n/po/ast.po                                     |  77 +++--
 i18n/po/az.po                                      |   7 +-
 i18n/po/be.po                                      |   7 +-
 i18n/po/bg.po                                      |   7 +-
 i18n/po/bn.po                                      |   7 +-
 i18n/po/br.po                                      |   7 +-
 i18n/po/bs.po                                      |   7 +-
 i18n/po/ca.po                                      |   7 +-
 i18n/po/ca at valencia.po                             |   7 +-
 i18n/po/cs.po                                      |   7 +-
 i18n/po/cy.po                                      |   7 +-
 i18n/po/da.po                                      |  23 +-
 i18n/po/de.po                                      |   7 +-
 i18n/po/de_DE.po                                   |   7 +-
 i18n/po/el.po                                      |   7 +-
 i18n/po/en_AU.po                                   |   7 +-
 i18n/po/en_CA.po                                   |   7 +-
 i18n/po/en_GB.po                                   |   7 +-
 i18n/po/eo.po                                      |   7 +-
 i18n/po/es.po                                      |   7 +-
 i18n/po/et.po                                      |   7 +-
 i18n/po/eu.po                                      |   7 +-
 i18n/po/fa.po                                      |   7 +-
 i18n/po/fi.po                                      |   7 +-
 i18n/po/fil.po                                     |   7 +-
 i18n/po/fo.po                                      |   7 +-
 i18n/po/fr.po                                      |   7 +-
 i18n/po/ga.po                                      |   7 +-
 i18n/po/gl.po                                      |   7 +-
 i18n/po/he.po                                      |   7 +-
 i18n/po/hi.po                                      |   7 +-
 i18n/po/hr.po                                      |   7 +-
 i18n/po/ht.po                                      |   7 +-
 i18n/po/hu.po                                      |   7 +-
 i18n/po/hy.po                                      |   7 +-
 i18n/po/ia.po                                      |   7 +-
 i18n/po/id.po                                      |   7 +-
 i18n/po/is.po                                      |   7 +-
 i18n/po/it.po                                      |   7 +-
 i18n/po/ja.po                                      |   7 +-
 i18n/po/ka.po                                      |   7 +-
 i18n/po/km.po                                      |   7 +-
 i18n/po/ko.po                                      |   7 +-
 i18n/po/ku.po                                      |   7 +-
 i18n/po/ky.po                                      |   7 +-
 i18n/po/lb.po                                      |   7 +-
 i18n/po/lo.po                                      |   7 +-
 i18n/po/lt.po                                      |   7 +-
 i18n/po/lv.po                                      |   7 +-
 i18n/po/mk.po                                      |   7 +-
 i18n/po/mr.po                                      |   7 +-
 i18n/po/ms.po                                      |   7 +-
 i18n/po/nb.po                                      |   7 +-
 i18n/po/nds.po                                     |   7 +-
 i18n/po/nl.po                                      |  53 +--
 i18n/po/nn.po                                      |   7 +-
 i18n/po/oc.po                                      |   7 +-
 i18n/po/pa.po                                      |   7 +-
 i18n/po/pl.po                                      | 290 ++++++++--------
 i18n/po/pt.po                                      |   7 +-
 i18n/po/pt_BR.po                                   |   7 +-
 i18n/po/rm.po                                      |   7 +-
 i18n/po/ro.po                                      |   7 +-
 i18n/po/ru.po                                      |   9 +-
 i18n/po/sk.po                                      |   7 +-
 i18n/po/sl.po                                      |   7 +-
 i18n/po/sq.po                                      |   7 +-
 i18n/po/sr.po                                      |   7 +-
 i18n/po/sv.po                                      |   7 +-
 i18n/po/ta.po                                      |   7 +-
 i18n/po/te.po                                      |   7 +-
 i18n/po/th.po                                      |   7 +-
 i18n/po/tr.po                                      |   7 +-
 i18n/po/ug.po                                      |   7 +-
 i18n/po/uk.po                                      |   7 +-
 i18n/po/ur.po                                      |   7 +-
 i18n/po/vi.po                                      |   7 +-
 i18n/po/wae.po                                     |   7 +-
 i18n/po/zh_CN.po                                   |   7 +-
 i18n/po/zh_TW.po                                   |   7 +-
 images/presets/landmark/cross.svg                  |  93 +++++
 .../josm/data/imagery/ImageryInfo.java             |  11 -
 .../data/osm/visitor/paint/StyledMapRenderer.java  |   6 +-
 .../josm/data/projection/proj/ObliqueMercator.java |  14 +-
 .../openstreetmap/josm/gui/draw/MapViewPath.java   |   2 +-
 .../josm/gui/widgets/MultiSplitPane.java           |   1 -
 .../josm/gui/widgets/QuadStateCheckBox.java        |  16 +-
 styles/standard/elemstyles.mapcss                  |   4 +
 test/data/renderer/way-dashes/data.osm             | 135 ++++----
 test/data/renderer/way-dashes/reference.png        | Bin 4889 -> 5945 bytes
 test/data/renderer/way-dashes/style.mapcss         |  11 +
 test/data/renderer/way-repeat-image/data.osm       |  90 +++++
 test/data/renderer/way-repeat-image/reference.png  | Bin 0 -> 46674 bytes
 test/data/renderer/way-repeat-image/style.mapcss   |  48 +++
 .../way-repeat-image/trees-upside_down.svg         | 378 +++++++++++++++++++++
 test/data/renderer/way-repeat-image/trees.svg      | 378 +++++++++++++++++++++
 .../josm/gui/mappaint/MapCSSRendererTest.java      |   5 +-
 .../josm/actions/AddImageryLayerActionTest.java    |  15 +-
 .../josm/actions/AddImageryLayerActionTestIT.java  |  42 +++
 106 files changed, 1790 insertions(+), 479 deletions(-)

diff --git a/README b/README
index f6a13d1..25baee2 100644
--- a/README
+++ b/README
@@ -125,7 +125,7 @@ This is an overview of the files and directories in the JOSM code repository:
     - error_prone_ant.jar   used to detect code errors during compilation
     - findbugs/             libs and config files for findbugs (automatically detects common bugs and potential
                             problems in source code); can be launched as an ant target in build.xml
-    - groovy-all-2.4.11.jar used for some unit tests and various scripts
+    - groovy-all.jar        used for some unit tests and various scripts
     - jacocoant.jar         used to include coverage data into JUnit test reports
     - japicc/               used to generate a compatibility report between optimized jar and normal one
     - javacc.jar            used in the build process to generate some .java files from a javacc source file
diff --git a/REVISION b/REVISION
index f7f9f80..2badc3c 100644
--- a/REVISION
+++ b/REVISION
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <info>
 <entry
-   kind="dir"
    path="trunk"
-   revision="12443">
+   revision="12450"
+   kind="dir">
 <url>https://josm.openstreetmap.de/svn/trunk</url>
 <relative-url>^/trunk</relative-url>
 <repository>
@@ -11,9 +11,9 @@
 <uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
 </repository>
 <commit
-   revision="12443">
-<author>Don-vip</author>
-<date>2017-06-30T19:29:41.747345Z</date>
+   revision="12450">
+<author>bastiK</author>
+<date>2017-07-02T22:44:07.233914Z</date>
 </commit>
 </entry>
 </info>
diff --git a/build.xml b/build.xml
index e743ebc..2918f7f 100644
--- a/build.xml
+++ b/build.xml
@@ -24,7 +24,7 @@
         <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
         <property name="proj-build.dir" location="${base.dir}/build2"/>
         <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
-        <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.11.jar"/>
+        <property name="groovy.jar" location="${base.dir}/tools/groovy-all.jar"/>
         <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant.jar"/>
         <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
         <!-- build parameter: compression level (ant -Dclevel=N)
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index f0c9d2d..cde7afd 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -6780,6 +6780,14 @@
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:man_made=flagpole" />
             <key key="man_made" value="flagpole" />
         </item> <!-- Flagpole -->
+        <item name="Cross" icon="presets/landmark/cross.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=cross"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=cross"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=cross"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=cross"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:man_made=cross" />
+            <key key="man_made" value="cross" />
+        </item> <!-- Cross -->
         <separator/>
         <item name="Works" icon="presets/landmark/works.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=works"
diff --git a/i18n/po/af.po b/i18n/po/af.po
index df11c9e..b8c2bf0 100644
--- a/i18n/po/af.po
+++ b/i18n/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2011-10-13 02:39+0000\n"
 "Last-Translator: Grant Slater <Unknown>\n"
 "Language-Team: Afrikaans <af at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:33+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:33+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: af\n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/am.po b/i18n/po/am.po
index 222fc1b..99aa110 100644
--- a/i18n/po/am.po
+++ b/i18n/po/am.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2010-03-30 12:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Amharic <am at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:34+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:34+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: am\n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index b0e0da5..a61f715 100644
--- a/i18n/po/ar.po
+++ b/i18n/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-06-05 02:55+0000\n"
 "Last-Translator: Chdoula <chdoula at gmail.com>\n"
 "Language-Team: Arabic <ar at li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:35+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:34+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: ar\n"
 
@@ -22566,6 +22566,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "المصانع"
 
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index 77212d3..82014f1 100644
--- a/i18n/po/ast.po
+++ b/i18n/po/ast.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
-"PO-Revision-Date: 2017-02-27 10:21+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"PO-Revision-Date: 2017-07-02 01:18+0000\n"
+"Last-Translator: Xuacu Saturio <xuacusk8 at gmail.com>\n"
 "Language-Team: Asturian <ast at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:35+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:35+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: ast\n"
 
@@ -1497,7 +1497,7 @@ msgstr[0] "Divide la vía {0} en {1} parte"
 msgstr[1] "Divide la vía {0} en {1} partes"
 
 msgid "Discourage upload"
-msgstr ""
+msgstr "Desaconseyar subida"
 
 msgid "UnGlue Ways"
 msgstr "Despegar víes"
@@ -2591,13 +2591,13 @@ msgid "MapCSS selector"
 msgstr "Selector MapCSS"
 
 msgid "Selection settings"
-msgstr ""
+msgstr "Preferencies de selección"
 
 msgid "Additional settings"
-msgstr ""
+msgstr "Más preferencies"
 
 msgid "Search syntax"
-msgstr ""
+msgstr "Sintaxis de gueta"
 
 msgid "Invalid search expression"
 msgstr "Espresión de gueta non válida"
@@ -2624,7 +2624,7 @@ msgstr ""
 " {0}"
 
 msgid "Search hints"
-msgstr ""
+msgstr "Gabitos pa la gueta"
 
 msgid "basics"
 msgstr "básicos"
@@ -3563,7 +3563,7 @@ msgid "{0} mirror server"
 msgstr ""
 
 msgid "Update default entries"
-msgstr ""
+msgstr "Anovar les entraes predeterminaes"
 
 msgid "Update imagery ''{0}''"
 msgstr ""
@@ -3596,16 +3596,17 @@ msgid "Select WMTS layer"
 msgstr "Seleiciona la capa WMTS"
 
 msgid "Layer name"
-msgstr ""
+msgstr "Nome de la capa"
 
 msgid "Projection"
 msgstr "Proyección"
 
 msgid "Matrix set identifier"
-msgstr ""
+msgstr "Identificador de conxuntu matriz"
 
 msgid "No default layer selected, choosing first layer."
 msgstr ""
+"Nun ta seleccionada ninguna capa predeterminada, seleicionóse la primera capa"
 
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr "Nun hai capes definíes pol documentu getCapabilities: {0}"
@@ -3688,7 +3689,7 @@ msgid "Test ''{0}'' completed in {1}"
 msgstr "Test \"{0}\" completáu en {1}"
 
 msgid "<html>Error in filter <code>{0}</code>:<br>{1}"
-msgstr ""
+msgstr "<html>Error nel filtru <code>{0}</code>:<br>{1}"
 
 msgid "Error in filter"
 msgstr "Erru al filtrar"
@@ -3861,7 +3862,7 @@ msgid "Expected element ''{0}'', but got ''{1}''"
 msgstr ""
 
 msgid "value expected"
-msgstr ""
+msgstr "valor esperáu"
 
 msgid "UTM projection (''+proj=utm'') requires ''+zone=...'' parameter."
 msgstr "La proyeición UTM (''+proj=utm'') rique’l parámetru ''+zone=...''."
@@ -3951,22 +3952,22 @@ msgid "WGS84"
 msgstr "WGS84"
 
 msgid "Albers Equal Area"
-msgstr ""
+msgstr "Albers Área Constante"
 
 msgid "Parameter ''{0}'' required."
 msgstr "Parámetru ''{0}'' riquíu."
 
 msgid "standard parallels are opposite"
-msgstr ""
+msgstr "los paralelos estándar son opuestos"
 
 msgid "Cassini-Soldner"
-msgstr ""
+msgstr "Cassini-Soldner"
 
 msgid "Double Stereographic"
-msgstr ""
+msgstr "Doble Estereográficu"
 
 msgid "Lambert Azimuthal Equal Area"
-msgstr ""
+msgstr "Lambert Azimutal d'Árees Iguales"
 
 msgid "Lambert Conformal Conic"
 msgstr "Cónica Conforme de Lambert"
@@ -3978,25 +3979,25 @@ msgid "Mercator"
 msgstr "Mercator"
 
 msgid "Oblique Mercator"
-msgstr ""
+msgstr "Mercator Oblicuu"
 
 msgid "Unsuitable parameters ''{0}'' and ''{1}'' for two point method."
-msgstr ""
+msgstr "Parámetros inapropiaos ''{0}'' y ''{1}'' pal métodu de dos puntos."
 
 msgid "Illegal value for parameter ''{0}'': {1}"
-msgstr ""
+msgstr "Valor ilegal pal parámetru ''{0}'': {1}"
 
 msgid "error in initialization"
 msgstr ""
 
 msgid "Polar Stereographic"
-msgstr ""
+msgstr "Polar Estereográficu"
 
 msgid "Polar Stereographic: Parameter ''{0}'' must be 90 or -90."
-msgstr ""
+msgstr "Polar Estereográficu: el parámetru ''{0}'' tien de ser 90 o -90."
 
 msgid "Sinusoidal"
-msgstr ""
+msgstr "Sinusoidal"
 
 msgid "Swiss Oblique Mercator"
 msgstr "Mercator Oblicua Suiza"
@@ -4034,7 +4035,7 @@ msgid "E-mail address contains an invalid domain: {0}"
 msgstr "La dirección de corréu electrónicu contien un dominiu inválidu: {0}"
 
 msgid "Email validator"
-msgstr ""
+msgstr "Validador de corréu electrónicu"
 
 msgid "URL is invalid"
 msgstr "La URL nun ye válida"
@@ -4055,7 +4056,7 @@ msgid "URL contains an invalid fragment: {0}"
 msgstr "La URL contien un fragmentu inválidu: {0}"
 
 msgid "URL validator"
-msgstr ""
+msgstr "Validador d'URL"
 
 msgid "Addresses"
 msgstr "Direiciones"
@@ -4125,7 +4126,7 @@ msgid "Reversed coastline"
 msgstr "Llínea de mariña invertía"
 
 msgid "invalid coastline"
-msgstr ""
+msgstr "llinia de costa inválida"
 
 msgid "Conditional Keys"
 msgstr "Claves Condicionales"
@@ -4164,10 +4165,10 @@ msgid "Crossing barriers"
 msgstr "Cruciando barreres"
 
 msgid "Self crossing"
-msgstr ""
+msgstr "Se cruza ella mesma"
 
 msgid "Self-crossing ways"
-msgstr ""
+msgstr "Víes que se crucen elles mesmes"
 
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -4351,7 +4352,7 @@ msgid "Area style way is not closed"
 msgstr "La vía estilu área non foi pesllada"
 
 msgid "No outer way for boundary"
-msgstr ""
+msgstr "Nun hai vía esterior pa la llende"
 
 msgid "No outer way for multipolygon"
 msgstr "Nenguna vía esterior pal multipolígono"
@@ -4384,6 +4385,8 @@ msgid ""
 "With the currently used mappaint style(s) the style for outer way mismatches "
 "the area style"
 msgstr ""
+"Colos estilos de MapPoint utilizaos actualmente, l'estilu de la vía esterna "
+"nun casa col estilu del área"
 
 msgid "Area style on outer way"
 msgstr "Estilu d''área en vía esterna"
@@ -4392,13 +4395,13 @@ msgid "Multipolygon is not closed"
 msgstr "El multipolígonu non tá peslláu"
 
 msgid "Multipolygon rings share node(s)"
-msgstr ""
+msgstr "Aniellos de multipolígonu que comparten nodiu(os)"
 
 msgid "Intersection between multipolygon ways"
 msgstr "Intersección ente víes del multipolígonu"
 
 msgid "Multipolygon rings are equal"
-msgstr ""
+msgstr "Aniellos de multipolígonu que son iguales"
 
 msgid "Role for ''{0}'' should be ''{1}''"
 msgstr "El rol pa ''{0}'' tendría de ser ''{1}''"
@@ -4407,16 +4410,17 @@ msgid "Multipolygon inner way is outside"
 msgstr "vía interna del multipolígonu tá fora"
 
 msgid "Multipolygon ring contains segments twice"
-msgstr ""
+msgstr "L'aniellu del multipolígonu contien segmentos dos veces"
 
 msgid "Multipolygon outer way shares segment(s) with other ring"
 msgstr ""
+"La vía esterior del multipolígonu comparte segmentu(os) con otru aniellu"
 
 msgid "No useful role for multipolygon member"
 msgstr "El miembru de multipolígonu non tien un rol útil"
 
 msgid "Non-Way in boundary"
-msgstr ""
+msgstr "Elementu que nun ye vía na llende"
 
 msgid "Non-Way in multipolygon"
 msgstr "Non hai vía dientro del multipolígonu"
@@ -24226,6 +24230,9 @@ msgstr "observación"
 msgid "Flagpole"
 msgstr "Mástil de bandera"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Fábrica"
 
diff --git a/i18n/po/az.po b/i18n/po/az.po
index 5734a38..47b970c 100644
--- a/i18n/po/az.po
+++ b/i18n/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2016-12-17 13:38+0000\n"
 "Last-Translator: iAZISS <iss-sash at mail.ru>\n"
 "Language-Team: Azerbaijani <az at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:36+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:35+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -22514,6 +22514,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/be.po b/i18n/po/be.po
index 1b20128..127bfaa 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-02-19 15:59+0000\n"
 "Last-Translator: Darafei Praliaskouski <komzpa at gmail.com>\n"
 "Language-Team: Belarusian <i18n at mova.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:37+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:36+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: be\n"
 
@@ -24407,6 +24407,9 @@ msgstr "назіранне"
 msgid "Flagpole"
 msgstr "Флагшток"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Цэхі"
 
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index b91509a..ea591ed 100644
--- a/i18n/po/bg.po
+++ b/i18n/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-05-03 05:56+0000\n"
 "Last-Translator: pl <Unknown>\n"
 "Language-Team: Bulgarian <bg at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:38+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:38+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: bg\n"
 
@@ -22811,6 +22811,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr "Флагщок"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Цех"
 
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index cc254e0..949ab60 100644
--- a/i18n/po/bn.po
+++ b/i18n/po/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2015-04-03 09:24+0000\n"
 "Last-Translator: Md Alamgir <alamgircu at hotmail.com>\n"
 "Language-Team: Bengali <bn at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:37+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:37+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: bn\n"
 
@@ -22518,6 +22518,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/br.po b/i18n/po/br.po
index 484d51c..3945ea5 100644
--- a/i18n/po/br.po
+++ b/i18n/po/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2011-10-17 12:11+0000\n"
 "Last-Translator: Fulup <Unknown>\n"
 "Language-Team: Breton <br at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:38+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:37+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: br\n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index fac28ce..cec1da4 100644
--- a/i18n/po/bs.po
+++ b/i18n/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2012-11-03 23:07+0000\n"
 "Last-Translator: Alen Mahovic <eyeofthestorm at windowslive.com>\n"
 "Language-Team: Bosnian <bs at li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:38+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:37+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: bs\n"
 
@@ -22518,6 +22518,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index 3c0bdab..f2b167b 100644
--- a/i18n/po/ca.po
+++ b/i18n/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-03-14 22:52+0000\n"
 "Last-Translator: Don-vip <Unknown>\n"
 "Language-Team: el_libre - - www.catmidia.cat\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:39+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:38+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: ca\n"
 
@@ -24369,6 +24369,9 @@ msgstr "observació"
 msgid "Flagpole"
 msgstr "Pal de bandera"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Planta industrial"
 
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index 4ca99c6..3c1ef37 100644
--- a/i18n/po/ca at valencia.po
+++ b/i18n/po/ca at valencia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2015-04-25 18:52+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: el_libre - - www.catmidia.cat\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:07+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:08+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: ca at valencia\n"
 
@@ -24096,6 +24096,9 @@ msgstr "observació"
 msgid "Flagpole"
 msgstr "Pal de bandera"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Planta industrial"
 
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 7e8cb7d..02e34f1 100644
--- a/i18n/po/cs.po
+++ b/i18n/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-06-29 12:12+0000\n"
 "Last-Translator: Dalibor Jelínek <launchpad.net at dalibor.cz>\n"
 "Language-Team: Czech <kde-i18n-doc at kde.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:39+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:39+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: cs\n"
 
@@ -24459,6 +24459,9 @@ msgstr "pozorovací"
 msgid "Flagpole"
 msgstr "Vlajkový stožár"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Továrna"
 
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index ace7a32..f71ed55 100644
--- a/i18n/po/cy.po
+++ b/i18n/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2009-07-17 21:45+0000\n"
 "Last-Translator: iggy23 <Unknown>\n"
 "Language-Team: Welsh <cy at li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:03+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:04+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: cy\n"
 
@@ -22516,6 +22516,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/da.po b/i18n/po/da.po
index 71dc6e4..8aa4d6d 100644
--- a/i18n/po/da.po
+++ b/i18n/po/da.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
-"PO-Revision-Date: 2017-06-25 17:43+0000\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"PO-Revision-Date: 2017-07-02 13:03+0000\n"
 "Last-Translator: Jørn <joern.map at gmail.com>\n"
 "Language-Team: Dansk <kde-i18n-doc at kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:40+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:39+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: da_DK\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -22549,10 +22549,10 @@ msgstr "ja"
 
 msgctxt "airmark"
 msgid "Beacon"
-msgstr ""
+msgstr "Radio navigation"
 
 msgid "Navigationaid"
-msgstr ""
+msgstr "Synlig navigation"
 
 msgid "Windsock"
 msgstr "Vindpose"
@@ -24275,7 +24275,7 @@ msgstr "trappeindgang"
 
 msgctxt "entrance"
 msgid "home"
-msgstr ""
+msgstr "privatindgang"
 
 msgid "Entrance number"
 msgstr "Indgangsnummer"
@@ -24298,6 +24298,9 @@ msgstr "observation"
 msgid "Flagpole"
 msgstr "Flagstang"
 
+msgid "Cross"
+msgstr "Kors"
+
 msgid "Works"
 msgstr "Fabrik"
 
@@ -24475,7 +24478,7 @@ msgstr "Fyrtårn"
 
 msgctxt "man_made"
 msgid "Beacon"
-msgstr ""
+msgstr "Sømærke"
 
 msgid "Street Lamp"
 msgstr "Gadelampe"
@@ -27383,7 +27386,7 @@ msgid "View Wikidata page"
 msgstr "Vis Wikidata side"
 
 msgid "View Wikispecies page"
-msgstr ""
+msgstr "Vis Wikispecies side"
 
 msgid "View UNESCO sheet"
 msgstr "Vis UNESCO side"
@@ -27449,7 +27452,7 @@ msgid "View %name% sheet of hospital/home"
 msgstr "Vis %name% side med sygehus/hjem"
 
 msgid "View INSEE explanation of %name% code"
-msgstr ""
+msgstr "Vis INSEE forklaring af %name% kode"
 
 msgid "Get identification card (pdf) for this establishment"
 msgstr "Få identitetskort (pdf) for dette foretagende"
@@ -27779,7 +27782,7 @@ msgid "highway without a reference"
 msgstr "vej uden en reference"
 
 msgid "Unspecific highway type"
-msgstr ""
+msgstr "Uspecifik vej type"
 
 msgid "{0} used with {1}"
 msgstr "{0} bruges med {1}"
diff --git a/i18n/po/de.po b/i18n/po/de.po
index 2115241..280b2f7 100644
--- a/i18n/po/de.po
+++ b/i18n/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-06-25 17:21+0000\n"
 "Last-Translator: Klumbumbus <Unknown>\n"
 "Language-Team: JOSM\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:43+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:43+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: de\n"
 "X-Poedit-SearchPath-0: .\n"
@@ -24871,6 +24871,9 @@ msgstr "Beobachtung"
 msgid "Flagpole"
 msgstr "Fahnenmast"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Fabrik"
 
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index d95fbc2..845667b 100644
--- a/i18n/po/de_DE.po
+++ b/i18n/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2011-07-10 12:32+0000\n"
 "Last-Translator: ralekuja <Unknown>\n"
 "Language-Team: German (Germany) <de_DE at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:06+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:06+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: \n"
 
@@ -22527,6 +22527,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/el.po b/i18n/po/el.po
index c8b9b8b..ad588b0 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2016-01-25 09:17+0000\n"
 "Last-Translator: Aggelos Arnaoutis <angelosarn at hotmail.com>\n"
 "Language-Team: Greek <el at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:44+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:45+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: el\n"
 
@@ -22911,6 +22911,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr "Ιστός"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index 61a4bb3..9eaa599 100644
--- a/i18n/po/en_AU.po
+++ b/i18n/po/en_AU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2015-06-08 12:52+0000\n"
 "Last-Translator: Mark Pulley <mrpulley at lizzy.com.au>\n"
 "Language-Team: English (Australia) <en_AU at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:05+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:05+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: \n"
 
@@ -23488,6 +23488,9 @@ msgstr "observation"
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Works"
 
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index 9425492..10b16ae 100644
--- a/i18n/po/en_CA.po
+++ b/i18n/po/en_CA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2010-09-24 17:25+0000\n"
 "Last-Translator: Johann Beda <Unknown>\n"
 "Language-Team: English (Canada) <en_CA at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:06+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:07+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: \n"
 
@@ -22521,6 +22521,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index 383e620..1dd5ba7 100644
--- a/i18n/po/en_GB.po
+++ b/i18n/po/en_GB.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2016-11-01 11:03+0000\n"
 "Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: German <josm-dev at openstreetmap.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:04+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:05+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: de\n"
 
@@ -23919,6 +23919,9 @@ msgstr "observation"
 msgid "Flagpole"
 msgstr "Flagpole"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Works"
 
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index 369f856..1051735 100644
--- a/i18n/po/eo.po
+++ b/i18n/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2016-09-21 04:23+0000\n"
 "Last-Translator: Yuri Tretyakov <Unknown>\n"
 "Language-Team: Esperanto <eo at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:41+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:40+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: eo\n"
 
@@ -22526,6 +22526,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/es.po b/i18n/po/es.po
index 64f1bd1..a4d172b 100644
--- a/i18n/po/es.po
+++ b/i18n/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-06-30 08:47+0000\n"
 "Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
 "Language-Team: Spanish <es at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:59+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:59+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: es\n"
 "X-Language: es_ES\n"
@@ -24862,6 +24862,9 @@ msgstr "observación"
 msgid "Flagpole"
 msgstr "Mástil de bandera"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Fábrica"
 
diff --git a/i18n/po/et.po b/i18n/po/et.po
index e8f9639..10374fc 100644
--- a/i18n/po/et.po
+++ b/i18n/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-02-23 08:40+0000\n"
 "Last-Translator: Margus Värton <margus at dakar.ee>\n"
 "Language-Team: Estonian <et at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:41+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:41+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: et\n"
 
@@ -22767,6 +22767,9 @@ msgstr "vaatlus"
 msgid "Flagpole"
 msgstr "Lipuvarras"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Tööstushoone"
 
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index 155ea26..c673015 100644
--- a/i18n/po/eu.po
+++ b/i18n/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2015-03-09 16:55+0000\n"
 "Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
 "Language-Team: Basque <eu at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:36+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:36+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: eu\n"
 
@@ -22753,6 +22753,9 @@ msgstr "behaketa"
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Lantokia"
 
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index c5e950f..ed10a0a 100644
--- a/i18n/po/fa.po
+++ b/i18n/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2014-03-18 07:32+0000\n"
 "Last-Translator: Saeed Ghazi Joolaee <Unknown>\n"
 "Language-Team: Persian <fa at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:55+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:55+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: fa\n"
 
@@ -22588,6 +22588,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/fi.po b/i18n/po/fi.po
index 94b0533..f7f30de 100644
--- a/i18n/po/fi.po
+++ b/i18n/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2016-01-19 17:11+0000\n"
 "Last-Translator: Lauri Kytömaa <Unknown>\n"
 "Language-Team: Finnish <fi at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:42+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:42+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: fi\n"
 
@@ -23420,6 +23420,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr "Lipputanko"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Tehdas"
 
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index b06379e..d2b4756 100644
--- a/i18n/po/fil.po
+++ b/i18n/po/fil.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2011-06-19 14:15+0000\n"
 "Last-Translator: Anthony Balico <Unknown>\n"
 "Language-Team: Filipino <fil at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:07+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:07+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: fil\n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/fo.po b/i18n/po/fo.po
index 8e46ede..47799f1 100644
--- a/i18n/po/fo.po
+++ b/i18n/po/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2015-02-28 16:15+0000\n"
 "Last-Translator: LiFo <Unknown>\n"
 "Language-Team: Faroese <fo at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:41+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:41+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -22514,6 +22514,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index f5a3c95..ed02171 100644
--- a/i18n/po/fr.po
+++ b/i18n/po/fr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-06-27 18:40+0000\n"
 "Last-Translator: Don-vip <Unknown>\n"
 "Language-Team: Fr <>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:42+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:43+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: fr\n"
 "X-Poedit-Bookmarks: -1,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
@@ -24504,6 +24504,9 @@ msgstr "observation"
 msgid "Flagpole"
 msgstr "Mât"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Usine"
 
diff --git a/i18n/po/ga.po b/i18n/po/ga.po
index ac3ba57..77144ec 100644
--- a/i18n/po/ga.po
+++ b/i18n/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2015-05-17 11:43+0000\n"
 "Last-Translator: Thorsten <Unknown>\n"
 "Language-Team: Irish <ga at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:44+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:44+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -22514,6 +22514,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index 2b570f2..f0538fb 100644
--- a/i18n/po/gl.po
+++ b/i18n/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2016-01-01 15:11+0000\n"
 "Last-Translator: Marcos Lans <Unknown>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:44+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:44+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: gl\n"
 "X-Poedit-Language: Galician\n"
@@ -23070,6 +23070,9 @@ msgstr "observación"
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Fábrica"
 
diff --git a/i18n/po/he.po b/i18n/po/he.po
index 25c4826..5bb9bd5 100644
--- a/i18n/po/he.po
+++ b/i18n/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-06-04 17:31+0000\n"
 "Last-Translator: SwiftFast <Unknown>\n"
 "Language-Team: Hebrew <he at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:45+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:45+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: he\n"
 
@@ -22558,6 +22558,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/hi.po b/i18n/po/hi.po
index 27c2222..c503092 100644
--- a/i18n/po/hi.po
+++ b/i18n/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2009-11-14 16:28+0000\n"
 "Last-Translator: nipunreddevil <nipunreddevil at gmail.com>\n"
 "Language-Team: Hindi <hi at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:46+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:46+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: hi\n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/hr.po b/i18n/po/hr.po
index 7be75c9..852ed9a 100644
--- a/i18n/po/hr.po
+++ b/i18n/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2016-01-04 15:56+0000\n"
 "Last-Translator: gogo <trebelnik2 at gmail.com>\n"
 "Language-Team: Croatian <hr at li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:58+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:58+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: hr\n"
 
@@ -22665,6 +22665,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index 130cd5a..5002d85 100644
--- a/i18n/po/ht.po
+++ b/i18n/po/ht.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2010-03-11 21:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Haitian; Haitian Creole <ht at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:45+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:45+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: \n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/hu.po b/i18n/po/hu.po
index 5e2047f..0ef456c 100644
--- a/i18n/po/hu.po
+++ b/i18n/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-05-27 22:06+0000\n"
 "Last-Translator: Gábor Babos <Unknown>\n"
 "Language-Team: Hungarian <kde-l10n-hu at kde.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:46+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:46+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: hu\n"
 
@@ -24251,6 +24251,9 @@ msgstr "megfigyelő"
 msgid "Flagpole"
 msgstr "Zászlórúd"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Gyár"
 
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index 0bf5ba1..31b81c4 100644
--- a/i18n/po/hy.po
+++ b/i18n/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2011-04-13 21:51+0000\n"
 "Last-Translator: Gev777 <Unknown>\n"
 "Language-Team: Armenian <hy at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:35+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:34+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: hy\n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/ia.po b/i18n/po/ia.po
index bc8b277..2825569 100644
--- a/i18n/po/ia.po
+++ b/i18n/po/ia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2011-08-29 01:02+0000\n"
 "Last-Translator: Emilio Sepulveda <Unknown>\n"
 "Language-Team: Interlingua <ia at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:47+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:47+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: ia\n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/id.po b/i18n/po/id.po
index 4f832ff..f485a5d 100644
--- a/i18n/po/id.po
+++ b/i18n/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2016-03-10 03:36+0000\n"
 "Last-Translator: Ezagren <ezagren at gmail.com>\n"
 "Language-Team: Indonesian <id at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:47+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:48+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: id\n"
 "X-Language: id_ID\n"
@@ -23601,6 +23601,9 @@ msgstr "pengamatan"
 msgid "Flagpole"
 msgstr "Tiang Bendera"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Kerja"
 
diff --git a/i18n/po/is.po b/i18n/po/is.po
index a9ab865..39bee87 100644
--- a/i18n/po/is.po
+++ b/i18n/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2015-11-06 00:32+0000\n"
 "Last-Translator: Stefán Örvar Sigmundsson <stefan.orvar.sigmundsson at emi.is>\n"
 "Language-Team: Icelandic <is at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:47+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:47+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: is\n"
 
@@ -22567,6 +22567,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/it.po b/i18n/po/it.po
index 4ba4fae..cca0157 100644
--- a/i18n/po/it.po
+++ b/i18n/po/it.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-05-30 06:53+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Italian <talk-it at lists.openstreetmap.org>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:48+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:48+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: it\n"
 "X-Language: it_IT\n"
@@ -24652,6 +24652,9 @@ msgstr "osservazione"
 msgid "Flagpole"
 msgstr "Pennone"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Fabbrica"
 
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index 365e9a7..22257f4 100644
--- a/i18n/po/ja.po
+++ b/i18n/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-06-04 15:25+0000\n"
 "Last-Translator: fujimoto <fujimoto at internet.ne.jp>\n"
 "Language-Team: Japanese <tr at openstreetmap.jp>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:48+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:48+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "X-Poedit-Country: JAPAN\n"
 "Language: ja\n"
@@ -22828,6 +22828,9 @@ msgstr "観察"
 msgid "Flagpole"
 msgstr "旗竿"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "工場"
 
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index 68af0d3..8a648a8 100644
--- a/i18n/po/ka.po
+++ b/i18n/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2011-12-16 00:14+0000\n"
 "Last-Translator: datogogishvili <Unknown>\n"
 "Language-Team: Georgian <ka at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:43+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:43+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: ka\n"
 
@@ -22520,6 +22520,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/km.po b/i18n/po/km.po
index 1ba44b6..64f6862 100644
--- a/i18n/po/km.po
+++ b/i18n/po/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2015-01-27 10:25+0000\n"
 "Last-Translator: Sophea Sok <sksophea at gmail.com>\n"
 "Language-Team: Khmer <km at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:49+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:49+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: \n"
 
@@ -23928,6 +23928,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/ko.po b/i18n/po/ko.po
index 55c6478..b41cd58 100644
--- a/i18n/po/ko.po
+++ b/i18n/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-05-17 08:29+0000\n"
 "Last-Translator: Glados <Unknown>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:49+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:50+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: ko\n"
 
@@ -22543,6 +22543,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/ku.po b/i18n/po/ku.po
index 9d0558f..b4a22f5 100644
--- a/i18n/po/ku.po
+++ b/i18n/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-01-31 19:32+0000\n"
 "Last-Translator: Rokar ✌ <Unknown>\n"
 "Language-Team: Kurdish <ku at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:50+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:50+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -22514,6 +22514,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/ky.po b/i18n/po/ky.po
index fbecceb..7d2aa3f 100644
--- a/i18n/po/ky.po
+++ b/i18n/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2012-12-18 02:36+0000\n"
 "Last-Translator: SimpleLeon <Unknown>\n"
 "Language-Team: Kirghiz <ky at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:49+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:49+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -22514,6 +22514,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/lb.po b/i18n/po/lb.po
index c72c185..d567ee9 100644
--- a/i18n/po/lb.po
+++ b/i18n/po/lb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2016-04-28 18:56+0000\n"
 "Last-Translator: Charel <ceilenbecker at gmail.com>\n"
 "Language-Team: Luxembourgish <lb at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:51+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:52+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -22514,6 +22514,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/lo.po b/i18n/po/lo.po
index 621e008..f84123a 100644
--- a/i18n/po/lo.po
+++ b/i18n/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2009-09-15 10:06+0000\n"
 "Last-Translator: Anousone <Unknown>\n"
 "Language-Team: Lao <lo at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:50+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:50+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: \n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/lt.po b/i18n/po/lt.po
index 9f89a11..4e1ec27 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-06-08 05:32+0000\n"
 "Last-Translator: Aurimas Fišeras <Unknown>\n"
 "Language-Team: Lithuanian <lt at li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:51+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:51+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: lt\n"
 
@@ -23991,6 +23991,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index 18b5c63..33627b2 100644
--- a/i18n/po/lv.po
+++ b/i18n/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2012-10-03 22:16+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Latvian <lv at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:51+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:51+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: lv\n"
 
@@ -22529,6 +22529,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/mk.po b/i18n/po/mk.po
index 8be25bd..cbf22f2 100644
--- a/i18n/po/mk.po
+++ b/i18n/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2013-05-11 04:37+0000\n"
 "Last-Translator: Bojan Jankuloski <bojan.jankuloski at gmail.com>\n"
 "Language-Team: Macedonian <mk at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:52+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:52+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: mk\n"
 
@@ -22519,6 +22519,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/mr.po b/i18n/po/mr.po
index 45835e7..19f4695 100644
--- a/i18n/po/mr.po
+++ b/i18n/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2015-05-24 23:45+0000\n"
 "Last-Translator: Singleton <singleton47+ubuntuone at live.com>\n"
 "Language-Team: Marathi <mr at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:52+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:52+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: mr\n"
 
@@ -22554,6 +22554,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/ms.po b/i18n/po/ms.po
index a1a7a7a..56981fa 100644
--- a/i18n/po/ms.po
+++ b/i18n/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2011-12-11 22:14+0000\n"
 "Last-Translator: abuyop <Unknown>\n"
 "Language-Team: Malay <ms at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:53+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:53+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: ms\n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/nb.po b/i18n/po/nb.po
index 0125316..d076f4f 100644
--- a/i18n/po/nb.po
+++ b/i18n/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-02-21 09:17+0000\n"
 "Last-Translator: Syver Stensholt <sssandum at gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:54+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:54+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: nb\n"
 
@@ -22760,6 +22760,9 @@ msgstr "observasjon"
 msgid "Flagpole"
 msgstr "Flaggstang"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Fabrikk"
 
diff --git a/i18n/po/nds.po b/i18n/po/nds.po
index c8c5ac2..0cea3c0 100644
--- a/i18n/po/nds.po
+++ b/i18n/po/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2009-11-29 09:01+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: German, Low <nds at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:53+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:53+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: \n"
 
@@ -22514,6 +22514,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index 703bb16..a1db0a9 100644
--- a/i18n/po/nl.po
+++ b/i18n/po/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
-"PO-Revision-Date: 2017-06-13 15:45+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"PO-Revision-Date: 2017-07-02 11:29+0000\n"
+"Last-Translator: DiGro <Unknown>\n"
 "Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:40+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:40+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: nl\n"
 
@@ -5578,10 +5578,11 @@ msgid " ({0})"
 msgstr " ({0})"
 
 msgid "<h2>Filter active: {0}</h2>"
-msgstr ""
+msgstr "<h2>Actieve filter: {0}</h2>"
 
 msgid "</p><p>Click again on filter button to see all objects.</p></html>"
 msgstr ""
+"</p><p>Klik opnieuw op de knop Filter om alle objecten te zien.</p></html>"
 
 msgid "Enlarge"
 msgstr "Vergroten"
@@ -11970,10 +11971,10 @@ msgid "Display discardable keys"
 msgstr "Geef de te missen sleutels weer"
 
 msgid "Use auto filters"
-msgstr ""
+msgstr "Autofilters gebruiken"
 
 msgid "Rule"
-msgstr ""
+msgstr "Regel"
 
 msgid "Highlight target ways and nodes"
 msgstr "Accentueer doelwegen en -knopen"
@@ -12047,6 +12048,8 @@ msgstr ""
 msgid ""
 "Display buttons to automatically filter numeric values of a predefined tag"
 msgstr ""
+"Geef knoppen weer om automatisch numerieke waarden van een vooraf "
+"gedefinieerde tag te filteren"
 
 msgid "Options that affect drawing performance"
 msgstr "Opties die de uitvoering van het tekenen beïnvloeden"
@@ -17724,7 +17727,7 @@ msgid "South Tyrol Orthofoto 2014"
 msgstr "Zuid-Tirol luchtfoto 2014"
 
 msgid "South Tyrol Orthofoto 2014/2015"
-msgstr ""
+msgstr "South Tyrol Orthofoto 2014/2015"
 
 msgid "South Tyrol Topomap"
 msgstr "Zuid Tirol Topomap"
@@ -23055,10 +23058,10 @@ msgstr "ja"
 
 msgctxt "airmark"
 msgid "Beacon"
-msgstr ""
+msgstr "Baken"
 
 msgid "Navigationaid"
-msgstr ""
+msgstr "Navigatiehulp"
 
 msgid "Windsock"
 msgstr "Windvaan"
@@ -24781,7 +24784,7 @@ msgstr "trap"
 
 msgctxt "entrance"
 msgid "home"
-msgstr ""
+msgstr "huis"
 
 msgid "Entrance number"
 msgstr "Ingang nr:"
@@ -24804,6 +24807,9 @@ msgstr "observatie"
 msgid "Flagpole"
 msgstr "Vlaggenmast"
 
+msgid "Cross"
+msgstr "Kruis"
+
 msgid "Works"
 msgstr "Fabriek"
 
@@ -24981,7 +24987,7 @@ msgstr "Vuurtoren"
 
 msgctxt "man_made"
 msgid "Beacon"
-msgstr ""
+msgstr "Baken"
 
 msgid "Street Lamp"
 msgstr "Straatlantaarn"
@@ -29122,10 +29128,10 @@ msgid "{0} downloaded images"
 msgstr ""
 
 msgid "{0} images in total"
-msgstr ""
+msgstr "{0} totaal aantal afbeeldingen"
 
 msgid "{0} images in {1} sequences"
-msgstr ""
+msgstr "{0} afbeeldingen in {1} reeksen"
 
 msgid "Mapillary object layer"
 msgstr "Mapillary objectenlaag"
@@ -29181,16 +29187,16 @@ msgid "Submit the current changeset to Mapillary"
 msgstr "De huidige wijzigingenset naar Mapillary indienen"
 
 msgid "rejected"
-msgstr ""
+msgstr "afgewezen"
 
 msgid "pending"
 msgstr "afwachtend"
 
 msgid "approved"
-msgstr ""
+msgstr "goedgekeurd"
 
 msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
+msgstr "{0} afbeeldingen ingediend, Sleutel wijzigingenset: {1}, Status: {2}"
 
 msgid "Changeset upload failed with {0} error ''{1} {2}''!"
 msgstr "Uploaden van wijzigingenset mislukt met {0} fout ''{1} {2}''!"
@@ -29392,7 +29398,7 @@ msgid "Cut off sequences at download bounds"
 msgstr "Snijd reeksen af op de randen van de download"
 
 msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
+msgstr "Experimentele bèta-mogelijkheden inschakelen (kunnen onstabiel zijn)"
 
 msgid "Download mode"
 msgstr "Modus Downloaden"
@@ -29428,16 +29434,17 @@ msgid "Go forward"
 msgstr "Naar voren gaan"
 
 msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
+msgstr "Welke afbeeldingslagen wilt u importeren in de laag van Mapillary?"
 
 msgid "Import"
 msgstr "Importeren"
 
 msgid "Could not import a geotagged image to the Mapillary layer!"
 msgstr ""
+"Kon geen afbeelding met geoverwijzingen importeren in de laag van Mapillary!"
 
 msgid "{0} ({1} images)"
-msgstr ""
+msgstr "{0} ({1} afbeeldingen)"
 
 msgid ""
 "From which source do you want to import images to the Mapillary layer?"
@@ -34643,10 +34650,10 @@ msgid "Repeat last fix"
 msgstr "Laatste reparatie herhalen"
 
 msgid "Do you want to make the roundabout round?"
-msgstr ""
+msgstr "Wilt u de rotonde rond maken?"
 
 msgid "Roundabout round"
-msgstr ""
+msgstr "Ronde rotonde"
 
 msgid "Do you want to download referrers of platforms and stop positions?"
 msgstr "Wilt u verwijzingen naar platformen halteposities downloaden?"
@@ -34725,6 +34732,8 @@ msgid ""
 "PT: Route gaps can decrease by sorting members. Further validations will be "
 "required"
 msgstr ""
+"PT: Gaten in route kunnen verminderen bij sorteren van leden. Nadere "
+"specificaties zijn vereist"
 
 msgid "PT: Relation member roles do not match tags"
 msgstr "PT: Rol van het lid van de relatie komt niet overene met de tags"
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index 98a80db..af72cd7 100644
--- a/i18n/po/nn.po
+++ b/i18n/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2009-07-15 12:49+0000\n"
 "Last-Translator: Skippern <Unknown>\n"
 "Language-Team: Norwegian Nynorsk <nn at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:53+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:54+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: nn\n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/oc.po b/i18n/po/oc.po
index 29b4c82..9e4a645 100644
--- a/i18n/po/oc.po
+++ b/i18n/po/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2012-10-03 22:14+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary at yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:54+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:54+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: \n"
 
@@ -22524,6 +22524,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/pa.po b/i18n/po/pa.po
index d485fff..7713e4e 100644
--- a/i18n/po/pa.po
+++ b/i18n/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2011-05-06 15:52+0000\n"
 "Last-Translator: A S Alam <aalam at users.sf.net>\n"
 "Language-Team: Punjabi <pa at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:55+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:55+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: pa\n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index dd28518..ec69f53 100644
--- a/i18n/po/pl.po
+++ b/i18n/po/pl.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
-"PO-Revision-Date: 2017-06-23 01:33+0000\n"
-"Last-Translator: Daniel Koć <daniel at xn--ko-wla.pl>\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"PO-Revision-Date: 2017-07-02 12:21+0000\n"
+"Last-Translator: Piotr Sokół <Unknown>\n"
 "Language-Team: polski <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:55+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:56+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: pl\n"
 "X-Poedit-Bookmarks: 1098,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
@@ -91,7 +91,7 @@ msgid "Initializing internal traffic data"
 msgstr "Inicjowanie wewnętrznych danych o kierunku ruchu"
 
 msgid "Initializing validator"
-msgstr "Inicjowanie walidatora"
+msgstr "Inicjowanie weryfikatora"
 
 msgid "Initializing presets"
 msgstr "Inicjowanie szablonów"
@@ -2780,7 +2780,7 @@ msgstr ""
 "przynajmniej 3 linie"
 
 msgid "objects having 5 to 10 tags"
-msgstr "obiekty mające od 5 do 10 tagów"
+msgstr "obiekty mające od 5 do 10 znaczników"
 
 msgid "objects with given role in a relation"
 msgstr "obiekty w ustaloną rolą w relacji"
@@ -2987,7 +2987,7 @@ msgid "Removed obsolete tags"
 msgstr "Usunięte przestarzałe znaczniki"
 
 msgid "Fix deprecated tags"
-msgstr "Napraw nieaktualne tagi"
+msgstr "Napraw nieaktualne znaczniki"
 
 msgid ""
 "<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
@@ -3383,7 +3383,7 @@ msgid "Roles in relations referring to"
 msgstr "Role w relacjach odnoszących się do"
 
 msgid "Automatic tag correction"
-msgstr "Automatyczna korekcja tagów"
+msgstr "Automatyczna korekcja znaczników"
 
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr "Nie można utworzyć katalogu {0}, automatyczny zapis bedzie wyłaczony"
@@ -3760,9 +3760,9 @@ msgstr[2] "<p><b>{0}</b> obiektów ukrytych"
 
 msgid "<b>{0}</b> object disabled"
 msgid_plural "<b>{0}</b> objects disabled"
-msgstr[0] "<b>{0}</b> obiekt wyłączony"
-msgstr[1] "<b>{0}</b> obiekty wyłączone"
-msgstr[2] "<b>{0}</b> obiektów wyłączonych"
+msgstr[0] "Wyłączono <b>{0}</b> obiekt"
+msgstr[1] "Wyłączono <b>{0}</b> obiekty"
+msgstr[2] "Wyłączono <b>{0}</b> obiektów"
 
 msgid "Cannot add a way with only {0} nodes."
 msgstr "Nie można dodać linii zawierającej tylko {0} węzłów."
@@ -4083,10 +4083,10 @@ msgid "E-mail address contains an invalid domain: {0}"
 msgstr "Adres e-mail zawiera nieprawidłową domenę: {0}"
 
 msgid "Email validator"
-msgstr "kontroler adresu poczty elektronicznej"
+msgstr "Weryfikator adresu poczty elektronicznej"
 
 msgid "URL is invalid"
-msgstr "URL jest nieprawidłowy"
+msgstr "Adres URL jest nieprawidłowy"
 
 msgid "URL contains an invalid protocol: {0}"
 msgstr "Adres URL zawiera nieprawidłowy protokół: {0}"
@@ -4104,7 +4104,7 @@ msgid "URL contains an invalid fragment: {0}"
 msgstr "Adres URL zawiera nieprawidłowy fragment: {0}"
 
 msgid "URL validator"
-msgstr "kontroler adresu URL"
+msgstr "Weryfikator adresu URL"
 
 msgid "Addresses"
 msgstr "Adresy"
@@ -4160,7 +4160,7 @@ msgid "Coastlines"
 msgstr "Linie brzegowe"
 
 msgid "This test checks that coastlines are correct."
-msgstr "Ten test sprawdza czy linie brzegowe są poprawne."
+msgstr "Sprawdza czy linie brzegowe są prawidłowe."
 
 msgid "Reversed coastline: land not on left side"
 msgstr "Odwrócona linia wybrzeża: ląd nie znajduje się po lewej stronie"
@@ -4178,10 +4178,10 @@ msgid "invalid coastline"
 msgstr "nieważna linia brzegowa"
 
 msgid "Conditional Keys"
-msgstr "Klucze Warunkowe"
+msgstr "Klucze warunkowe"
 
 msgid "Tests for the correct usage of ''*:conditional'' tags."
-msgstr "Test na właściwe użycie znaczników „*:conditional”."
+msgstr "Sprawdza prawidłowe użycie znaczników „*:conditional”."
 
 msgid "Does not match pattern ''restriction value @ condition''"
 msgstr "Nie pasuje do wzorca „wartość ograniczenia @ warunek\""
@@ -4214,23 +4214,23 @@ msgid "Crossing barriers"
 msgstr "Przecinające się przeszkody"
 
 msgid "Self crossing"
-msgstr ""
+msgstr "Linie krzyżujące się same ze sobą"
 
 msgid "Self-crossing ways"
-msgstr "Linie przecinające same siebie"
+msgstr "Linie krzyżujące się same ze sobą"
 
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
 msgstr ""
-"Ten test sprawdza czy dwie drogi, tory, rzeki lub budynki przecinają się, "
-"ale nie są połączone węzłem."
+"Sprawdza, czy dwie drogi, tory, rzeki lub budynki przecinają się na tej "
+"samej warstwie, ale nie są połączone węzłem."
 
 msgid "Duplicated nodes"
 msgstr "Powielone węzły"
 
 msgid "This test checks that there are no nodes at the very same location."
-msgstr "Ten test sprawdza czy nie ma węzłów, które mają tę samą pozycję."
+msgstr "Sprawdza, czy nie ma węzłów w tym samym położeniu."
 
 msgid "Mixed type duplicated nodes"
 msgstr "Powielone węzły różnego rodzaju"
@@ -4263,7 +4263,7 @@ msgid "Other duplicated nodes"
 msgstr "Powielone węzły (inne)"
 
 msgid "Nodes at same position"
-msgstr "Węzły w tym samym miejscu"
+msgstr "Węzły w tym samym położeniu"
 
 msgid "Duplicated relations"
 msgstr "Powielone relacje"
@@ -4272,8 +4272,8 @@ msgid ""
 "This test checks that there are no relations with same tags and same members "
 "with same roles."
 msgstr ""
-"Ten test sprawdza czy nie istnieją relacje z takimi samymi tagami i "
-"posiadające tych samych członków z identycznymi rolami."
+"Sprawdza czy nie istnieją relacje z takimi samymi znacznikami i członkami o "
+"identycznych rolach."
 
 msgid "Relations with same members"
 msgstr "Relacje z tymi samymi członkami"
@@ -4288,8 +4288,8 @@ msgid ""
 "This test checks that there are no ways with same node coordinates and "
 "optionally also same tags."
 msgstr ""
-"Ten test sprawdza czy nie istnieją linie z tymi samymi węzłami i opcjonalnie "
-"z tymi samymi tagami."
+"Sprawdza, czy istnieją linie z tymi samymi węzłami i opcjonalnie z tymi "
+"samymi znacznikami."
 
 msgid "Ways with same position"
 msgstr "Linie z tą samą pozycją"
@@ -4337,7 +4337,7 @@ msgid "Lane tags"
 msgstr "Znaczniki pasów jezdni"
 
 msgid "Test that validates ''lane:'' tags."
-msgstr "Test sprawdzający znaczniki „lane:”."
+msgstr "Sprawdza znaczniki „lane:”."
 
 msgid "Number of {0} greater than {1}"
 msgstr "Liczba {0} większa niż {1}"
@@ -4358,7 +4358,7 @@ msgid "Long segments"
 msgstr "Długie segmenty"
 
 msgid "This tests for long way segments, which are usually errors."
-msgstr "Test sprawdzający długie odcinki linii, które zwykle są błędem."
+msgstr "Sprawdza długie odcinki linii, które zwykle są błędem."
 
 msgid "Very long segment of {0} kilometers"
 msgstr "Bardzo długi segment o długości {0} kilometrów"
@@ -4367,10 +4367,10 @@ msgid "Tag checker (MapCSS based)"
 msgstr "Walidator znaczników (bazujący na MapCSS)"
 
 msgid "This test checks for errors in tag keys and values."
-msgstr "Ten test szuka błędów w kluczach i wartościach."
+msgstr "Wyszukuje błędy w kluczach i wartościach znaczników."
 
 msgid "Unable to replace argument {0} in {1}: {2}"
-msgstr "Nie można zamienić argumentu {0} w {1}: {2}"
+msgstr "Nie można zastąpić argumentu {0} w {1}: {2}"
 
 msgid "Fix of {0}"
 msgstr "Poprawka {0}"
@@ -4382,22 +4382,22 @@ msgid "{0}, use {1} instead"
 msgstr "{0}, użyj {1} w zamian"
 
 msgid "Adding {0} to tag checker"
-msgstr "Dodawanie {0} do walidatora tagów"
+msgstr "Dodawanie {0} do walidatora znaczników"
 
 msgid "Failed to add {0} to tag checker"
-msgstr "Bład dodawania {0} do walidatora tagów"
+msgstr "Nie udało się dodać {0} do walidatora znaczników"
 
 msgid "Multipolygon"
 msgstr "Wielokąt złożony"
 
 msgid "This test checks if multipolygons are valid."
-msgstr "Ten test sprawdza czy wielokąty złożone są poprawne."
+msgstr "Sprawdza czy wielokąty złożone są prawidłowe."
 
 msgid "Area style way is not closed"
 msgstr "Niezamknięty obszar"
 
 msgid "No outer way for boundary"
-msgstr ""
+msgstr "Brak zewnętrznej linii granicy"
 
 msgid "No outer way for multipolygon"
 msgstr "Brak zewnętrznej linii wielokąta złożonego"
@@ -4444,10 +4444,10 @@ msgid "Multipolygon rings share node(s)"
 msgstr "Pierścienie wielokąta złożonego współdzielą węzły"
 
 msgid "Intersection between multipolygon ways"
-msgstr "Linie wielokąta złożonego przecinają się"
+msgstr "Linie wielokąta złożonego krzyżują się"
 
 msgid "Multipolygon rings are equal"
-msgstr ""
+msgstr "Pierścienie wielokąta złożonego są równe"
 
 msgid "Role for ''{0}'' should be ''{1}''"
 msgstr "Rola dla „{0}” powinna być „{1}”"
@@ -4478,7 +4478,7 @@ msgid "Multipolygon member(s) repeated with same role"
 msgstr "Członek relacji powtórzony z tą samą rolą"
 
 msgid "Missing name:* translation"
-msgstr "Brakujące tłumaczenie tagów name:*"
+msgstr "Brakujące tłumaczenie znaczników name:*"
 
 msgid ""
 "This test finds multilingual objects whose ''name'' attribute is not equal "
@@ -4501,10 +4501,10 @@ msgid "Opening hours syntax"
 msgstr "Składnia godzin otwarcia"
 
 msgid "This test checks the correct usage of the opening hours syntax."
-msgstr "Ten test sprawdza poprawne użycie składni w godzinach otwarcia."
+msgstr "Sprawdza poprawne użycie składni w godzinach otwarcia."
 
 msgid "opening_hours value can be prettified"
-msgstr "wartość opening_hours może być upiększona"
+msgstr "wartość opening_hours może być ulepszona"
 
 msgid "Unexpected token:"
 msgstr "Nieoczekiwany token:"
@@ -4567,10 +4567,11 @@ msgstr "Linie energetyczne"
 msgid ""
 "Checks for nodes in power lines that do not have a power=tower/pole tag."
 msgstr ""
-"Sprawdzanie czy węzły na liniach energetycznych mają tagi power=tower/pole."
+"Sprawdzanie czy węzły na liniach energetycznych mają znaczniki "
+"power=tower/pole."
 
 msgid "Missing power tower/pole within power line"
-msgstr "Brakuje tagów power=tower/pole na linii energetycznej"
+msgstr "Brakuje znaczników power=tower/pole na linii energetycznej"
 
 msgid "Public Transport Route"
 msgstr "Trasa pojazdów transportu publicznego"
@@ -4622,7 +4623,7 @@ msgid "Role ''{0}'' unknown in templates ''{1}''"
 msgstr "Rola „{0}” nieznana w szablonach „{1}”"
 
 msgid "Empty role type found when expecting one of ''{0}''"
-msgstr ""
+msgstr "Odnaleziono pustą rolę zamiast oczekiwanej „{0}”"
 
 msgid "Role ''{0}'' missing"
 msgstr "Brakująca rola „{0}”"
@@ -4638,8 +4639,7 @@ msgstr "Linie przecinające same siebie"
 
 msgid ""
 "This test checks for ways that contain some of their nodes more than once."
-msgstr ""
-"Ten test sprawdza czy linia zawiera niektóre węzły więcej niż jeden raz."
+msgstr "Sprawdza, czy linie zawierają niektóre węzły więcej niż jeden raz."
 
 msgid "Similarly named ways"
 msgstr "Podobnie nazwane linie"
@@ -4647,28 +4647,28 @@ msgstr "Podobnie nazwane linie"
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr ""
-"Ten test wyszukuje linie o podobnych nazwach - podejrzenie błędu w nazwie."
+"Wyszukuje linie o podobnych nazwach, które mogły zostać przeinaczone."
 
 msgid "Tag checker"
-msgstr "Walidator znaczników"
+msgstr "Weryfikator znaczników"
 
 msgid "Adding {0} to ignore tags"
-msgstr "Dodawanie {0} do ignorowania tagów"
+msgstr "Dodawanie {0} do ignorowania znaczników"
 
 msgid "Invalid tagchecker line - {0}: {1}"
-msgstr "Nieprawidłowa linia w tagchecker - {0}: {1}"
+msgstr "Nieprawidłowy wiersz w weryfikatorze znaczników - {0}: {1}"
 
 msgid "Invalid spellcheck line: {0}"
-msgstr "Nieprawidłowa linia w słowniku: {0}"
+msgstr "Nieprawidłowy wiersz w słowniku: {0}"
 
 msgid "Adding {0} to spellchecker"
-msgstr "Dodawanie {0} to sprawdzacza pisowni"
+msgstr "Dodawanie {0} do modułu sprawdzania pisowni"
 
 msgid ""
 "Could not access data file(s):\n"
 "{0}"
 msgstr ""
-"Niedostępny plik(i) danych:\n"
+"Nie można uzyskać dostępu do plików danych:\n"
 "{0}"
 
 msgid "Suspicious tag/value combinations"
@@ -4705,7 +4705,7 @@ msgid "Property values contain HTML entity"
 msgstr "Wartość zawiera kody HTML"
 
 msgid "Misspelled property key"
-msgstr "Błędny klucz podmiotu"
+msgstr "Błędny klucz własności"
 
 msgid "Key ''{0}'' looks like ''{1}''."
 msgstr "Klucz „{0}” wygląda jak „{1}”."
@@ -4717,7 +4717,7 @@ msgid "Key ''{0}'' not in presets."
 msgstr "Klucz „{0}” nie występuje w szablonach"
 
 msgid "Misspelled property value"
-msgstr "Literówka w podanej wartości"
+msgstr "Literówka w wartości własności"
 
 msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
 msgstr "Wartość „{0}” dla klucza „{1}” przypomina „{2}”."
@@ -4729,41 +4729,41 @@ msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Wartość „{0}” dla klucza „{1}” nie występuje w szablonach."
 
 msgid "FIXMES"
-msgstr "DO POPRAWKI"
+msgstr "DO POPRAWY"
 
 msgid "Check property keys."
-msgstr "Sprawdź klucze właściwości."
+msgstr "Sprawdzanie kluczy własności"
 
 msgid "Validate that property keys are valid checking against list of words."
-msgstr "Sprawdź czy klucze właściwości są w zaakceptowanej liście słów."
+msgstr "Sprawdza, czy klucze własności są na zaakceptowanej liście słów."
 
 msgid "Use complex property checker."
-msgstr "Użyj kontrolera poprawności dla złożonych własności."
+msgstr "Sprawdzanie poprawności złożonych własności"
 
 msgid "Validate property values and tags using complex rules."
-msgstr "Zastosuj złożone reguły do sprawdzenia wartości i tagów."
+msgstr ""
+"Stosuje złożone reguły do sprawdzenia wartości własności i znaczników."
 
 msgid "TagChecker source"
-msgstr "źródło danych dla kontrolera tagów (TagChecker)"
+msgstr "Źródło danych weryfikatora znaczników"
 
 msgid "Data sources ({0})"
-msgstr "Źródło danych ({0})"
+msgstr "Źródła danych ({0})"
 
 msgid "Check property values."
-msgstr "Sprawdź wartości właściwości."
+msgstr "Sprawdzenie wartości własności"
 
 msgid "Validate that property values are valid checking against presets."
-msgstr ""
-"Sprawdzenie czy wartości właściwości odpowiadają zaleceniom (presets)."
+msgstr "Sprawdza, czy wartości własności są zgodne z szablonami"
 
 msgid "Check for FIXMES."
-msgstr "Wyszukaj FIXME"
+msgstr "Wyszukanie obiektów DO POPRAWY"
 
 msgid "Looks for nodes or ways with FIXME in any property value."
-msgstr "Wyszukaj węzły i linie z „FIXME” w dowolnej właściwości."
+msgstr "Wyszukuje węzły i linie z ciągiem „FIXME” w dowolnej wartości."
 
 msgid "Fix tags"
-msgstr "Napraw tagi"
+msgstr "Napraw znaczniki"
 
 msgid "Could not find element type"
 msgstr "Nie znaleziono typu elementu"
@@ -4784,7 +4784,7 @@ msgid "Turnrestrictions"
 msgstr "Ograniczenia skrętu"
 
 msgid "This test checks if turnrestrictions are valid."
-msgstr "Ten test sprawdza poprawość ograniczeń skrętu"
+msgstr "Sprawdza poprawność ograniczeń skrętu"
 
 msgid "Unknown role"
 msgstr "Nieznana rola"
@@ -5561,10 +5561,12 @@ msgid " ({0})"
 msgstr " ({0})"
 
 msgid "<h2>Filter active: {0}</h2>"
-msgstr ""
+msgstr "<h2>Aktywny filtr: {0}</h2>"
 
 msgid "</p><p>Click again on filter button to see all objects.</p></html>"
 msgstr ""
+"</p><p>Proszę kliknąć przycisk filtra, aby wyświetlić wszystkie "
+"obiekty.</p></html>"
 
 msgid "Enlarge"
 msgstr "Przybliż"
@@ -5689,10 +5691,10 @@ msgid "Conflict foreground: drop tag"
 msgstr "Konfilkt pierwszego planu: wrzuć tag"
 
 msgid "Conflict background: keep all tags"
-msgstr "Konfilkt tła: zachowaj wszystkie tagi"
+msgstr "Konfilkt tła: zachowaj wszystkie znaczniki"
 
 msgid "Conflict foreground: keep all tags"
-msgstr "Konfilkt pierwszego planu: zachowaj wszystkie tagi"
+msgstr "Konfilkt pierwszego planu: zachowaj wszystkie znaczniki"
 
 msgid "Conflict background: sum all numeric tags"
 msgstr ""
@@ -5946,9 +5948,9 @@ msgstr[2] "Znaczniki ({0} konfliktów)"
 
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} konflikt z tagiem oczekuje na rozwiązanie"
-msgstr[1] "{0} konflikty z tagami oczekuje na rozwiązanie"
-msgstr[2] "{0} konfliktów z tagami oczekuje na rozwiązanie"
+msgstr[0] "{0} konflikt znaczników oczekuje na rozwiązanie"
+msgstr[1] "{0} konflikty znaczników oczekują na rozwiązanie"
+msgstr[2] "{0} konfliktów znaczników oczekuje na rozwiązanie"
 
 msgid "Nodes(resolved)"
 msgstr "Węzły(rozwiązane)"
@@ -6641,7 +6643,7 @@ msgid "F"
 msgstr "Z"
 
 msgid "<h2>Filter active</h2>"
-msgstr "<h2>Filtr aktywny</h2>"
+msgstr "<h2>Aktywny filtr</h2>"
 
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6699,7 +6701,7 @@ msgid "In changeset: "
 msgstr "W zestawie zmian: "
 
 msgid "Tags: "
-msgstr "Tagi: "
+msgstr "znaczniki: "
 
 msgid "Centroid: "
 msgstr "Środek: "
@@ -6937,7 +6939,7 @@ msgid "Move the selected entry one row down."
 msgstr "Przenosi zaznaczony wpis o jeden wiersz w dół."
 
 msgid "Move the selected entry one row up."
-msgstr "Przenieś zaznaczony wpis o jeden wiersz do góry."
+msgstr "Przenosi zaznaczony wpis o jeden wiersz do góry."
 
 msgid "Reload from file"
 msgstr "Wczytaj ponownie z pliku"
@@ -7320,7 +7322,8 @@ msgstr "Własne zestawy zmian"
 
 msgid "Download my changesets from the OSM server (max. 100 changesets)"
 msgstr ""
-"Pobiera moje zestawy zmian z serwera OSM (maksymalnie 100 zestawów zmian)"
+"Pobiera zestawy zmian użytkownika z serwera OSM (maksymalnie 100 zestawów "
+"zmian)"
 
 msgid ""
 "<html>JOSM is currently running with an anonymous user. It cannot "
@@ -7347,7 +7350,7 @@ msgid "ID"
 msgstr "Identyfikator"
 
 msgid "Open"
-msgstr "Otwarte"
+msgstr "Otwórz"
 
 msgid "User"
 msgstr "Użytkownik"
@@ -8068,7 +8071,7 @@ msgid "to add first suggestion without closing the dialog"
 msgstr "- zastosuj pierwszą podpowiedź bez zamykania okienka"
 
 msgid "Please enter the number of recently added tags to display"
-msgstr "Podaj liczbę wyświetlanych ostatnio dodanych tagów"
+msgstr "Podaj liczbę wyświetlanych ostatnio dodanych znaczników"
 
 msgid "Please enter integer number between 0 and {0}"
 msgstr "Podaj liczbę całkowitą od 0 do {0}"
@@ -10290,7 +10293,7 @@ msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "zdjęć z pozycją geograficzną w danych exif ({0}/{1})"
 
 msgid "Images that are already tagged ({0}/{1})"
-msgstr "zdjęć mających już tagi ({0}/{1})"
+msgstr "zdjęć mających już znaczniki ({0}/{1})"
 
 msgid "Show Thumbnail images on the map"
 msgstr "Pokaż miniaturki zdjęć na mapie"
@@ -10400,15 +10403,15 @@ msgstr[2] "Wczytano {0} obrazów."
 
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} posiadał tagi GPS."
-msgstr[1] "{0} posiadały tagi GPS."
-msgstr[2] "{0} posiadało tagi GPS."
+msgstr[0] "{0} posiadał znaczniki GPS."
+msgstr[1] "{0} posiadały znaczniki GPS."
+msgstr[2] "{0} posiadało znaczniki GPS."
 
 msgid "{0} has updated GPS data."
 msgid_plural "{0} have updated GPS data."
 msgstr[0] "{0} zawiera zaktualizowane dane GPS."
 msgstr[1] "{0} zawierają zaktualizowane dane GPS."
-msgstr[2] "{0} zawierają zaktualizowane dane GPS."
+msgstr[2] "{0} zawiera zaktualizowane dane GPS."
 
 msgid "Delete image file from disk"
 msgstr "Usuń plik ze zdjęciem z dysku"
@@ -11355,7 +11358,7 @@ msgid "Preset definition file (*.xml, *.zip)"
 msgstr "Pliki definicji szablonu (*.xml, *.zip)"
 
 msgid "Tag checker rule (*.validator.mapcss, *.zip)"
-msgstr "Reguła walidatora znaczników (*.validator mapcss, *.zip)"
+msgstr "Reguła weryfikatora znaczników (*.validator mapcss, *.zip)"
 
 msgid "Edit source entry:"
 msgstr "Edycja wpisu źródła:"
@@ -11741,10 +11744,10 @@ msgid "Display discardable keys"
 msgstr "Porzucone klucze znaczników"
 
 msgid "Use auto filters"
-msgstr ""
+msgstr "Automatyczne filtrowanie"
 
 msgid "Rule"
-msgstr ""
+msgstr "Reguła"
 
 msgid "Highlight target ways and nodes"
 msgstr "Podświetlanie docelowych linii i węzłów"
@@ -12318,7 +12321,7 @@ msgid "Available default entries:"
 msgstr "Wpisy dostępne domyślnie:"
 
 msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
-msgstr ""
+msgstr "Nowe domyślne wpisy można dodać na stronie <a href=\"{0}\">Wiki</a>."
 
 msgid "Selected entries:"
 msgstr "Wybrane wpisy:"
@@ -12330,10 +12333,10 @@ msgid "Remove entry"
 msgstr "Usuń wpis"
 
 msgid "copy selected defaults"
-msgstr "skopiuj zaznaczone wartości domyślne"
+msgstr "Kopiuje zaznaczone domyślne wpisy"
 
 msgid "Please select at least one row to copy."
-msgstr "Wybierz co najmniej jeden wiersz do skopiowania."
+msgstr "Proszę wybrać co najmniej jeden wiersz do skopiowania."
 
 msgid "Menu Name"
 msgstr "Nazwa w menu"
@@ -12345,7 +12348,7 @@ msgid "Menu Name (Default)"
 msgstr "Nazwa w menu (domyślna)"
 
 msgid "Imagery URL (Default)"
-msgstr "URL podkładu (domyślne)"
+msgstr "Adres URL podkładu (domyślne)"
 
 msgid "EULA license URL not available: {0}"
 msgstr "Adres URL licencji EULA nie jest dostępny: {0}"
@@ -12446,7 +12449,7 @@ msgid "Configure whether to create backup files"
 msgstr "Konfiguruje kiedy tworzyć pliki kopii zapasowej"
 
 msgid "Enable built-in icon defaults"
-msgstr "Pozwól na wbudowane domyślne ikony"
+msgstr "Wbudowane domyślne ikony"
 
 msgid "Available styles:"
 msgstr "Dostępne style:"
@@ -12874,16 +12877,16 @@ msgid "Projection method"
 msgstr "Rodzaj odwzorowania kartograficznego"
 
 msgid "Set as default"
-msgstr ""
+msgstr "Ustaw jako domyślne"
 
 msgid "Default projection"
-msgstr ""
+msgstr "Domyślne odwzorowanie"
 
 msgid "Default projection has been set to ''{0}''"
-msgstr ""
+msgstr "Ustalono „{0}” jako domyślne odwzorowanie"
 
 msgid "Display coordinates as"
-msgstr "Wyświetlaj współrzędne jako"
+msgstr "Wyświetlanie współrzędnych jako"
 
 msgid "System of measurement"
 msgstr "System miar"
@@ -13296,7 +13299,7 @@ msgid "Active rules:"
 msgstr "Aktywne reguły:"
 
 msgid "Add a new rule by entering filename or URL"
-msgstr "Dodaj nową regułę podając nazwę pliku lub adres URL"
+msgstr "Dodaje nową regułę za pomocą pliku lub adresu URL"
 
 msgid "New rule entry:"
 msgstr "Nowa reguła:"
@@ -13325,6 +13328,7 @@ msgstr ""
 
 msgid "Warning: illegal format of entry in rule list ''{0}''. Got ''{1}''"
 msgstr ""
+"Ostrzeżenie: niewłaściwy format wpisu na liście reguł „{0}”. Jest „{1}”."
 
 msgid "Checks for errors on addresses"
 msgstr "Szuka błędów w adresowaniu"
@@ -13393,7 +13397,7 @@ msgid "Tag checker rules"
 msgstr "Reguły weryfikacji"
 
 msgid "Choose Tag checker rules to enable"
-msgstr ""
+msgstr "Włącza wskazane reguły weryfikacji znaczników"
 
 msgid "Use ignore list."
 msgstr "Używanie listy ignorowanych"
@@ -13409,7 +13413,7 @@ msgid "Use the error layer to display problematic elements."
 msgstr "Wyświetla problematyczne elementy na oddzielnej warstwie."
 
 msgid "Show informational level."
-msgstr "Poziom informacyjny."
+msgstr "Poziom informacyjny"
 
 msgid "Show the informational tests."
 msgstr "Wyświetla testy informacyjne."
@@ -13418,7 +13422,7 @@ msgid "Show informational level on upload."
 msgstr "Poziom informacyjny podczas wysyłania"
 
 msgid "Show the informational tests in the upload check windows."
-msgstr ""
+msgstr "Wyświetla testy informacyjne w oknie wysyłania."
 
 msgid "On demand"
 msgstr "Na życzenie"
@@ -13430,15 +13434,16 @@ msgid "Tests"
 msgstr "Testowanie"
 
 msgid "Choose tests to enable"
-msgstr "Wybierz które testy mają być aktywne"
+msgstr "Włącza wskazane testy"
 
 msgid "multiple"
 msgstr "wielokrotny"
 
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Usuń przestarzałe klucze z {0} obiektu"
+msgstr[1] "Usuń przestarzałe klucze z {0} obiektów"
+msgstr[2] "Usuń przestarzałe klucze z {0} obiektów"
 
 msgid "Delete the selection in the tag table"
 msgstr "Usuwa zaznaczone znaczniki"
@@ -13663,13 +13668,13 @@ msgstr ""
 "całkowitą >0"
 
 msgid "Add a new source to the list."
-msgstr "Dodaj do listy nowe źródło."
+msgstr "Dodaje do listy nowe źródło"
 
 msgid "Edit the selected source."
-msgstr "Edytuj wybrane źródło."
+msgstr "Edytuje wybrane źródło"
 
 msgid "Delete the selected source from the list."
-msgstr "Usuń z listy wybrane źródło."
+msgstr "Usuwa z listy wybrane źródło"
 
 msgid ""
 "The current value is not a valid OSM ID. Please enter an integer value > 0"
@@ -14492,7 +14497,7 @@ msgid "Add tags to selected objects"
 msgstr "Dodaj znaczniki do wybranych obiektów"
 
 msgid "Add selected tags"
-msgstr "Dodaj zaznaczone tagi"
+msgstr "Dodaj zaznaczone znaczniki"
 
 msgid "Add all tags"
 msgstr "Dodaj wszystkie znaczniki"
@@ -14501,7 +14506,7 @@ msgid "Add checked tags to selected objects"
 msgstr ""
 
 msgid "Shift+Enter: Add all tags to selected objects"
-msgstr "Shift+Enter: Dodaj wszystkie tagi do wybranych obiektów"
+msgstr "Shift+Enter: Dodaj wszystkie znaczniki do wybranych obiektów"
 
 msgid "Enable the checkbox to accept the value"
 msgstr "Zaznacz pole wyboru, aby zaakceptować wartość"
@@ -18571,7 +18576,7 @@ msgid ""
 msgstr ""
 
 msgid "Tools for drawing buildings."
-msgstr "Narzedzie do rysowania budynków."
+msgstr "Dostarcza narzędzie do rysowania budynków."
 
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
@@ -18602,7 +18607,7 @@ msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
 msgid "Downloads new data when you pan/zoom"
-msgstr ""
+msgstr "Pobiera nowe dany podczas przesuwania lub przybliżania widoku."
 
 msgid "Create a grid of ways."
 msgstr "Twórz siatki linii."
@@ -18626,21 +18631,20 @@ msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
 "openstreetmap.org."
 msgstr ""
-"Ta wtyczka bezpośrednio wysyła ślady GPS z aktywnej warstwy JOSM do "
-"openstreetmap.org."
+"Wysyła bezpośrednio ślady GPS z aktywnej warstwy JOSM do openstreetmap.org."
 
 msgid "Downloads OSM data along a way"
-msgstr "Pobiera dane z OSM znajdujące się wzdłuż linii."
+msgstr "Pobiera dane OSM znajdujące się wzdłuż linii."
 
 msgid "Dxf Import"
-msgstr ""
+msgstr "Importuje pliki Dxf"
 
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
 msgstr ""
 "Pozwala użytkownikom na anonimizowanie znaczników czasu i szybkie usunięcie "
-"części ogromnych  śladów GPX."
+"części ogromnych śladów GPX."
 
 msgid ""
 "Provides the EJML library for other JOSM plugins. Not meant to be installed "
@@ -18648,19 +18652,19 @@ msgid ""
 msgstr ""
 
 msgid "Shows the elevation profile and some statistical data of a GPX track."
-msgstr "Pokazuje profil wysokości i pewne dane statystyczne śladu GPX."
+msgstr "Wyświetlas profil wysokości i pewne dane statystyczne śladu GPX."
 
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr ""
 
 msgid "Use external scripts in JOSM"
-msgstr "Używaj zewnętrznych skryptów w JOSM"
+msgstr "Używa zewnętrznych skryptów w JOSM"
 
 msgid "Fast drawing ways by mouse"
-msgstr "Szybkie rysowanie linii myszką."
+msgstr "Umożliwia szybkie rysowanie linii za pomocą myszy."
 
 msgid "Finds and fixes invalid street addresses in a comfortable way."
-msgstr "W wygodny sposób znajduje i naprawia nieprawidłowe adresy."
+msgstr "Wyszukuje i naprawia nieprawidłowe adresy w wygodny sposób."
 
 msgid ""
 "Talk with users editing the map nearby, be notified when someone comes close."
@@ -18681,6 +18685,8 @@ msgstr ""
 msgid ""
 "Analyse a set of GPS points to obtain its centre and direction of spread."
 msgstr ""
+"Analizuje zestaw punktów GPS w celu wyznaczenia ich linii środkowej i "
+"kieruneku rozrzutu."
 
 msgid "Allows to filter out unnecessary GPS tracks"
 msgstr "Pozwala na odfiltrowanie niepotrzebnych śladów GPS."
@@ -18718,7 +18724,7 @@ msgid "Plugin for importing spatial referenced images"
 msgstr ""
 
 msgid "Import vector graphics (SVG)"
-msgstr "Importuj grafikę gektorową (SVG)"
+msgstr "Importuje grafikę wektorową (SVG)"
 
 msgid ""
 "Extends ImproveWayAccuracy mode with helpers to place nodes at accurate "
@@ -18800,8 +18806,8 @@ msgstr ""
 
 msgid "Allows to attribute tags to all objects in any selected area at once"
 msgstr ""
-"Pozwala na dodanie tagów do atrybutów wszystkich wybranych obiektów w danym "
-"obszarze na raz."
+"Pozwala na dodanie znaczników do atrybutów wszystkich wybranych obiektów w "
+"danym obszarze na raz."
 
 msgid "NanoLog adjustment and browsing layer"
 msgstr ""
@@ -18841,7 +18847,7 @@ msgid ""
 "Bring in errors from Osm Inspector and display it on the current JOSM "
 "bounding box"
 msgstr ""
-"Pobierz listę błędów z serwisu Osm Inspector i wyświetl je w bieżącym "
+"Pobiera listę błędów z serwisu Osm Inspector i wyświetl je w bieżącym "
 "obszarze edycji JOSM"
 
 msgid ""
@@ -18850,10 +18856,10 @@ msgid ""
 msgstr ""
 
 msgid "Import/export OSM data in PBF format"
-msgstr "Import/eksport danych OSM w formacie PBF"
+msgstr "Importuje/eksportuje dane OSM w formacie PBF"
 
 msgid "Import PDF file and convert to ways."
-msgstr "Importuj plik PDF i zamień na linie."
+msgstr "Importuje pliki PDF i konwertuje na linie."
 
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -18867,8 +18873,8 @@ msgid ""
 "This plugin allows to display any picture as a background in the editor and "
 "align it with the map."
 msgstr ""
-"Ta wtyczka pozwala na wyświetlanie dowolnych obrazów jako tło w edytorze i "
-"wyrównanie ich względem mapy."
+"Wyświetla dowolne obrazy jako podkład w edytorze i umożliwia wyrównanie ich "
+"względem mapy."
 
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
@@ -18891,11 +18897,10 @@ msgstr ""
 
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
-msgstr "Ta wtyczka upraszcza mapowanie i edycję tras transportu publicznego."
+msgstr "Upraszcza mapowanie i edycję tras transportu publicznego."
 
 msgid "Displays stops of selected public transport routes as graph"
-msgstr ""
-"Wyświetlaj przystanki wybranych tras transportu publicznego jako graf"
+msgstr "Wyświetla przystanki wybranych tras transportu publicznego jako graf"
 
 msgid ""
 "The RasterFiltersPlugin allows to choose and apply some images'' filters to "
@@ -18906,7 +18911,7 @@ msgid "Relation and multipolygon creating and editing panel."
 msgstr "Panel edycji oraz tworzenia relacji/wielokątów złożonych"
 
 msgid "Plugin for reverting changesets"
-msgstr "Wtyczka umożliwiająca odwracanie opublikowanych zmian."
+msgstr "Umożliwia wycofanie opublikowanych zmian."
 
 msgid ""
 "Expand a simple intersection to a roundabout in gradual steps. Select an "
@@ -19001,7 +19006,7 @@ msgid ""
 "Traces buildings and other shapes from a map. Needs Tracer2Server to be "
 "running."
 msgstr ""
-"Automatycznie rysuje ślady budynków i innych kształtów z mapy. Wymaga "
+"Przerysowuje kształty budynków i innych obiektów z mapy. Wymaga "
 "uruchomionego Tracer2Server."
 
 msgid "Plugin to digital sign OSM-Data"
@@ -19025,7 +19030,7 @@ msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 msgid "Several utilities that make your life easier."
-msgstr "Kilka narzędzi upraszczających korzystanie z JOSM"
+msgstr "Udostępnia kilka narzędzi ułatwiających korzystanie z programu."
 
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -23922,6 +23927,9 @@ msgstr "obserwacyjna"
 msgid "Flagpole"
 msgstr "Maszt (dla flagi)"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Zakład produkcyjny"
 
@@ -27127,7 +27135,7 @@ msgid "natural water used for swimming pool"
 msgstr "naturalny zbiornik wodny użyty do oznaczenia basenu"
 
 msgid "sport without physical feature"
-msgstr "sport bez tagów opisujących miejsce"
+msgstr "sport bez znaczników opisujących miejsce"
 
 msgid "alternative name without {0}"
 msgstr "alternatywna nazwa bez {0}"
@@ -27980,7 +27988,7 @@ msgid "Assign to"
 msgstr "Przypisz do"
 
 msgid "Remove all address tags"
-msgstr "Usuń wszystkie tagi adresu"
+msgstr "Usuń wszystkie znaczniki adresu"
 
 msgid "No name"
 msgstr "Brak nazwy"
@@ -28073,7 +28081,7 @@ msgid ""
 "according tag."
 msgstr ""
 "Próbuje zgadnąć adres poprzez użycie nazwy najbliższego obiektu z "
-"odpowiednim tagiem."
+"odpowiednim znacznikiem."
 
 msgid "Guessing address values"
 msgstr "Zgaduje wartości adresu"
@@ -33915,7 +33923,7 @@ msgid "Roadsign tagging"
 msgstr "Tagowanie znaków drogowych"
 
 msgid "Add tags by clicking on road signs"
-msgstr "Dodaje do drogi tagi znaków drogowych"
+msgstr "Dodaje do drogi znaczniki znaków drogowych"
 
 msgid "Roadsigns plugin: open dialog"
 msgstr ""
@@ -35168,7 +35176,7 @@ msgid "Edit basic attributes of a turn restriction"
 msgstr "Edytuj podstawowe atrybuty ograniczenia skrętu"
 
 msgid "Edit the raw tags and members of this turn restriction"
-msgstr "Edytuj bezpośrednio tagi i członków tego ograniczenia skrętu"
+msgstr "Edytuj bezpośrednio znaczniki i członków tego ograniczenia skrętu"
 
 msgid "Errors/Warnings"
 msgstr "Błędy/Uwagi"
@@ -35960,7 +35968,7 @@ msgid "Duplicate tags from the first"
 msgstr ""
 
 msgid "Set tags for multiple objects"
-msgstr "Dodaj tagi dla wielu obiektów"
+msgstr "Dodaj znaczniki dla wielu obiektów"
 
 msgid "Delete from history"
 msgstr "Usuwa z historii"
@@ -36388,7 +36396,7 @@ msgstr "Dodaj nazwy z Wikipedii"
 
 msgid ""
 "Fetches interwiki links from Wikipedia in order to add several name tags"
-msgstr "Pobiera z Wikipedii linki interwiki w celu dodanie kilku tagów"
+msgstr "Pobiera z Wikipedii linki interwiki w celu dodanie kilku znaczników"
 
 msgid ""
 "Copies the {0} template to the system clipboard instantiated with the "
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index 6e65d89..8f28c61 100644
--- a/i18n/po/pt.po
+++ b/i18n/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-04-07 16:38+0000\n"
 "Last-Translator: Rui <xande6ruz at yandex.com>\n"
 "Language-Team: Portuguese <pt at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:56+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:56+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: pt\n"
 
@@ -24514,6 +24514,9 @@ msgstr "observação"
 msgid "Flagpole"
 msgstr "Mastro de Bandeira"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Área industrial / Fábrica"
 
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index f399be2..50e4f80 100644
--- a/i18n/po/pt_BR.po
+++ b/i18n/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-05-20 04:47+0000\n"
 "Last-Translator: Nelson A. de Oliveira <naoliv at debian.org>\n"
 "Language-Team: Português Brasileiro <gnome-pt_br-list at gnome.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:04+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:04+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: pt_BR\n"
 
@@ -24265,6 +24265,9 @@ msgstr "observação"
 msgid "Flagpole"
 msgstr "Mastro de bandeira"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Fábrica"
 
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index b112b18..714af88 100644
--- a/i18n/po/rm.po
+++ b/i18n/po/rm.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2009-06-21 19:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Raeto-Romance <rm at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n !=1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:56+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:56+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: \n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/ro.po b/i18n/po/ro.po
index 11041df..83e07ef 100644
--- a/i18n/po/ro.po
+++ b/i18n/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2015-02-24 11:34+0000\n"
 "Last-Translator: Ciprian <c1pr1an_43v3r at yahoo.com>\n"
 "Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:57+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:57+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "X-Poedit-Country: ROMANIA\n"
 "Language: ro\n"
@@ -22578,6 +22578,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index 1adf4c3..6e3642f 100644
--- a/i18n/po/ru.po
+++ b/i18n/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
-"PO-Revision-Date: 2017-06-28 09:55+0000\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"PO-Revision-Date: 2017-07-02 05:09+0000\n"
 "Last-Translator: Aleksey Kabanov <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg at gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:57+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:57+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: ru_RU\n"
 
@@ -24707,6 +24707,9 @@ msgstr "наблюдение"
 msgid "Flagpole"
 msgstr "Флагшток"
 
+msgid "Cross"
+msgstr "Крест"
+
 msgid "Works"
 msgstr "Цеха"
 
diff --git a/i18n/po/sk.po b/i18n/po/sk.po
index 557befa..ae978e2 100644
--- a/i18n/po/sk.po
+++ b/i18n/po/sk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-06-30 21:37+0000\n"
 "Last-Translator: aceman444 <Unknown>\n"
 "Language-Team: Slovak <>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:58+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:59+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: sk\n"
 
@@ -24359,6 +24359,9 @@ msgstr "pozorovateľňa"
 msgid "Flagpole"
 msgstr "Vlajkový stožiar"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Závody (továrne)"
 
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index 17bb7e6..8c0981c 100644
--- a/i18n/po/sl.po
+++ b/i18n/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2015-11-07 17:38+0000\n"
 "Last-Translator: Joško Horvat <Unknown>\n"
 "Language-Team: Slovenian <sl at li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
 "n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:59+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:59+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: sl\n"
 
@@ -22579,6 +22579,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/sq.po b/i18n/po/sq.po
index 7a1f39e..98fdd77 100644
--- a/i18n/po/sq.po
+++ b/i18n/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2011-11-04 19:43+0000\n"
 "Last-Translator: StefanPrifti <Unknown>\n"
 "Language-Team: FLOSS Kosova\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:34+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:33+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: \n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/sr.po b/i18n/po/sr.po
index e95de17..4e4509b 100644
--- a/i18n/po/sr.po
+++ b/i18n/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2015-02-01 15:30+0000\n"
 "Last-Translator: Slobodan Simić <Unknown>\n"
 "Language-Team: Serbian <sr at li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-01 04:57+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 04:58+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: sr\n"
 
@@ -22517,6 +22517,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/sv.po b/i18n/po/sv.po
index 8f57140..7d143d6 100644
--- a/i18n/po/sv.po
+++ b/i18n/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-02-22 12:40+0000\n"
 "Last-Translator: Erik <Unknown>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:00+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:00+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: sv\n"
 
@@ -23163,6 +23163,9 @@ msgstr "observation"
 msgid "Flagpole"
 msgstr "Flaggstång"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Fabrik"
 
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index 5b9abb9..5c608f3 100644
--- a/i18n/po/ta.po
+++ b/i18n/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-06-06 01:06+0000\n"
 "Last-Translator: Stephane <Unknown>\n"
 "Language-Team: Tamil <ta at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:00+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:00+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "X-Poedit-Country: INDIA\n"
 "Language: ta\n"
@@ -22554,6 +22554,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/te.po b/i18n/po/te.po
index 48d2b2e..5199720 100644
--- a/i18n/po/te.po
+++ b/i18n/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2011-05-13 08:50+0000\n"
 "Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
 "Language-Team: Telugu <te at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:00+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:01+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: te\n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/th.po b/i18n/po/th.po
index 2c2c639..f9a2af2 100644
--- a/i18n/po/th.po
+++ b/i18n/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2009-03-23 02:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Thai <th at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:01+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:01+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: th\n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/tr.po b/i18n/po/tr.po
index 31e7613..295b91b 100644
--- a/i18n/po/tr.po
+++ b/i18n/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-02-06 01:25+0000\n"
 "Last-Translator: Ferhad Fidan <ferhad at f-blog.info>\n"
 "Language-Team: Türkçe <>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:01+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:02+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: \n"
 
@@ -22620,6 +22620,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Tesis"
 
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index 1e19b36..d9d7d88 100644
--- a/i18n/po/ug.po
+++ b/i18n/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2012-07-14 16:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Uyghur <ug at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:02+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: \n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/uk.po b/i18n/po/uk.po
index 4aa87b3..1700afe 100644
--- a/i18n/po/uk.po
+++ b/i18n/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-06-25 14:54+0000\n"
 "Last-Translator: andygol <Unknown>\n"
 "Language-Team: Ukrainian <uk at li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:03+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: uk\n"
 
@@ -24616,6 +24616,9 @@ msgstr "спостереження"
 msgid "Flagpole"
 msgstr "Флагшток"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Заводи"
 
diff --git a/i18n/po/ur.po b/i18n/po/ur.po
index 569e7c3..3d2bc6f 100644
--- a/i18n/po/ur.po
+++ b/i18n/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2010-05-13 04:15+0000\n"
 "Last-Translator: Shoaib Mirza <Unknown>\n"
 "Language-Team: Urdu <ur at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:03+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:03+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: ur\n"
 
@@ -22515,6 +22515,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/vi.po b/i18n/po/vi.po
index 4324ce3..ef9395e 100644
--- a/i18n/po/vi.po
+++ b/i18n/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2015-05-14 20:17+0000\n"
 "Last-Translator: Mạnh <laituanmanh32 at gmail.com>\n"
 "Language-Team: Vietnamese <vi at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:03+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:03+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: vi\n"
 
@@ -23783,6 +23783,9 @@ msgstr "quan sát"
 msgid "Flagpole"
 msgstr "Cột cờ"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "Làm việc"
 
diff --git a/i18n/po/wae.po b/i18n/po/wae.po
index 99aae96..a65e3c5 100644
--- a/i18n/po/wae.po
+++ b/i18n/po/wae.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2016-03-09 22:17+0000\n"
 "Last-Translator: Simon Legner <Unknown>\n"
 "Language-Team: Walser <wae at li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:07+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:07+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -22514,6 +22514,9 @@ msgstr ""
 msgid "Flagpole"
 msgstr ""
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr ""
 
diff --git a/i18n/po/zh_CN.po b/i18n/po/zh_CN.po
index c170779..16636c7 100644
--- a/i18n/po/zh_CN.po
+++ b/i18n/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2016-10-23 14:49+0000\n"
 "Last-Translator: mmyfl <Unknown>\n"
 "Language-Team: 汉语 <>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:05+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:06+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: zh_CN\n"
 
@@ -22619,6 +22619,9 @@ msgstr "观测"
 msgid "Flagpole"
 msgstr "旗杆"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "工厂"
 
diff --git a/i18n/po/zh_TW.po b/i18n/po/zh_TW.po
index 44484f0..74bc274 100644
--- a/i18n/po/zh_TW.po
+++ b/i18n/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 21:39+0200\n"
+"POT-Creation-Date: 2017-07-03 01:33+0200\n"
 "PO-Revision-Date: 2017-04-30 22:15+0000\n"
 "Last-Translator: Wayne Su <Unknown>\n"
 "Language-Team: Traditional Chinese\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-01 05:05+0000\n"
+"X-Launchpad-Export-Date: 2017-07-03 05:05+0000\n"
 "X-Generator: Launchpad (build 18419)\n"
 "Language: zh_TW\n"
 
@@ -22560,6 +22560,9 @@ msgstr "觀測"
 msgid "Flagpole"
 msgstr "旗杆"
 
+msgid "Cross"
+msgstr ""
+
 msgid "Works"
 msgstr "作品"
 
diff --git a/images/presets/landmark/cross.svg b/images/presets/landmark/cross.svg
new file mode 100644
index 0000000..90f3ba0
--- /dev/null
+++ b/images/presets/landmark/cross.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10"
+   height="16"
+   viewBox="0 0 10 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.0 r15299"
+   sodipodi:docname="01.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="24.296875"
+     inkscape:cx="2.6330947"
+     inkscape:cy="8.1240404"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     viewbox-height="16">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1037.3622)">
+    <rect
+       style="opacity:1;fill:#a05a2c;fill-opacity:1;stroke:none;stroke-width:1.29499996;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4483"
+       width="2"
+       height="16.000017"
+       x="4"
+       y="1037.3622"
+       ry="1.7382812e-005" />
+    <rect
+       style="opacity:1;fill:#a05a2c;fill-opacity:1;stroke:none;stroke-width:1.29499996;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4485"
+       width="10"
+       height="2.0000174"
+       x="0"
+       y="1040.3622" />
+  </g>
+</svg>
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
index f68284c..7c451ff 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
@@ -153,8 +153,6 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
     private String langName;
     /** whether this is a entry activated by default or not */
     private boolean defaultEntry;
-    /** The data part of HTTP cookies header in case the service requires cookies to work */
-    private String cookies;
     /** Whether this service requires a explicit EULA acceptance before it can be activated */
     private String eulaAcceptanceRequired;
     /** type of the imagery servics - WMS, TMS, ... */
@@ -841,15 +839,6 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
     }
 
     /**
-     * Return the data part of HTTP cookies header in case the service requires cookies to work
-     * @return the cookie data part
-     */
-    @Override
-    public String getCookies() {
-        return this.cookies;
-    }
-
-    /**
      * Gets the pixel per degree value
      * @return The ppd value.
      */
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
index 21d0265..6556c8b 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -1300,8 +1300,8 @@ public class StyledMapRenderer extends AbstractMapRenderer {
                     double dist = interval - (inLineOffset % interval);
 
                     while (dist < segmentLength) {
-                        appenOnewayPath(onewayReversed, start, nx, ny, dist, 3d, onewayArrowsCasing);
-                        appenOnewayPath(onewayReversed, start, nx, ny, dist, 2d, onewayArrows);
+                        appendOnewayPath(onewayReversed, start, nx, ny, dist, 3d, onewayArrowsCasing);
+                        appendOnewayPath(onewayReversed, start, nx, ny, dist, 2d, onewayArrows);
                         dist += interval;
                     }
                 }
@@ -1317,7 +1317,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
         displaySegments(path, orientationArrows, onewayArrows, onewayArrowsCasing, color, line, dashes, dashedColor);
     }
 
-    private static void appenOnewayPath(boolean onewayReversed, MapViewPoint p1, double nx, double ny, double dist,
+    private static void appendOnewayPath(boolean onewayReversed, MapViewPoint p1, double nx, double ny, double dist,
             double onewaySize, Path2D onewayPath) {
         // scale such that border is 1 px
         final double fac = -(onewayReversed ? -1 : 1) * onewaySize * (1 + sinPHI) / (sinPHI * cosPHI);
diff --git a/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java b/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
index 952a338..5ba4a42 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
@@ -159,7 +159,7 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
     /**
      * Constants used in the transformation.
      */
-    private double b, e;
+    private double b, g;
 
     /**
      * Convenience value equal to {@code a} / {@link #b}.
@@ -248,8 +248,8 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
                 f = -f;
             }
         }
-        e = f += d;
-        e = f * Math.pow(tsfn(latCenter, sinph0), b);
+        g = f += d;
+        g = f * Math.pow(tsfn(latCenter, sinph0), b);
 
         /*
          * Computes the constants that depend on the "twoPoint" vs "azimuth" case. In the
@@ -287,9 +287,9 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
              */
             final double h = Math.pow(tsfn(lat1, Math.sin(lat1)), b);
             final double l = Math.pow(tsfn(lat2, Math.sin(lat2)), b);
-            final double fp = e / h;
+            final double fp = g / h;
             final double p = (l - h) / (l + h);
-            double j = e * e;
+            double j = g * g;
             j = (j - l * h) / (j + l * h);
             double diff = lon1 - lon2;
             if (diff < -Math.PI) {
@@ -378,7 +378,7 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
     public double[] project(double y, double x) {
         double u, v;
         if (Math.abs(Math.abs(y) - Math.PI/2.0) > EPSILON) {
-            double q = e / Math.pow(tsfn(y, Math.sin(y)), b);
+            double q = g / Math.pow(tsfn(y, Math.sin(y)), b);
             double temp = 1.0 / q;
             double s = 0.5 * (q - temp);
             double v2 = Math.sin(b * x);
@@ -419,7 +419,7 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
                 0.0};
         } else {
             return new double[] {
-                cphi2(Math.pow(e / Math.sqrt((1. + up) / (1. - up)), 1.0 / b)), //calculate t
+                cphi2(Math.pow(g / Math.sqrt((1. + up) / (1. - up)), 1.0 / b)), //calculate t
                 -Math.atan2(sp * cosgamma0 - vp * singamma0, Math.cos(bra * u)) / b};
         }
     }
diff --git a/src/org/openstreetmap/josm/gui/draw/MapViewPath.java b/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
index a94fdcb..9754ea7 100644
--- a/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
+++ b/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
@@ -405,7 +405,7 @@ public class MapViewPath extends MapPath2D {
          */
         ClampingPathVisitor(MapViewRectangle clip, double strokeOffset, double strokeLength, PathSegmentConsumer consumer) {
             this.clip = clip;
-            this.strokeProgress = Math.max(strokeLength - strokeOffset, 0);
+            this.strokeProgress = Math.min(strokeLength - strokeOffset, 0);
             this.strokeLength = strokeLength;
             this.consumer = consumer;
         }
diff --git a/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java b/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
index efa71fd..4a0c092 100644
--- a/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
+++ b/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
@@ -46,7 +46,6 @@ import org.openstreetmap.josm.gui.widgets.MultiSplitLayout.Node;
  * @author Hans Muller - SwingX
  */
 public class MultiSplitPane extends JPanel {
-    private transient AccessibleContext accessibleContext;
     private boolean continuousLayout = true;
     private transient DividerPainter dividerPainter = new DefaultDividerPainter();
 
diff --git a/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java b/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
index 0c84d53..bea3809 100644
--- a/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
+++ b/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
@@ -42,7 +42,7 @@ public class QuadStateCheckBox extends JCheckBox {
         PARTIAL
     }
 
-    private final transient QuadStateDecorator model;
+    private final transient QuadStateDecorator cbModel;
     private State[] allowed;
 
     /**
@@ -59,7 +59,7 @@ public class QuadStateCheckBox extends JCheckBox {
         super.addMouseListener(new MouseAdapter() {
             @Override public void mousePressed(MouseEvent e) {
                 grabFocus();
-                model.nextState();
+                cbModel.nextState();
             }
         });
         // Reset the keyboard action map
@@ -68,14 +68,14 @@ public class QuadStateCheckBox extends JCheckBox {
             @Override
             public void actionPerformed(ActionEvent e) {
                 grabFocus();
-                model.nextState();
+                cbModel.nextState();
             }
         });
         map.put("released", null);
         SwingUtilities.replaceUIActionMap(this, map);
         // set the model to the adapted model
-        model = new QuadStateDecorator(getModel());
-        setModel(model);
+        cbModel = new QuadStateDecorator(getModel());
+        setModel(cbModel);
         setState(initial);
     }
 
@@ -100,7 +100,7 @@ public class QuadStateCheckBox extends JCheckBox {
      * @param propertyText a description for the modelled property
      */
     public final void setPropertyText(final String propertyText) {
-        model.setPropertyText(propertyText);
+        cbModel.setPropertyText(propertyText);
     }
 
     /**
@@ -108,7 +108,7 @@ public class QuadStateCheckBox extends JCheckBox {
      * @param state The new state
      */
     public final void setState(State state) {
-        model.setState(state);
+        cbModel.setState(state);
     }
 
     /**
@@ -116,7 +116,7 @@ public class QuadStateCheckBox extends JCheckBox {
      * @return The current state
      */
     public State getState() {
-        return model.getState();
+        return cbModel.getState();
     }
 
     @Override
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index 21feefa..713cb1f 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -1324,6 +1324,10 @@ node[man_made=flagpole] {
     icon-image: "presets/misc/flag.svg";
     set icon_z17;
 }
+node[man_made=cross] {
+    icon-image: "presets/landmark/cross.svg";
+    set icon_z17;
+}
 node[man_made=gasometer] {
     icon-image: "presets/landmark/gasometer.svg";
     set icon_z17;
diff --git a/test/data/renderer/way-dashes/data.osm b/test/data/renderer/way-dashes/data.osm
index 47465a7..c19928e 100644
--- a/test/data/renderer/way-dashes/data.osm
+++ b/test/data/renderer/way-dashes/data.osm
@@ -1,88 +1,103 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <osm version='0.6' upload='never' generator='JOSM'>
-  <node id='-30552' action='modify' visible='true' lat='0.1' lon='0.1' />
-  <node id='-30554' action='modify' visible='true' lat='0.15' lon='0.3' />
-  <node id='-30556' action='modify' visible='true' lat='0.1' lon='0.5' />
-  <node id='-30558' action='modify' visible='true' lat='0.1' lon='0.7' />
-  <node id='-30560' action='modify' visible='true' lat='0.1' lon='0.9' />
-  <node id='-30562' action='modify' visible='true' lat='0.3' lon='0.1' />
-  <node id='-30564' action='modify' visible='true' lat='0.35' lon='0.3' />
-  <node id='-30566' action='modify' visible='true' lat='0.3' lon='0.5' />
-  <node id='-30568' action='modify' visible='true' lat='0.3' lon='0.7' />
-  <node id='-30570' action='modify' visible='true' lat='0.3' lon='0.9' />
-  <node id='-30572' action='modify' visible='true' lat='0.5' lon='0.1' />
-  <node id='-30574' action='modify' visible='true' lat='0.55' lon='0.3' />
-  <node id='-30576' action='modify' visible='true' lat='0.5' lon='0.5' />
-  <node id='-30578' action='modify' visible='true' lat='0.5' lon='0.7' />
-  <node id='-30580' action='modify' visible='true' lat='0.5' lon='0.9' />
-  <node id='-30582' action='modify' visible='true' lat='0.7' lon='0.1' />
-  <node id='-30584' action='modify' visible='true' lat='0.75' lon='0.3' />
-  <node id='-30586' action='modify' visible='true' lat='0.7' lon='0.5' />
-  <node id='-30588' action='modify' visible='true' lat='0.7' lon='0.7' />
-  <node id='-30590' action='modify' visible='true' lat='0.7' lon='0.9' />
-  <node id='-30592' action='modify' visible='true' lat='0.9' lon='0.1' />
-  <node id='-30594' action='modify' visible='true' lat='0.95' lon='0.3' />
-  <node id='-30596' action='modify' visible='true' lat='0.9' lon='0.5' />
-  <node id='-30598' action='modify' visible='true' lat='0.9' lon='0.7' />
-  <node id='-30600' action='modify' visible='true' lat='0.9' lon='0.9' />
-  <way id='-30626' action='modify' visible='true'>
-    <nd ref='-30600' />
-    <nd ref='-30598' />
+  <node id='-38146' action='modify' lat='0.1' lon='0.1' />
+  <node id='-38148' action='modify' lat='0.15' lon='0.3' />
+  <node id='-38150' action='modify' lat='0.1' lon='0.5' />
+  <node id='-38152' action='modify' lat='0.1' lon='0.7' />
+  <node id='-38154' action='modify' lat='0.1' lon='0.9' />
+  <node id='-38156' action='modify' lat='0.3' lon='0.1' />
+  <node id='-38158' action='modify' lat='0.35' lon='0.3' />
+  <node id='-38160' action='modify' lat='0.3' lon='0.5' />
+  <node id='-38162' action='modify' lat='0.3' lon='0.7' />
+  <node id='-38164' action='modify' lat='0.3' lon='0.9' />
+  <node id='-38166' action='modify' lat='0.5' lon='0.1' />
+  <node id='-38168' action='modify' lat='0.55' lon='0.3' />
+  <node id='-38170' action='modify' lat='0.5' lon='0.5' />
+  <node id='-38172' action='modify' lat='0.5' lon='0.7' />
+  <node id='-38174' action='modify' lat='0.5' lon='0.9' />
+  <node id='-38176' action='modify' lat='0.7' lon='0.1' />
+  <node id='-38178' action='modify' lat='0.75' lon='0.3' />
+  <node id='-38180' action='modify' lat='0.7' lon='0.5' />
+  <node id='-38182' action='modify' lat='0.7' lon='0.7' />
+  <node id='-38184' action='modify' lat='0.7' lon='0.9' />
+  <node id='-38186' action='modify' lat='0.9' lon='0.1' />
+  <node id='-38188' action='modify' lat='0.95' lon='0.3' />
+  <node id='-38190' action='modify' lat='0.9' lon='0.5' />
+  <node id='-38192' action='modify' lat='0.9' lon='0.7' />
+  <node id='-38194' action='modify' lat='0.9' lon='0.9' />
+  <node id='-38242' action='modify' lat='0.2993788257' lon='-0.49438751221' />
+  <node id='-38243' action='modify' lat='0.38452134447' lon='0.01098358154' />
+  <node id='-38245' action='modify' lat='0.41473301158' lon='0.51910125732' />
+  <node id='-38247' action='modify' lat='0.40923998953' lon='0.99700653076' />
+  <node id='-38249' action='modify' lat='0.27465989777' lon='1.13982879639' />
+  <node id='-38294' action='modify' lat='-0.3048664203' lon='1.31011688232' />
+  <way id='-38196' action='modify'>
+    <nd ref='-38194' />
+    <nd ref='-38192' />
     <tag k='highlight' v='yes' />
     <tag k='test' v='style5' />
   </way>
-  <way id='-30629' action='modify' visible='true'>
-    <nd ref='-30590' />
-    <nd ref='-30588' />
+  <way id='-38198' action='modify'>
+    <nd ref='-38184' />
+    <nd ref='-38182' />
     <tag k='highlight' v='yes' />
     <tag k='test' v='style4' />
   </way>
-  <way id='-30630' action='modify' visible='true'>
-    <nd ref='-30580' />
-    <nd ref='-30578' />
+  <way id='-38200' action='modify'>
+    <nd ref='-38174' />
+    <nd ref='-38172' />
     <tag k='highlight' v='yes' />
     <tag k='test' v='style3' />
   </way>
-  <way id='-30631' action='modify' visible='true'>
-    <nd ref='-30570' />
-    <nd ref='-30568' />
+  <way id='-38202' action='modify'>
+    <nd ref='-38164' />
+    <nd ref='-38162' />
     <tag k='highlight' v='yes' />
     <tag k='test' v='style2' />
   </way>
-  <way id='-30632' action='modify' visible='true'>
-    <nd ref='-30560' />
-    <nd ref='-30558' />
+  <way id='-38204' action='modify'>
+    <nd ref='-38154' />
+    <nd ref='-38152' />
     <tag k='highlight' v='yes' />
     <tag k='test' v='style1' />
   </way>
-  <way id='-30638' action='modify' visible='true'>
-    <nd ref='-30596' />
-    <nd ref='-30594' />
-    <nd ref='-30592' />
+  <way id='-38206' action='modify'>
+    <nd ref='-38190' />
+    <nd ref='-38188' />
+    <nd ref='-38186' />
     <tag k='test' v='style5' />
   </way>
-  <way id='-30640' action='modify' visible='true'>
-    <nd ref='-30586' />
-    <nd ref='-30584' />
-    <nd ref='-30582' />
+  <way id='-38208' action='modify'>
+    <nd ref='-38180' />
+    <nd ref='-38178' />
+    <nd ref='-38176' />
     <tag k='test' v='style4' />
   </way>
-  <way id='-30642' action='modify' visible='true'>
-    <nd ref='-30576' />
-    <nd ref='-30574' />
-    <nd ref='-30572' />
+  <way id='-38210' action='modify'>
+    <nd ref='-38170' />
+    <nd ref='-38168' />
+    <nd ref='-38166' />
     <tag k='test' v='style3' />
   </way>
-  <way id='-30644' action='modify' visible='true'>
-    <nd ref='-30566' />
-    <nd ref='-30564' />
-    <nd ref='-30562' />
+  <way id='-38212' action='modify'>
+    <nd ref='-38160' />
+    <nd ref='-38158' />
+    <nd ref='-38156' />
     <tag k='test' v='style2' />
   </way>
-  <way id='-30646' action='modify' visible='true'>
-    <nd ref='-30556' />
-    <nd ref='-30554' />
-    <nd ref='-30552' />
+  <way id='-38214' action='modify'>
+    <nd ref='-38150' />
+    <nd ref='-38148' />
+    <nd ref='-38146' />
     <tag k='test' v='style1' />
   </way>
+  <way id='-38244' action='modify'>
+    <nd ref='-38242' />
+    <nd ref='-38243' />
+    <nd ref='-38245' />
+    <nd ref='-38247' />
+    <nd ref='-38249' />
+    <nd ref='-38294' />
+    <tag k='test' v='out-of-screen' />
+  </way>
 </osm>
diff --git a/test/data/renderer/way-dashes/reference.png b/test/data/renderer/way-dashes/reference.png
index b4f336f..0736eb0 100644
Binary files a/test/data/renderer/way-dashes/reference.png and b/test/data/renderer/way-dashes/reference.png differ
diff --git a/test/data/renderer/way-dashes/style.mapcss b/test/data/renderer/way-dashes/style.mapcss
index 47e3997..f34c2d8 100644
--- a/test/data/renderer/way-dashes/style.mapcss
+++ b/test/data/renderer/way-dashes/style.mapcss
@@ -34,3 +34,14 @@ way[test=style1] {
 	dashes-background-color: green;
 	dashes-background-opacity: .5;
 }
+
+way[test=out-of-screen] {
+    width: 5;
+    color: teal;
+    opacity: 0.7;
+	dashes: 18, 14;
+	dashes-offset: 1;
+	dashes-background-color: khaki;
+	dashes-background-opacity: .8;
+}
+
diff --git a/test/data/renderer/way-repeat-image/data.osm b/test/data/renderer/way-repeat-image/data.osm
new file mode 100644
index 0000000..4a5167d
--- /dev/null
+++ b/test/data/renderer/way-repeat-image/data.osm
@@ -0,0 +1,90 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='never' generator='JOSM'>
+  <node id='-32985' action='modify' lat='0.87475376532' lon='0.19637924194' />
+  <node id='-32986' action='modify' lat='0.91045499834' lon='0.31997543335' />
+  <node id='-32990' action='modify' lat='0.95714069057' lon='0.50674301147' />
+  <node id='-32992' action='modify' lat='0.86926123744' lon='0.74706893921' />
+  <node id='-32994' action='modify' lat='0.70310872562' lon='0.83495956421' />
+  <node id='-33040' action='modify' lat='0.69349640248' lon='0.72509628296' />
+  <node id='-33042' action='modify' lat='0.81433552757' lon='0.60836654663' />
+  <node id='-33044' action='modify' lat='0.79236503124' lon='0.24993759155' />
+  <node id='-33165' action='modify' lat='0.61316410745' lon='0.07209640503' />
+  <node id='-33166' action='modify' lat='0.510172244' lon='0.11878829956' />
+  <node id='-33168' action='modify' lat='0.43464381094' lon='0.20805221558' />
+  <node id='-33170' action='modify' lat='0.33439583719' lon='0.37971359253' />
+  <node id='-33172' action='modify' lat='0.44837631334' lon='0.51292282104' />
+  <node id='-33174' action='modify' lat='0.31791661206' lon='0.81092697144' />
+  <node id='-33176' action='modify' lat='0.32890276515' lon='0.93864303589' />
+  <node id='-33371' action='modify' lat='0.25886584903' lon='0.14488082886' />
+  <node id='-33372' action='modify' lat='0.18058884284' lon='0.19981246948' />
+  <node id='-33374' action='modify' lat='0.11879096104' lon='0.18195968628' />
+  <node id='-33376' action='modify' lat='0.05836623136' lon='0.14488082886' />
+  <node id='-33378' action='modify' lat='0.15037656686' lon='0.45936447144' />
+  <node id='-33380' action='modify' lat='0.12840397577' lon='0.57334762573' />
+  <node id='-33382' action='modify' lat='0.11467109654' lon='0.62553268433' />
+  <node id='-33384' action='modify' lat='0.08445874016' lon='0.69282394409' />
+  <node id='-33386' action='modify' lat='0.07484571236' lon='0.7642350769' />
+  <node id='-33388' action='modify' lat='0.13801698689' lon='0.89469772339' />
+  <node id='-33551' action='modify' lat='0.0638593923' lon='0.30555587769' />
+  <node id='-33576' action='modify' lat='0.03090041964' lon='0.19706588745' />
+  <node id='-33761' action='modify' lat='0.4875138012' lon='0.91049057007' />
+  <node id='-33762' action='modify' lat='0.47652786187' lon='0.78277450562' />
+  <node id='-33763' action='modify' lat='0.6069846482' lon='0.48477035522' />
+  <node id='-33764' action='modify' lat='0.49300676417' lon='0.35156112671' />
+  <node id='-33765' action='modify' lat='0.59325249136' lon='0.17989974976' />
+  <node id='-33766' action='modify' lat='0.66877891111' lon='0.09063583374' />
+  <node id='-33767' action='modify' lat='0.77176758504' lon='0.04394393921' />
+  <node id='-33862' action='modify' lat='0.23071501371' lon='1.11236297607' />
+  <node id='-33864' action='modify' lat='0.00549591064' lon='1.79900848389' />
+  <node id='-33866' action='modify' lat='0.22247533206' lon='-0.79101837158' />
+  <way id='-32987' action='modify'>
+    <nd ref='-32985' />
+    <nd ref='-32986' />
+    <nd ref='-32990' />
+    <nd ref='-32992' />
+    <nd ref='-32994' />
+    <nd ref='-33040' />
+    <nd ref='-33042' />
+    <nd ref='-33044' />
+    <nd ref='-32985' />
+    <tag k='test' v='r1' />
+  </way>
+  <way id='-33167' action='modify'>
+    <nd ref='-33176' />
+    <nd ref='-33174' />
+    <nd ref='-33172' />
+    <nd ref='-33170' />
+    <nd ref='-33168' />
+    <nd ref='-33166' />
+    <nd ref='-33165' />
+    <tag k='test' v='r2' />
+  </way>
+  <way id='-33373' action='modify'>
+    <nd ref='-33866' />
+    <nd ref='-33371' />
+    <nd ref='-33372' />
+    <nd ref='-33374' />
+    <nd ref='-33376' />
+    <nd ref='-33576' />
+    <nd ref='-33551' />
+    <nd ref='-33378' />
+    <nd ref='-33380' />
+    <nd ref='-33382' />
+    <nd ref='-33384' />
+    <nd ref='-33386' />
+    <nd ref='-33388' />
+    <nd ref='-33862' />
+    <nd ref='-33864' />
+    <tag k='test' v='r3' />
+  </way>
+  <way id='-33760' action='modify'>
+    <nd ref='-33767' />
+    <nd ref='-33766' />
+    <nd ref='-33765' />
+    <nd ref='-33764' />
+    <nd ref='-33763' />
+    <nd ref='-33762' />
+    <nd ref='-33761' />
+    <tag k='test' v='r2' />
+  </way>
+</osm>
diff --git a/test/data/renderer/way-repeat-image/reference.png b/test/data/renderer/way-repeat-image/reference.png
new file mode 100644
index 0000000..259ed8d
Binary files /dev/null and b/test/data/renderer/way-repeat-image/reference.png differ
diff --git a/test/data/renderer/way-repeat-image/style.mapcss b/test/data/renderer/way-repeat-image/style.mapcss
new file mode 100644
index 0000000..b609053
--- /dev/null
+++ b/test/data/renderer/way-repeat-image/style.mapcss
@@ -0,0 +1,48 @@
+way[test=r1] {
+    color: darkblue;
+    width: 8;
+    repeat-image: "presets/barrier/city_wall.svg";
+    repeat-image-height: 40;
+    repeat-image-align: bottom;
+    repeat-image-offset: 4;
+    repeat-image-phase: -15;
+}
+
+way[test=r2] {
+    color: gray;
+    width: 18;
+    linecap: square;
+    repeat-image: "presets/barrier/guard_rail.svg";
+    repeat-image-height: 16;
+    repeat-image-align: bottom;
+    repeat-image-offset: 9;
+}
+
+way[test=r2]::dashes {
+    major-z-index: 10;
+    repeat-image: "presets/misc/no_icon.svg";
+    repeat-image-width: 16;
+    repeat-image-height: 4;
+    repeat-image-spacing: 12;
+}
+
+way[test=r3] {
+    color: maroon;
+    width: 8;
+    linecap: none;
+    repeat-image: "trees.svg";
+    repeat-image-height: 23;
+    repeat-image-align: bottom;
+    repeat-image-offset: 6;
+    repeat-image-spacing: 8;
+}
+
+way[test=r3]::bottom {
+    repeat-image: "trees-upside_down.svg";
+    repeat-image-height: 23;
+    repeat-image-align: top;
+    repeat-image-offset: -6;
+    repeat-image-spacing: 15;
+}
+
+
diff --git a/test/data/renderer/way-repeat-image/trees-upside_down.svg b/test/data/renderer/way-repeat-image/trees-upside_down.svg
new file mode 100644
index 0000000..76736c7
--- /dev/null
+++ b/test/data/renderer/way-repeat-image/trees-upside_down.svg
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1"
+   sodipodi:docname="trees-upside_down.svg"
+   inkscape:export-filename="/datas/Projs/Cliparts Stocker/plain_tree.png"
+   viewBox="0 0 970.83973 972.18771"
+   sodipodi:version="0.32"
+   inkscape:export-xdpi="72.000000"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-ydpi="72.000000"
+   inkscape:version="0.91 r13725"
+   width="100%"
+   height="100%">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient5877"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5883"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5883-1-7"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434-7-1"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435-4-1"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880-0-5"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187-9-2"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188-4-7"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3020-6"
+       xlink:href="#linearGradient5877-8-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5877-8-1"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-8-4"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-2-2"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5883-3"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434-2"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435-2"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880-1"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187-6"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188-8"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5877-5"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-7"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-6"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3098"
+       xlink:href="#linearGradient5877-5"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3020-0"
+       xlink:href="#linearGradient5877-8-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5877-8-2"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-8-48"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-2-6"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="25"
+     pagecolor="#ffffff"
+     inkscape:window-height="768"
+     inkscape:zoom="0.41427105"
+     inkscape:window-x="0"
+     showgrid="true"
+     borderopacity="1.0"
+     inkscape:current-layer="svg1"
+     inkscape:cx="408.87674"
+     inkscape:cy="406.16525"
+     inkscape:window-width="1366"
+     inkscape:pageopacity="0.0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2995"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-148.666px"
+       originy="1.0382462e-005px" />
+  </sodipodi:namedview>
+  <g
+     id="g5885"
+     transform="matrix(1,0,0,-1,-82.251123,995.52)">
+    <path
+       id="path1545"
+       style="fill:url(#linearGradient5883);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 84.88,0 -14.88,-223.43 -60.22,0 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path909"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path4679"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5877);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z"
+       inkscape:connector-curvature="0" />
+  </g>
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2008-05-26T12:05:38</dc:date>
+        <dc:description />
+        <dc:source>https://openclipart.org/detail/17043/plain_tree-by-jean_victor_balin</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>jean_victor_balin</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>forest</rdf:li>
+            <rdf:li>garden</rdf:li>
+            <rdf:li>plant</rdf:li>
+            <rdf:li>tree</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g5885-1"
+     transform="matrix(1,0,0,-1,267.93589,995.52)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1545-8"
+       style="fill:url(#linearGradient5883-3);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 84.88,0 -14.88,-223.43 -60.22,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path909-9"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880-1);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4679-2"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient3098);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+  </g>
+  <g
+     id="g5885-4-7"
+     transform="matrix(1,0,0,-1,605.92089,995.52)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1545-5-9"
+       style="fill:url(#linearGradient5883-1-7);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 84.88,0 -14.88,-223.43 -60.22,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path909-5-5"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880-0-5);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4679-1-4"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient3020-6);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+  </g>
+</svg>
diff --git a/test/data/renderer/way-repeat-image/trees.svg b/test/data/renderer/way-repeat-image/trees.svg
new file mode 100644
index 0000000..805c12f
--- /dev/null
+++ b/test/data/renderer/way-repeat-image/trees.svg
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1"
+   sodipodi:docname="02.svg"
+   inkscape:export-filename="/datas/Projs/Cliparts Stocker/plain_tree.png"
+   viewBox="0 0 970.83973 972.18771"
+   sodipodi:version="0.32"
+   inkscape:export-xdpi="72.000000"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-ydpi="72.000000"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient5877"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5883"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5883-1-7"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434-7-1"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435-4-1"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880-0-5"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187-9-2"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188-4-7"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3020-6"
+       xlink:href="#linearGradient5877-8-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5877-8-1"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-8-4"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-2-2"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5883-3"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434-2"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435-2"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880-1"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187-6"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188-8"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5877-5"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-7"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-6"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3098"
+       xlink:href="#linearGradient5877-5"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3020-0"
+       xlink:href="#linearGradient5877-8-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5877-8-2"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-8-48"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-2-6"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="-4"
+     pagecolor="#ffffff"
+     inkscape:window-height="1003"
+     inkscape:zoom="0.41427105"
+     inkscape:window-x="-4"
+     showgrid="true"
+     borderopacity="1.0"
+     inkscape:current-layer="svg1"
+     inkscape:cx="-42.294561"
+     inkscape:cy="423.0624"
+     inkscape:window-width="1680"
+     inkscape:pageopacity="0.0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2995"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-148.666px"
+       originy="1.0382462e-005px" />
+  </sodipodi:namedview>
+  <g
+     id="g5885"
+     transform="translate(-82.251123,-23.332315)">
+    <path
+       id="path1545"
+       style="fill:url(#linearGradient5883);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path909"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path4679"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5877);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z"
+       inkscape:connector-curvature="0" />
+  </g>
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2008-05-26T12:05:38</dc:date>
+        <dc:description />
+        <dc:source>https://openclipart.org/detail/17043/plain_tree-by-jean_victor_balin</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>jean_victor_balin</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>forest</rdf:li>
+            <rdf:li>garden</rdf:li>
+            <rdf:li>plant</rdf:li>
+            <rdf:li>tree</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g5885-1"
+     transform="translate(267.93589,-23.332315)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1545-8"
+       style="fill:url(#linearGradient5883-3);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path909-9"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880-1);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4679-2"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient3098);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+  </g>
+  <g
+     id="g5885-4-7"
+     transform="translate(605.92089,-23.332315)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1545-5-9"
+       style="fill:url(#linearGradient5883-1-7);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path909-5-5"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880-0-5);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4679-1-4"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient3020-6);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+  </g>
+</svg>
diff --git a/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java b/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
index fe6935e..e5d73d4 100644
--- a/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
+++ b/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
@@ -104,7 +104,10 @@ public class MapCSSRendererTest {
                 new TestConfig("area-icon", AREA_DEFAULT),
 
                 /** Tests if all styles are sorted correctly. Tests {@link StyleRecord#compareTo(StyleRecord)} */
-                new TestConfig("order", AREA_DEFAULT)
+                new TestConfig("order", AREA_DEFAULT),
+
+                /** Tests repeat-image feature for ways */
+                new TestConfig("way-repeat-image", AREA_DEFAULT)
 
                 ).map(e -> new Object[] {e, e.testDirectory})
                 .collect(Collectors.toList());
diff --git a/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java b/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java
index 15a9f6a..21f9743 100644
--- a/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java
@@ -11,7 +11,6 @@ import org.junit.Test;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
-import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -42,7 +41,7 @@ public final class AddImageryLayerActionTest {
     }
 
     /**
-     * Unit test of {@link AddImageryLayerAction#actionPerformed} - Enabled cases.
+     * Unit test of {@link AddImageryLayerAction#actionPerformed} - Enabled cases for TMS.
      */
     @Test
     public void testActionPerformedEnabled() {
@@ -50,17 +49,7 @@ public final class AddImageryLayerActionTest {
         new AddImageryLayerAction(new ImageryInfo("foo_tms", "http://bar", "tms", null, null)).actionPerformed(null);
         List<TMSLayer> tmsLayers = Main.getLayerManager().getLayersOfType(TMSLayer.class);
         assertEquals(1, tmsLayers.size());
-
-        try {
-            new AddImageryLayerAction(new ImageryInfo("wms.openstreetmap.fr", "http://wms.openstreetmap.fr/wms?",
-                    "wms_endpoint", null, null)).actionPerformed(null);
-            List<WMSLayer> wmsLayers = Main.getLayerManager().getLayersOfType(WMSLayer.class);
-            assertEquals(1, wmsLayers.size());
-
-            Main.getLayerManager().removeLayer(wmsLayers.get(0));
-        } finally {
-            Main.getLayerManager().removeLayer(tmsLayers.get(0));
-        }
+        Main.getLayerManager().removeLayer(tmsLayers.get(0));
     }
 
     /**
diff --git a/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTestIT.java b/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTestIT.java
new file mode 100644
index 0000000..a8773ff
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTestIT.java
@@ -0,0 +1,42 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.gui.layer.WMSLayer;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests for class {@link AddImageryLayerAction}.
+ */
+public final class AddImageryLayerActionTestIT {
+    /**
+     * We need prefs for this. We need platform for actions and the OSM API for checking blacklist.
+     * The timeout is set to default httpclient read timeout + connect timeout + a small delay to ignore
+     * common but harmless network issues.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().platform().fakeAPI().timeout(45500);
+
+    /**
+     * Integration test of {@link AddImageryLayerAction#actionPerformed} - Enabled cases for WMS.
+     */
+    @Test
+    public void testActionPerformedEnabledWms() {
+        new AddImageryLayerAction(new ImageryInfo("wms.openstreetmap.fr", "http://wms.openstreetmap.fr/wms?",
+                "wms_endpoint", null, null)).actionPerformed(null);
+        List<WMSLayer> wmsLayers = Main.getLayerManager().getLayersOfType(WMSLayer.class);
+        assertEquals(1, wmsLayers.size());
+
+        Main.getLayerManager().removeLayer(wmsLayers.get(0));
+    }
+}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git



More information about the Pkg-grass-devel mailing list